Skip to content

Commit f2a78ad

Browse files
committed
🔧(helm) replace storage url in ingressMedia
There is no mechanism to have the media storage URL from a secret from the ingress. The media storage URL has to be hardcoded. We replace the media storage URL in the ingress, if we change the cluster, we will have to update these urls.
1 parent 4cb0423 commit f2a78ad

File tree

3 files changed

+24
-33
lines changed

3 files changed

+24
-33
lines changed

src/helm/env.d/preprod/values.impress.yaml.gotmpl

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -161,17 +161,14 @@ ingressMedia:
161161

162162
annotations:
163163
cert-manager.io/cluster-issuer: letsencrypt-prod
164-
nginx.ingress.kubernetes.io/auth-url: https://impress-preprod.beta.numerique.gouv.fr/api/v1.0/documents/retrieve-auth/
165164
nginx.ingress.kubernetes.io/auth-response-headers: "Authorization, X-Amz-Date, X-Amz-Content-SHA256"
166-
nginx.ingress.kubernetes.io/upstream-vhost:
167-
secretKeyRef:
168-
name: impress-media-storage.bucket.libre.sh
169-
key: url
170-
nginx.ingress.kubernetes.io/rewrite-target: /impress-media-storage/$1
165+
nginx.ingress.kubernetes.io/auth-url: https://impress-preprod.beta.numerique.gouv.fr/api/v1.0/documents/retrieve-auth/
166+
nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
167+
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
168+
nginx.ingress.kubernetes.io/rewrite-target: /impress-preprod-impress-media-storage/$1
169+
nginx.ingress.kubernetes.io/ssl-redirect: "true"
170+
nginx.ingress.kubernetes.io/upstream-vhost: s3.margaret-hamilton.indiehosters.net
171171

172172
serviceMedia:
173-
host:
174-
secretKeyRef:
175-
name: impress-media-storage.bucket.libre.sh
176-
key: url
177-
port: 9000
173+
host: s3.margaret-hamilton.indiehosters.net
174+
port: 443

src/helm/env.d/production/values.impress.yaml.gotmpl

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -161,17 +161,14 @@ ingressMedia:
161161

162162
annotations:
163163
cert-manager.io/cluster-issuer: letsencrypt-prod
164-
nginx.ingress.kubernetes.io/auth-url: https://docs.numerique.gouv.fr/api/v1.0/documents/retrieve-auth/
165164
nginx.ingress.kubernetes.io/auth-response-headers: "Authorization, X-Amz-Date, X-Amz-Content-SHA256"
166-
nginx.ingress.kubernetes.io/upstream-vhost:
167-
secretKeyRef:
168-
name: impress-media-storage.bucket.libre.sh
169-
key: url
170-
nginx.ingress.kubernetes.io/rewrite-target: /impress-media-storage/$1
165+
nginx.ingress.kubernetes.io/auth-url: https://docs.numerique.gouv.fr/api/v1.0/documents/retrieve-auth/
166+
nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
167+
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
168+
nginx.ingress.kubernetes.io/rewrite-target: /impress-production-impress-media-storage/$1
169+
nginx.ingress.kubernetes.io/ssl-redirect: "true"
170+
nginx.ingress.kubernetes.io/upstream-vhost: s3.hedy-lamarr.indiehosters.net
171171

172172
serviceMedia:
173-
host:
174-
secretKeyRef:
175-
name: impress-media-storage.bucket.libre.sh
176-
key: url
177-
port: 9000
173+
host: s3.hedy-lamarr.indiehosters.net
174+
port: 443

src/helm/env.d/staging/values.impress.yaml.gotmpl

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -161,17 +161,14 @@ ingressMedia:
161161

162162
annotations:
163163
cert-manager.io/cluster-issuer: letsencrypt-prod
164-
nginx.ingress.kubernetes.io/auth-url: https://impress-staging.beta.numerique.gouv.fr/api/v1.0/documents/retrieve-auth/
165164
nginx.ingress.kubernetes.io/auth-response-headers: "Authorization, X-Amz-Date, X-Amz-Content-SHA256"
166-
nginx.ingress.kubernetes.io/upstream-vhost:
167-
secretKeyRef:
168-
name: impress-media-storage.bucket.libre.sh
169-
key: url
170-
nginx.ingress.kubernetes.io/rewrite-target: /impress-media-storage/$1
165+
nginx.ingress.kubernetes.io/auth-url: https://impress-staging.beta.numerique.gouv.fr/api/v1.0/documents/retrieve-auth/
166+
nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
167+
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
168+
nginx.ingress.kubernetes.io/rewrite-target: /impress-staging-impress-media-storage/$1
169+
nginx.ingress.kubernetes.io/ssl-redirect: "true"
170+
nginx.ingress.kubernetes.io/upstream-vhost: s3.margaret-hamilton.indiehosters.net
171171

172172
serviceMedia:
173-
host:
174-
secretKeyRef:
175-
name: impress-media-storage.bucket.libre.sh
176-
key: url
177-
port: 9000
173+
host: s3.margaret-hamilton.indiehosters.net
174+
port: 443

0 commit comments

Comments
 (0)