ROX-26039: PR comments

stackrox · Nov 12, 2024 · a1ecf80 · a1ecf80
1 parent 56d6923
commit a1ecf80
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/dev/env/defaults/cluster-type-infra-openshift/env b/dev/env/defaults/cluster-type-infra-openshift/env
@@ -1,2 +1,4 @@
 export FLEETSHARD_SYNC_RESOURCES_DEFAULT='{"requests":{"cpu":"400m","memory":"1000Mi"},"limits":{"cpu":"400m","memory":"1000Mi"}}'
 export EXPOSE_OPENSHIFT_ROUTER_DEFAULT="true"
+export ENABLE_EXTERNAL_CONFIG_DEFAULT="true"
+export AWS_AUTH_HELPER_DEFAULT="aws-saml"
diff --git a/dev/env/scripts/bootstrap.sh b/dev/env/scripts/bootstrap.sh
@@ -6,8 +6,11 @@ export GITROOT
 source "${GITROOT}/dev/env/scripts/lib.sh"
 # shellcheck source=/dev/null
 source "${GITROOT}/dev/env/scripts/docker.sh"
+# shellcheck source=/dev/null
+source "${GITROOT}/scripts/lib/external_config.sh"
 
 init
+init_chamber
 
 log "** Preparing ACSCS Environment **"
 print_env

diff --git a/fleetshard/pkg/central/cloudprovider/awsclient/rds.go b/fleetshard/pkg/central/cloudprovider/awsclient/rds.go
@@ -519,6 +519,7 @@ func newCreateCentralDBInstanceInput(input *createCentralDBInstanceInput) *rds.C
 		PromotionTier:             aws.Int64(dbInstancePromotionTier),
 		CACertificateIdentifier:   aws.String(dbCACertificateType),
 		AutoMinorVersionUpgrade:   aws.Bool(dbAutoVersionUpgrade),
+
 		Tags: []*rds.Tag{
 			{
 				Key:   aws.String(dataplaneClusterNameKey),