Skip to content

Commit

Permalink
fix: env staff and sentry (#914)
Browse files Browse the repository at this point in the history
* fix: env staff and sentry

* fix: staff secret name
  • Loading branch information
devthejo authored Aug 5, 2022
1 parent 7ad6500 commit b732e5a
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 2 deletions.
1 change: 1 addition & 0 deletions .kontinuous/env/dev/templates/staff.sealed-secret.yaml
16 changes: 16 additions & 0 deletions .kontinuous/env/preprod/templates/staff.sealed-secret.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
apiVersion: bitnami.com/v1alpha1
kind: SealedSecret
metadata:
annotations:
sealedsecrets.bitnami.com/cluster-wide: 'true'
name: staff
namespace: null
spec:
encryptedData:
EGAPRO_STAFF: AgANZCPz1t8CrjKIS5v1kDS2oL9G6JELTYHJmEcYOpha7SsL4/y0oBsuc/CVlLQzdX1sWM4mIpY8oxE5zdErQHPCaRJpOcWAhXBA6pRxOa6fwCRivZ++/WyYdjOU8L8ZheYDLUZkAgVx5Gv+za4kjLRBNX2AF48cg+abGw8zpBVY/oGQR/mIXt42Z4il9LXwNO6S3HCKNaPpZwsusl4BdHWuqtmR6gfTTV6JvQGtb85LsePQ0cxo2GOYPcMgytj5LgaYr3NtbVCUbYC5m32624musfhKwWQLTOt+yG6A56u1JYaYwwhdVVMnRCpm0z6v8+aMkj+/HXr9tvv8qu74cB0YvIMJK8EhyHqFs3ZV0OP7xDkdH3m+HoJlZq84ViSUbBGrdjHJvRkkvHMHWeftSM2mm42WxP0Q1/+Z4wRTOXYTkUJkX+j8+Z4UaSjn9dIJN/p1LQD4JWIeU86WvpqQ81jgYOdNUhAdMFPckmUFrOOjyKEloKR8cFu91UtGvYI1HpDxQ9MWO0KLW5ij1RC0DpC3gXbGv0JXE+sES4j0sz+YDtqNdHr57yamOvbeiN3Am+VdvWi6fotdFnR/ex1nCOAH2uME3BEFj2hy2lbc/iauUd5bvQUb2hwU50H0kJm63Mnji70aPUMFF55cIrs9Ih4o4ovGwAxTvyS043TG6z2hcblooDEpPs0MuDafQ7Y4dj4b+Gq58PKTcOEHOCRbR+wCE8qKxRI9Po11GERs++Q+2fDhAqmH48+GS1I/1QeMF7KuUQMmDH/cDPckMuIzahthwbJHY9oEKdlJqUJJmGSnTCSdByY7q9D7XwYBwdwXZIXoZ11QKeIHoL3Y+P+ASlxEo1Rhf3krsqgPAB+ATZOj2RH5X+HYyfXvrlXUAs/3TC6qEgg=
template:
metadata:
annotations:
sealedsecrets.bitnami.com/cluster-wide: 'true'
name: staff
type: Opaque
14 changes: 14 additions & 0 deletions .kontinuous/env/prod/templates/staff.sealed-secret.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: bitnami.com/v1alpha1
kind: SealedSecret
metadata:
annotations: {}
name: staff
namespace: egapro
spec:
encryptedData:
EGAPRO_STAFF: AgA0hST83tFLyUgzCss5qYlkdnUwMs3giGgj53lm/Np2SqI2400e3nouBrtRMptq2HwWwhphXaL9li55AxSLnDXqEzF6lzTkJ8rUtVnbKQoyUz1CN+DLzeuTpkioVIFSnMLc5XuKIQI8anJUhTA23WjpyQ5otJFYWxpj3rEEtQHaHPgloMD/KqrUs2PHGJPznhi2MTOcWTJLdmfO6he7QgVakXIXnxaoNq6fqxuQPEj7DNiI7B7E2cELAUOCB4yG4Efg9CYPy/HlOopLk6E0V9EAWR/V+1Khdq0cMteNJBoqgqkPG+92KVmVTFjSzUgVijTuuMQEgKJQ/hZWFtI4l4Oj4Ar/WzumIhPPdhpnDyFGOyue3So1oez4uMxaIuJHouHCUBbSWSfAMT8v57bCGfqU0PVeL/OtSkpjHAOd4Nz7H5gmDYcfmSeZ3fchD0eOJryoJi41cwpDrtfF4sQJAFR9YxEkuBzPTBs0PSfz6AgTvJvYHsusb9CSn9Y0W6tEXY5MVrwbLbrL1nYqkjpXfKftBx9pmaiq1vKlFZbH7HmaUIEQt602+LS5jskMvNbWVYrnp3WImt03oesCY71DwkJ5PxzP5mz4T86dKkMbrSdQEarWBzt4BwMDI+DAMgvt18tKZnC1BwvSJGFSO6DrPQDNs+Roeg5boJ3jBZLlP1YHXlbtEOTpUxdzXKcqCNnZ9DJZNRkpooRKbtNZm7R19Y53yY/6E5ZuWhAuw94Dvv7xFj8mL2iJ1pbg4kCHnb1KWauFz308febZWqaJAXIL0u5Uw1UF+ethPQvE8S9nVAP73UanVTV/0Djk8MmpbmzlwG3R5p/sva+gHE6hGmcK1nTnjnD5DpHxn1EJkvUsBKC0bxb05sRCMqAtvrPRb+M+16cc6XU=
template:
metadata:
annotations: {}
name: staff
type: Opaque
24 changes: 23 additions & 1 deletion .kontinuous/env/prod/values.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
global:
host: index-egapro.travail.gouv.fr
sentryFront: "https://92bd32ba4e6411eb95f19aaf3eb391a2@sentry.fabrique.social.gouv.fr/49"

simulateur:
host: index-egapro.travail.gouv.fr
Expand All @@ -8,8 +9,29 @@ simulateur:


api:
vars:
EGAPRO_SENTRY_DSN: "https://084bf19c0e1141ddadbc1f7b86d2eb57@sentry.fabrique.social.gouv.fr/22"
envFrom:
- secretRef:
name: "{{ .Values.global.pgSecretName }}"
- secretRef:
name: smtp
name: "staff"
- secretRef:
name: smtp

jobs:
runs:
build-app:
with:
buildArgs:
REACT_APP_SENTRY_DSN: "{{ .Values.global.sentryFront }}"

build-declaration:
with:
buildArgs:
EGAPRO_SENTRY_DSN: "{{ .Values.global.sentryFront }}"

build-simulateur:
with:
buildArgs:
REACT_APP_SENTRY_DSN: "{{ .Values.global.sentryFront }}"
3 changes: 3 additions & 0 deletions .kontinuous/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,16 @@ api:
envFrom:
- secretRef:
name: "{{ .Values.global.pgSecretName }}"
- secretRef:
name: "staff"
vars:
EGAPRO_DBHOST: "$(PGHOST)"
EGAPRO_DBNAME: "$(PGDATABASE)"
EGAPRO_DBPORT: "$(PGPORT)"
EGAPRO_DBUSER: "$(PGUSER)"
EGAPRO_DBPASS: "$(PGPASSWORD)"
EGAPRO_DBSSL: "$(PGSSLMODE)"
EGAPRO_SENTRY_DSN: "https://084bf19c0e1141ddadbc1f7b86d2eb57@sentry.fabrique.social.gouv.fr/22"
# addVolumes:
# - files

Expand Down
2 changes: 1 addition & 1 deletion packages/declaration/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN echo "EGAPRO_API_URL: ${EGAPRO_API_URL}" >> _config.yml

ARG EGAPRO_SENTRY_DSN
ENV EGAPRO_SENTRY_DSN=${EGAPRO_SENTRY_DSN}
RUN echo "sentry-dsn: '$SENTRY_DSN'" >> _config.yml
RUN echo "sentry-dsn: '$EGAPRO_SENTRY_DSN'" >> _config.yml

RUN echo "version: `date +"%Y.%m.%d"`" >> _config.yml

Expand Down

0 comments on commit b732e5a

Please sign in to comment.