From e7d3cf59532df46bdaa5b680f0ed45db0ea9c2cc Mon Sep 17 00:00:00 2001 From: wimo7083 Date: Sat, 27 Apr 2019 23:00:24 -0600 Subject: [PATCH 1/3] add the database-service for prod and staging using the current staging database, and include POSTGRES_HOST --- kubernetes/resources_api/overlays/prod/kustomization.yaml | 1 + kubernetes/resources_api/overlays/staging/kustomization.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/kubernetes/resources_api/overlays/prod/kustomization.yaml b/kubernetes/resources_api/overlays/prod/kustomization.yaml index 3f4ee89..0d3e299 100644 --- a/kubernetes/resources_api/overlays/prod/kustomization.yaml +++ b/kubernetes/resources_api/overlays/prod/kustomization.yaml @@ -8,3 +8,4 @@ bases: resources: - ingress.yaml +- database-service.yaml diff --git a/kubernetes/resources_api/overlays/staging/kustomization.yaml b/kubernetes/resources_api/overlays/staging/kustomization.yaml index bf2e430..7fdc37f 100644 --- a/kubernetes/resources_api/overlays/staging/kustomization.yaml +++ b/kubernetes/resources_api/overlays/staging/kustomization.yaml @@ -8,6 +8,7 @@ bases: resources: - ingress.yaml +- database-service.yaml patchesStrategicMerge: - deployment.yaml From 3d7c721d66f3ad37d111f07ac8e1cd6f7ac6ab3d Mon Sep 17 00:00:00 2001 From: wimo7083 Date: Sat, 27 Apr 2019 23:02:17 -0600 Subject: [PATCH 2/3] add the POSTGRES_HOST to container variables, and include the new database yaml files --- kubernetes/resources_api/base/deployment.yaml | 2 ++ .../resources_api/overlays/prod/database-service.yaml | 7 +++++++ .../resources_api/overlays/staging/database-service.yaml | 7 +++++++ 3 files changed, 16 insertions(+) create mode 100644 kubernetes/resources_api/overlays/prod/database-service.yaml create mode 100644 kubernetes/resources_api/overlays/staging/database-service.yaml diff --git a/kubernetes/resources_api/base/deployment.yaml b/kubernetes/resources_api/base/deployment.yaml index 8c441d5..f218b3f 100644 --- a/kubernetes/resources_api/base/deployment.yaml +++ b/kubernetes/resources_api/base/deployment.yaml @@ -26,6 +26,8 @@ spec: key: postgres_password - name: POSTGRES_DB value: resources-psql + - name: POSTGRES_HOST + value: resources-postgres volumes: - name: resources-api-secrets secret: diff --git a/kubernetes/resources_api/overlays/prod/database-service.yaml b/kubernetes/resources_api/overlays/prod/database-service.yaml new file mode 100644 index 0000000..dfd6e6f --- /dev/null +++ b/kubernetes/resources_api/overlays/prod/database-service.yaml @@ -0,0 +1,7 @@ +kind: Service +apiVersion: v1 +metadata: + name: resources-postgres +spec: + type: ExternalName + externalName: resources-api-20190427.czwauqf3tjaz.us-east-2.rds.amazonaws.com diff --git a/kubernetes/resources_api/overlays/staging/database-service.yaml b/kubernetes/resources_api/overlays/staging/database-service.yaml new file mode 100644 index 0000000..810c0f6 --- /dev/null +++ b/kubernetes/resources_api/overlays/staging/database-service.yaml @@ -0,0 +1,7 @@ +kind: Service +apiVersion: v1 +metadata: + name: opcode-postgres +spec: + type: ExternalName + externalName: resources-api-20190427.czwauqf3tjaz.us-east-2.rds.amazonaws.com From 0a4807fbec266deaf9dc04f0eaf6517eb44b61fe Mon Sep 17 00:00:00 2001 From: wimo7083 Date: Sat, 27 Apr 2019 23:22:02 -0600 Subject: [PATCH 3/3] update the db name to match actual instance --- kubernetes/resources_api/base/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/resources_api/base/deployment.yaml b/kubernetes/resources_api/base/deployment.yaml index f218b3f..1e6986e 100644 --- a/kubernetes/resources_api/base/deployment.yaml +++ b/kubernetes/resources_api/base/deployment.yaml @@ -25,7 +25,7 @@ spec: name: resources-api-secrets key: postgres_password - name: POSTGRES_DB - value: resources-psql + value: resources_api - name: POSTGRES_HOST value: resources-postgres volumes: