From 5d5db1ea47bc25893a97e898e7b181942bb02403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 7 Feb 2019 23:41:27 +0100 Subject: [PATCH] Use single configmap for simplicity --- .../{configmaps.yaml => configmap.yaml} | 16 +--------------- human-connection/deployment-backend.yaml | 12 ++++++------ human-connection/deployment-neo4j.yaml | 6 +++--- human-connection/deployment-web.yaml | 6 +++--- 4 files changed, 13 insertions(+), 27 deletions(-) rename human-connection/{configmaps.yaml => configmap.yaml} (63%) diff --git a/human-connection/configmaps.yaml b/human-connection/configmap.yaml similarity index 63% rename from human-connection/configmaps.yaml rename to human-connection/configmap.yaml index 6c836c220..50ae17e23 100644 --- a/human-connection/configmaps.yaml +++ b/human-connection/configmap.yaml @@ -5,25 +5,11 @@ GRAPHQL_PORT: "4000" GRAPHQL_URI: "http://nitro-backend.human-connection:4000" MOCK: "false" - metadata: - name: human-connection-backend - namespace: human-connection ---- - apiVersion: v1 - kind: ConfigMap - data: NEO4J_URI: "bolt://nitro-neo4j.human-connection:7687" NEO4J_USER: "neo4j" NEO4J_AUTH: none - metadata: - name: human-connection-neo4j - namespace: human-connection ---- - apiVersion: v1 - kind: ConfigMap - data: CLIENT_URI: "https://nitro-human-connection.human-connection.org" MAPBOX_TOKEN: pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ metadata: - name: human-connection-web + name: configmap namespace: human-connection diff --git a/human-connection/deployment-backend.yaml b/human-connection/deployment-backend.yaml index ac1f31ed4..49bb85f5c 100644 --- a/human-connection/deployment-backend.yaml +++ b/human-connection/deployment-backend.yaml @@ -31,33 +31,33 @@ - name: CLIENT_URI valueFrom: configMapKeyRef: - name: human-connection-web + name: configmap key: CLIENT_URI - name: GRAPHQL_PORT valueFrom: configMapKeyRef: - name: human-connection-backend + name: configmap key: GRAPHQL_PORT - name: GRAPHQL_URI valueFrom: configMapKeyRef: - name: human-connection-backend + name: configmap key: GRAPHQL_URI - name: MAPBOX_TOKEN valueFrom: configMapKeyRef: - name: human-connection-web + name: configmap key: MAPBOX_TOKEN - name: JWT_SECRET valueFrom: secretKeyRef: - name: human-connection + name: secret key: JWT_SECRET optional: false - name: NEO4J_URI valueFrom: configMapKeyRef: - name: human-connection-neo4j + name: configmap key: NEO4J_URI volumeMounts: - mountPath: /nitro-backend/public/uploads diff --git a/human-connection/deployment-neo4j.yaml b/human-connection/deployment-neo4j.yaml index c84431bb5..e3110cac2 100644 --- a/human-connection/deployment-neo4j.yaml +++ b/human-connection/deployment-neo4j.yaml @@ -34,17 +34,17 @@ - name: NEO4J_URI valueFrom: configMapKeyRef: - name: human-connection-neo4j + name: configmap key: NEO4J_URI - name: NEO4J_USER valueFrom: configMapKeyRef: - name: human-connection-neo4j + name: configmap key: NEO4J_USER - name: NEO4J_AUTH valueFrom: configMapKeyRef: - name: human-connection-neo4j + name: configmap key: NEO4J_AUTH ports: - containerPort: 7687 diff --git a/human-connection/deployment-web.yaml b/human-connection/deployment-web.yaml index 769b44469..a3dafe766 100644 --- a/human-connection/deployment-web.yaml +++ b/human-connection/deployment-web.yaml @@ -26,17 +26,17 @@ spec: - name: BACKEND_URL valueFrom: configMapKeyRef: - name: human-connection-backend + name: configmap key: GRAPHQL_URI - name: MAPBOX_TOKEN valueFrom: configMapKeyRef: - name: human-connection-web + name: configmap key: MAPBOX_TOKEN - name: JWT_SECRET valueFrom: secretKeyRef: - name: human-connection + name: secret key: JWT_SECRET optional: false image: humanconnection/nitro-web:latest