diff --git a/bundle/manifests/odf-operator.clusterserviceversion.yaml b/bundle/manifests/odf-operator.clusterserviceversion.yaml index 351cd5f98..70838e45b 100644 --- a/bundle/manifests/odf-operator.clusterserviceversion.yaml +++ b/bundle/manifests/odf-operator.clusterserviceversion.yaml @@ -35,9 +35,10 @@ metadata: categories: Storage console.openshift.io/plugins: '["odf-console"]' containerImage: quay.io/ocs-dev/odf-operator:latest - createdAt: "2023-08-08T09:50:10Z" + createdAt: "2023-11-17T09:12:42Z" description: OpenShift Data Foundation provides a common control plane for storage solutions on OpenShift Container Platform. + features.operators.openshift.io/token-auth-aws: "true" olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.15"}]' olm.skipRange: "" operatorframework.io/initialization-resource: |- diff --git a/config/manifests/bases/kustomization.yaml b/config/manifests/bases/kustomization.yaml index 85729e613..2d6cbef99 100644 --- a/config/manifests/bases/kustomization.yaml +++ b/config/manifests/bases/kustomization.yaml @@ -6,6 +6,7 @@ patchesStrategicMerge: - odf-operator.csv.icon.yaml - odf-operator.csv.card-description.yaml commonAnnotations: + features.operators.openshift.io/token-auth-aws: "true" olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.15"}]' olm.skipRange: "" operators.operatorframework.io/operator-type: standalone diff --git a/controllers/defaults.go b/controllers/defaults.go index 1161194d6..f0d69cc72 100644 --- a/controllers/defaults.go +++ b/controllers/defaults.go @@ -30,6 +30,7 @@ var ( "NOOBAA_SUBSCRIPTION_STARTINGCSV": "noobaa-operator.v5.14.0", "NOOBAA_SUBSCRIPTION_CATALOGSOURCE": "odf-catalogsource", "NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-marketplace", + "ROLEARN": "", "OCS_SUBSCRIPTION_NAME": "ocs-operator", "OCS_SUBSCRIPTION_PACKAGE": "ocs-operator", @@ -68,6 +69,7 @@ var ( NoobaaSubscriptionStartingCSV = GetEnvOrDefault("NOOBAA_SUBSCRIPTION_STARTINGCSV") NoobaaSubscriptionCatalogSource = GetEnvOrDefault("NOOBAA_SUBSCRIPTION_CATALOGSOURCE") NoobaaSubscriptionCatalogSourceNamespace = GetEnvOrDefault("NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE") + RoleArnValue = GetEnvOrDefault("ROLEARN") CSIAddonsSubscriptionName = GetEnvOrDefault("CSIADDONS_SUBSCRIPTION_NAME") CSIAddonsSubscriptionPackage = GetEnvOrDefault("CSIADDONS_SUBSCRIPTION_PACKAGE") diff --git a/controllers/subscriptions.go b/controllers/subscriptions.go index 836eb5d24..bffb24c3f 100644 --- a/controllers/subscriptions.go +++ b/controllers/subscriptions.go @@ -243,6 +243,17 @@ func GetStorageClusterSubscriptions() []*operatorv1alpha1.Subscription { }, } + if RoleArnValue != "" { + noobaaSubscription.Spec.Config = &operatorv1alpha1.SubscriptionConfig{ + Env: []corev1.EnvVar{ + { + Name: "ROLEARN", + Value: RoleArnValue, + }, + }, + } + } + ocsSubscription := &operatorv1alpha1.Subscription{ ObjectMeta: metav1.ObjectMeta{ Name: OcsSubscriptionName,