remove duplicate env var and set default features to load in bundle s…

…ync in our deployments (#146)
RedHatInsights · Aug 25, 2023 · 46052ed · 46052ed
1 parent e23b27e
commit 46052ed
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/config/main.go b/config/main.go
@@ -180,7 +180,6 @@ func initialize() {
 	options.SetDefault(Keys.CwLogGroup, "platform-dev")
 	options.SetDefault(Keys.CwLogStream, hostname)
 	options.SetDefault(Keys.CwRegion, "us-east-1")
-	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,8 +111,6 @@ objects:
             value: ${SUBS_CACHE_MAX_SIZE}
           - name: ENT_SUBS_CACHE_ITEM_PRUNE
             value: ${SUBS_CACHE_ITEM_PRUNE}
-          - name: ENT_BUNDLES_SKUS_ALLOW_LIST
-            value: ${BUNDLES_SKUS_ALLOW_LIST}
           - name: GLITCHTIP_DSN
             valueFrom:
               secretKeyRef:
@@ -223,6 +221,7 @@ parameters:
   value: 'entitlements-secret'
 - description: List of feature bundles to onboard during bundle sync
   name: FEATURES
+  value: ansible,smart_management,rhods,rhoam,rhosak,openshift,acs
   required: false
 - description: Flag to disable seat manager by not exposing any of the apis related to the feature
   name: DISABLE_SEAT_MANAGER
@@ -238,8 +237,4 @@ parameters:
   required: false
 - 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,rhods,rhoam,rhosak,openshift,acs
-  required: false
+  required: true
diff --git a/deployment/deploy.yml b/deployment/deploy.yml
@@ -110,8 +110,6 @@ 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:
@@ -255,9 +253,6 @@ 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,rhods,rhoam,rhosak,openshift,acs
 - description: Flag to determine whether or not to entitle all by default and mock calls to IT
   name: ENTITLE_ALL
   required: false
@@ -268,6 +263,7 @@ parameters:
   value: 'entitlements-secret'
 - description: List of feature bundles to onboard during bundle sync
   name: FEATURES
+  value: ansible,smart_management,rhods,rhoam,rhosak,openshift,acs
   required: false
 - description: Flag to disable seat manager by not exposing any of the apis related to the feature
   name: DISABLE_SEAT_MANAGER