Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(cleanup): recaptcha values #1171

Merged
merged 4 commits into from
Sep 19, 2023
Merged

chore(cleanup): recaptcha values #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb6340d
cleanup local
deer-wmde Sep 19, 2023
1e00b27
cleanup staging
deer-wmde Sep 19, 2023
c9b1c4f
cleanup production
deer-wmde Sep 19, 2023
b349bd2
adjust local recaptcha secret names according to tf module
deer-wmde Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions k8s/helmfile/env/local/api.values.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,13 @@ app:
smtpPasswordSecretKey: password
recaptcha:
minScore: 0.5
secretSecretName: recaptcha-v3-dev-secrets
secretSecretName: {{ .Values.external.recaptcha3.secretName }}
secretSecretKey: secret_key
# TODO is this needed for local?
gce:
serviceAccountSecret: null
stackdriver:
enabled: false
external:
letsencrypt:
email: [email protected]
recaptcha2:
secretName: recaptcha-v2-secrets
recaptcha3:
secretName: recaptcha-v3-secrets

replicaCount:
web: 1
Expand Down
4 changes: 2 additions & 2 deletions k8s/helmfile/env/local/mediawiki-139.values.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ mw:
smtpUserSecretName: null
smtpPasswordSecretName: null
recaptcha:
sitekeySecretName: recaptcha-v2-dev-secrets
sitekeySecretName: {{ .Values.external.recaptcha2.secretName }}
sitekeySecretKey: site_key
secretkeySecretName: recaptcha-v2-dev-secrets
secretkeySecretName: {{ .Values.external.recaptcha2.secretName }}
secretkeySecretKey: secret_key

replicaCount:
Expand Down
2 changes: 1 addition & 1 deletion k8s/helmfile/env/local/ui.values.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ image:
tag: sha-9a37f40

ui:
recaptchaSitekeySecretName: recaptcha-v3-dev-secrets
recaptchaSitekeySecretName: {{ .Values.external.recaptcha3.secretName }}
recaptchaSitekeySecretKey: site_key

ingress:
Expand Down
2 changes: 0 additions & 2 deletions k8s/helmfile/env/production/api.values.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ app:
smtphost: smtp.eu.mailgun.org
smtpport: 587
recaptcha:
sitekeySecretName: {{ .Values.external.recaptcha3.secretName }}
sitekeySecretKey: site_key
secretSecretName: {{ .Values.external.recaptcha3.secretName }}
secretSecretKey: secret_key
badgehide: true
Expand Down
2 changes: 1 addition & 1 deletion k8s/helmfile/env/staging/api.values.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ app:
smtpport: 587
recaptcha:
minScore: 0.5
secretSecretName: recaptcha-v3-secrets
secretSecretName: {{ .Values.external.recaptcha3.secretName }}
secretSecretKey: secret_key

trustedProxy:
Expand Down
8 changes: 4 additions & 4 deletions tf/env/local/secrets-recapcha.tf → tf/env/local/secrets-recaptcha.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
resource "kubernetes_secret" "recaptcha-v3-dev-secrets" {
resource "kubernetes_secret" "recaptcha-v3-secrets" {
for_each = toset(["default", "api-jobs", "adhoc-jobs"])
metadata {
name = "recaptcha-v3-dev-secrets"
name = "recaptcha-v3-secrets"
# default as staging
namespace = each.value
}
Expand All @@ -17,10 +17,10 @@ moved {
to = kubernetes_secret.recaptcha-v3-dev-secrets["default"]
}

resource "kubernetes_secret" "recaptcha-v2-dev-secrets" {
resource "kubernetes_secret" "recaptcha-v2-secrets" {
for_each = toset(["default", "api-jobs", "adhoc-jobs"])
metadata {
name = "recaptcha-v2-dev-secrets"
name = "recaptcha-v2-secrets"
# default as staging
namespace = each.value
}
Expand Down