Skip to content

Commit 5a973df

Browse files
committed
feat(SRE-8899): only support the new approach (migration 2/2)
1 parent 268ef87 commit 5a973df

12 files changed

Lines changed: 8 additions & 22 deletions

docker-compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ services:
88
- APPLICATION_NAME
99
volumes:
1010
- env:$WORKDIR
11-
- ./test/fixture/volumes/aws-secret:$WORKDIR/aws-secret
1211
- ./test/fixture/volumes/aws-secret-application:$WORKDIR/aws-secret-application
1312
- ./test/fixture/volumes/aws-parameter-store:$WORKDIR/aws-parameter-store
1413
- ./test/fixture/volumes/global-aws-secret:$WORKDIR/global-aws-secret

parse-config.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,21 @@ load_dir() {
6262
fi
6363
}
6464

65-
# We have 3 directories to load env variables from:
65+
# We have 4 directories to load env variables from.
66+
#
67+
# 2 are shipped from application helm-chart and scoped to the application:
6668
# 1. $WORKDIR/aws-parameter-store
67-
# 2. $WORKDIR/aws-secret
69+
# 2. $WORKDIR/aws-secret-application
70+
#
71+
# 2 are shipped through flux-config and are Global properties:
72+
# 3. $WORKDIR/global-aws-parameter-store
73+
# 4. $WORKDIR/global-aws-secret
6874

6975
# For aws-parameter-store, we strip the first character since it's always a '_'
7076
log "Loading AWS Parameter Store variables..."
7177
load_dir "$WORKDIR/aws-parameter-store" true 1
7278
log "Loaded AWS Parameter Store variables"
7379

74-
log "Loading AWS Secret variables..."
75-
load_dir "$WORKDIR/aws-secret" true 0
76-
log "Loaded AWS Secret variables"
77-
7880
log "Loading AWS Application Secret variables..."
7981
load_dir "$WORKDIR/aws-secret-application" false 0
8082
log "Loaded AWS Application Secret variables"

test/fixture/volumes/aws-parameter-store/_application_global_kerberos_cache_kerberos-authz_url

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/fixture/volumes/aws-parameter-store/_application_kerberos_authentication_allowed_issuers

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/fixture/volumes/aws-parameter-store/_application_kerberos_redis_kerberos-authz_url

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/fixture/volumes/aws-parameter-store/_infrastructure_msk_endpoint

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/fixture/volumes/aws-secret/ignore_multiline

Lines changed: 0 additions & 6 deletions
This file was deleted.

test/fixture/volumes/aws-secret/infrastructure_global_launch-darkly_key

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/fixture/volumes/aws-secret/infrastructure_launch-darkly_key

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/fixture/volumes/aws-secret/infrastructure_openai_key

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)