From c95bcda42f732de93e86b74d7322ff86a14e9a65 Mon Sep 17 00:00:00 2001 From: wimo7083 Date: Fri, 9 Nov 2018 21:12:15 -0700 Subject: [PATCH 1/6] add POSTGRES_USER to get the right value --- kubernetes/operationcode_backend/deployment.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kubernetes/operationcode_backend/deployment.yml b/kubernetes/operationcode_backend/deployment.yml index b424805..ecbd872 100644 --- a/kubernetes/operationcode_backend/deployment.yml +++ b/kubernetes/operationcode_backend/deployment.yml @@ -58,6 +58,11 @@ spec: value: redis://opcode-redis:6379/0 - name: RAILS_ENV value: production + - name: POSTGRES_USER + valueFrom: + secretKeyRef: + name: backend-secrets + key: postgres_user - name: SLACK_SUBDOMAIN valueFrom: secretKeyRef: From d631ca3ac4459f1c7e068221362535da714c9645 Mon Sep 17 00:00:00 2001 From: wimo7083 Date: Fri, 9 Nov 2018 21:14:59 -0700 Subject: [PATCH 2/6] add postgres_user to template --- kubernetes/operationcode_backend/secrets/secret.yml.tpl | 1 + 1 file changed, 1 insertion(+) diff --git a/kubernetes/operationcode_backend/secrets/secret.yml.tpl b/kubernetes/operationcode_backend/secrets/secret.yml.tpl index 96ba63f..d2add92 100644 --- a/kubernetes/operationcode_backend/secrets/secret.yml.tpl +++ b/kubernetes/operationcode_backend/secrets/secret.yml.tpl @@ -9,6 +9,7 @@ data: airtable_api_key: SECRET jwt_secret_key: SECRET postgres_password: SECRET + postgres_user: SECRET secret_key_base: SECRET sendgrid_password: SECRET sendgrid_username: SECRET From 7a7cd7902de9300a0693fcbfdb0378f2491e313f Mon Sep 17 00:00:00 2001 From: wimo7083 Date: Fri, 9 Nov 2018 21:39:23 -0700 Subject: [PATCH 3/6] add slack new admin token --- kubernetes/operationcode_backend/deployment.yml | 5 +++++ kubernetes/operationcode_backend/secrets/secret.yml.tpl | 1 + 2 files changed, 6 insertions(+) diff --git a/kubernetes/operationcode_backend/deployment.yml b/kubernetes/operationcode_backend/deployment.yml index ecbd872..c438f15 100644 --- a/kubernetes/operationcode_backend/deployment.yml +++ b/kubernetes/operationcode_backend/deployment.yml @@ -27,6 +27,11 @@ spec: secretKeyRef: name: backend-secrets key: airtable_api_key + - name: SLACK_LEGACY_ADMIN_TOKEN + valueFrom: + secretKeyRef: + name: backend-secrets + key: slack_legacy_admin_token - name: AIRTABLE_BASE_ID valueFrom: secretKeyRef: diff --git a/kubernetes/operationcode_backend/secrets/secret.yml.tpl b/kubernetes/operationcode_backend/secrets/secret.yml.tpl index d2add92..35c4dbd 100644 --- a/kubernetes/operationcode_backend/secrets/secret.yml.tpl +++ b/kubernetes/operationcode_backend/secrets/secret.yml.tpl @@ -11,6 +11,7 @@ data: postgres_password: SECRET postgres_user: SECRET secret_key_base: SECRET + slack_legacy_admin_token: SECRET sendgrid_password: SECRET sendgrid_username: SECRET sendgrid_api_key: SECRET From 3d228bb6ce333d7d785cf1bbc6a2f60e6636f48c Mon Sep 17 00:00:00 2001 From: wimo7083 Date: Fri, 9 Nov 2018 21:59:48 -0700 Subject: [PATCH 4/6] add optional attributes for some keys --- kubernetes/operationcode_backend/deployment.yml | 5 +++++ kubernetes/operationcode_backend/secrets/secret.yml.tpl | 1 + 2 files changed, 6 insertions(+) diff --git a/kubernetes/operationcode_backend/deployment.yml b/kubernetes/operationcode_backend/deployment.yml index c438f15..b778073 100644 --- a/kubernetes/operationcode_backend/deployment.yml +++ b/kubernetes/operationcode_backend/deployment.yml @@ -37,26 +37,31 @@ spec: secretKeyRef: name: backend-secrets key: airtable_base_id + optional: true - name: GIT_HUB_CLIENT_ID valueFrom: secretKeyRef: name: backend-secrets key: git_hub_client_id + optional: true - name: GIT_HUB_CLIENT_SECRET valueFrom: secretKeyRef: name: backend-secrets key: git_hub_client_secret + optional: true - name: GIT_HUB_OAUTH_TOKEN valueFrom: secretKeyRef: name: backend-secrets key: git_hub_oauth_token + optional: true - name: PY_BOT_AUTH_KEY valueFrom: secretKeyRef: name: backend-secrets key: py_bot_auth_key + optional: true - name: POSTGRES_HOST value: opcode-postgres - name: REDIS_URL diff --git a/kubernetes/operationcode_backend/secrets/secret.yml.tpl b/kubernetes/operationcode_backend/secrets/secret.yml.tpl index 35c4dbd..cffd211 100644 --- a/kubernetes/operationcode_backend/secrets/secret.yml.tpl +++ b/kubernetes/operationcode_backend/secrets/secret.yml.tpl @@ -5,6 +5,7 @@ metadata: type: Opaque data: airtable_add_user_base_id: SECRET + airtable_base_id: SECRET airtable_add_user_table_name: SECRET airtable_api_key: SECRET jwt_secret_key: SECRET From 94eabb5b7aadf7a8fd055e0fed6c4848d5f2028d Mon Sep 17 00:00:00 2001 From: wimo7083 Date: Sat, 10 Nov 2018 00:47:17 -0700 Subject: [PATCH 5/6] of course I need to add these to redis.... --- kubernetes/operationcode_backend/deployment.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/kubernetes/operationcode_backend/deployment.yml b/kubernetes/operationcode_backend/deployment.yml index b778073..0d0007b 100644 --- a/kubernetes/operationcode_backend/deployment.yml +++ b/kubernetes/operationcode_backend/deployment.yml @@ -78,6 +78,11 @@ spec: secretKeyRef: name: backend-secrets key: slack_subdomain + - name: SLACK_LEGACY_ADMIN_TOKEN + valueFrom: + secretKeyRef: + name: backend-secrets + key: slack_legacy_admin_token - name: SLACK_TOKEN valueFrom: secretKeyRef: @@ -111,6 +116,11 @@ spec: secretKeyRef: name: backend-secrets key: postgres_password + - name: POSTGRES_USER + valueFrom: + secretKeyRef: + name: backend-secrets + key: postgres_user - name: POSTGRES_HOST value: opcode-postgres - name: REDIS_URL From 33087a78c1341791c775017e5485022d1d16f8e2 Mon Sep 17 00:00:00 2001 From: wimo7083 Date: Sat, 10 Nov 2018 01:08:59 -0700 Subject: [PATCH 6/6] put slack token in redis section also --- kubernetes/operationcode_backend/deployment.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kubernetes/operationcode_backend/deployment.yml b/kubernetes/operationcode_backend/deployment.yml index 0d0007b..20c73ff 100644 --- a/kubernetes/operationcode_backend/deployment.yml +++ b/kubernetes/operationcode_backend/deployment.yml @@ -78,11 +78,6 @@ spec: secretKeyRef: name: backend-secrets key: slack_subdomain - - name: SLACK_LEGACY_ADMIN_TOKEN - valueFrom: - secretKeyRef: - name: backend-secrets - key: slack_legacy_admin_token - name: SLACK_TOKEN valueFrom: secretKeyRef: @@ -130,6 +125,11 @@ spec: secretKeyRef: name: backend-secrets key: slack_subdomain + - name: SLACK_LEGACY_ADMIN_TOKEN + valueFrom: + secretKeyRef: + name: backend-secrets + key: slack_legacy_admin_token - name: SLACK_TOKEN valueFrom: secretKeyRef: