Merge pull request RedHatInsights#95 from Ellen-Yi-Dong/configure-bun…

…dles [RHCLOUD-23693] Configurable default bundles
dagbay-rh · Aug 24, 2023 · df3d225 · df3d225
2 parents 3b42c1f + 846a7f4
commit df3d225
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/config/main.go b/config/main.go
@@ -180,7 +180,7 @@ func initialize() {
 	options.SetDefault(Keys.CwLogGroup, "platform-dev")
 	options.SetDefault(Keys.CwLogStream, hostname)
 	options.SetDefault(Keys.CwRegion, "us-east-1")
-	options.SetDefault(Keys.Features, "ansible,smart_management,rhods,rhoam,rhosak,openshift,acs")
+	options.SetDefault(Keys.Features, os.Getenv("BUNDLES_SKUS_ALLOW_LIST"))
 	options.SetDefault(Keys.SubAPIBasePath, "/svcrest/subscription/v5/")
 	options.SetDefault(Keys.CompAPIBasePath, "/v1/screening")
 	options.SetDefault(Keys.RunBundleSync, false)

diff --git a/deployment/clowdapp.yml b/deployment/clowdapp.yml
@@ -111,6 +111,8 @@ objects:
             value: ${SUBS_CACHE_MAX_SIZE}
           - name: ENT_SUBS_CACHE_ITEM_PRUNE
             value: ${SUBS_CACHE_ITEM_PRUNE}
+          - name: BUNDLES_SKUS_ALLOW_LIST
+            value; ${BUNDLES_SKU_ALLOW_LIST}
           - name: GLITCHTIP_DSN
             valueFrom:
               secretKeyRef:
@@ -237,3 +239,6 @@ parameters:
 - description: ClowdEnv Name
   name: ENV_NAME
   required: true
+- description: Application allows list for new bundles with skus to update the feature in the IT features API
+  name: BUNDLES_SKUS_ALLOW_LIST
+  value: ansible,smart_management_rods,rhoam,rhosak,openshift,rhel
diff --git a/deployment/deploy.yml b/deployment/deploy.yml
@@ -110,6 +110,8 @@ objects:
             value: ${SUBS_CACHE_MAX_SIZE}
           - name: ENT_SUBS_CACHE_ITEM_PRUNE
             value: ${SUBS_CACHE_ITEM_PRUNE}
+          - name: BUNDLES_SKUS_ALLOW_LIST
+            value: ${BUNDLES_SKUS_ALLOW_LIST}
           - name: ENT_CW_LOG_GROUP
             valueFrom:
               secretKeyRef:
@@ -253,6 +255,9 @@ parameters:
   name: RUN_BUNDLE_SYNC
   required: false
   value: 'false'
+- description: Application allow list for new bundles with skus to update the feature in the IT features API
+  name: BUNDLES_SKUS_ALLOW_LIST
+  value: ansible,smart_management_rods,rhoam,rhosak,openshift,rhel
 - description: Flag to determine whether or not to entitle all by default and mock calls to IT
   name: ENTITLE_ALL
   required: false