diff --git a/dev/env/defaults/cluster-type-infra-openshift/env b/dev/env/defaults/cluster-type-infra-openshift/env index dd8a889004..159f96bb1e 100644 --- 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" \ No newline at end of file diff --git a/dev/env/scripts/bootstrap.sh b/dev/env/scripts/bootstrap.sh index efffde3515..29bfde9735 100755 --- 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 index fb8040b5b4..c7f41344c2 100644 --- 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),