Skip to content

Add cert-manger and AudiLogging CRs back to OperandConfig #1857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ibm-ci-bot merged 1 commit into from
Mar 14, 2024
Merged

Add cert-manger and AudiLogging CRs back to OperandConfig #1857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/scripts/lint-csv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ echo "Lint alm-examples"
$YQ eval '.metadata.annotations.alm-examples' $CSV_PATH | $JQ . >/dev/null || STATUS=1

# Lint yamls, only CS Operator needs this part
for section in csV3OperandConfig csV3SaasOperandConfig csV3OperandRegistry csV3SaasOperandRegistry csOperatorSubscription csSecretshareOperator csWebhookOperator csWebhookOperatorEnableOpreqWebhook nsRestrictedSubscription nsSubscription odlmClusterSubscription odlmNamespacedSubscription; do
for section in csV4OperandConfig csV4SaasOperandConfig csV4OperandRegistry csV4SaasOperandRegistry csOperatorSubscription csSecretshareOperator csWebhookOperator csWebhookOperatorEnableOpreqWebhook nsRestrictedSubscription nsSubscription odlmClusterSubscription odlmNamespacedSubscription; do
echo "Lint $section"
$YQ eval '.metadata.annotations.$section' $CSV_PATH | $YQ - >/dev/null || STATUS=1
done
Expand Down
8 changes: 4 additions & 4 deletions controllers/bootstrap/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ func (b *Bootstrap) InstallOrUpdateOpreg(forceUpdateODLMCRs bool, installPlanApp

var baseReg string
registries := []string{
constant.CSV3OpReg,
constant.CSV4OpReg,
constant.MongoDBOpReg,
constant.IMOpReg,
constant.IdpConfigUIOpReg,
Expand All @@ -673,9 +673,9 @@ func (b *Bootstrap) InstallOrUpdateOpreg(forceUpdateODLMCRs bool, installPlanApp
constant.CommonServicePGOpReg,
}
if b.SaasEnable {
baseReg = constant.CSV2SaasOpReg
baseReg = constant.CSV3SaasOpReg
} else {
baseReg = constant.CSV2OpReg
baseReg = constant.CSV3OpReg
}

concatenatedReg, err := constant.ConcatenateRegistries(baseReg, registries, b.CSData)
Expand Down Expand Up @@ -703,7 +703,7 @@ func (b *Bootstrap) InstallOrUpdateOpcon(forceUpdateODLMCRs bool) error {
constant.CommonServicePGOpCon,
}

baseCon = constant.CSV3OpCon
baseCon = constant.CSV4OpCon

concatenatedCon, err := constant.ConcatenateConfigs(baseCon, configs, b.CSData)
if err != nil {
Expand Down
20 changes: 12 additions & 8 deletions controllers/constant/odlm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
)

var (
CSV3OperandRegistry string
CSV3SaasOperandRegistry string
CSV3OperandConfig string
CSV3SaasOperandConfig string
CSV4OperandRegistry string
CSV4SaasOperandRegistry string
CSV4OperandConfig string
CSV4SaasOperandConfig string
)

const (
Expand Down Expand Up @@ -1118,7 +1118,7 @@ spec:
)

const (
CSV2OpReg = `
CSV3OpReg = `
apiVersion: operator.ibm.com/v1alpha1
kind: OperandRegistry
metadata:
Expand Down Expand Up @@ -1223,7 +1223,7 @@ spec:
installMode: no-op
`

CSV3OpReg = `
CSV4OpReg = `
apiVersion: operator.ibm.com/v1alpha1
kind: OperandRegistry
metadata:
Expand Down Expand Up @@ -1305,7 +1305,7 @@ spec:
)

const (
CSV2SaasOpReg = `
CSV3SaasOpReg = `
apiVersion: operator.ibm.com/v1alpha1
kind: OperandRegistry
metadata:
Expand Down Expand Up @@ -1369,7 +1369,7 @@ spec:
`
)

const CSV3OpCon = `
const CSV4OpCon = `
apiVersion: operator.ibm.com/v1alpha1
kind: OperandConfig
metadata:
Expand Down Expand Up @@ -1428,6 +1428,9 @@ spec:
commonWebUI: {}
switcheritem: {}
navconfiguration: {}
- name: ibm-cert-manager-operator
spec:
certManager: {}
- name: ibm-management-ingress-operator
spec:
managementIngress: {}
Expand All @@ -1438,6 +1441,7 @@ spec:
nginxIngress: {}
- name: ibm-auditlogging-operator
spec:
auditLogging: {}
operandBindInfo: {}
operandRequest: {}
- name: ibm-platform-api-operator
Expand Down