diff --git a/backend/package.json b/backend/package.json index 5b653ba9d..cf7b8686a 100644 --- a/backend/package.json +++ b/backend/package.json @@ -47,6 +47,7 @@ "cors": "~2.8.5", "cross-env": "~5.2.0", "date-fns": "2.0.0-alpha.27", + "debug": "~4.1.1", "dotenv": "~7.0.0", "express": "~4.16.4", "faker": "~4.1.0", @@ -86,7 +87,6 @@ "babel-jest": "~24.5.0", "chai": "~4.2.0", "cucumber": "~5.1.0", - "debug": "~4.1.1", "eslint": "~5.15.1", "eslint-config-standard": "~12.0.0", "eslint-plugin-import": "~2.16.0", diff --git a/deployment/human-connection/configmap.yaml b/deployment/human-connection/configmap.yaml index d38fb66f8..592bae1c0 100644 --- a/deployment/human-connection/configmap.yaml +++ b/deployment/human-connection/configmap.yaml @@ -3,13 +3,13 @@ kind: ConfigMap data: GRAPHQL_PORT: "4000" - GRAPHQL_URI: "https://nitro-staging.human-connection.org/api" + GRAPHQL_URI: "http://nitro-backend.human-connection:4000" MOCK: "false" NEO4J_URI: "bolt://nitro-neo4j.human-connection:7687" NEO4J_USER: "neo4j" - NEO4J_AUTH: none + NEO4J_AUTH: "none" CLIENT_URI: "https://nitro-staging.human-connection.org" - MAPBOX_TOKEN: pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ + MAPBOX_TOKEN: "pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ" metadata: name: configmap namespace: human-connection diff --git a/deployment/human-connection/deployment-backend.yaml b/deployment/human-connection/deployment-backend.yaml index 61f533f52..13cc7f7ed 100644 --- a/deployment/human-connection/deployment-backend.yaml +++ b/deployment/human-connection/deployment-backend.yaml @@ -4,10 +4,16 @@ metadata: name: nitro-backend namespace: human-connection + labels: + commit: "COMMIT" spec: replicas: 1 minReadySeconds: 15 progressDeadlineSeconds: 60 + strategy: + rollingUpdate: + maxSurge: 0 + maxUnavailable: "100%" selector: matchLabels: human-connection.org/selector: deployment-human-connection-backend @@ -23,42 +29,11 @@ imagePullPolicy: Always ports: - containerPort: 4000 - env: - - name: COMMIT - value: - - name: MOCK - value: "false" - - name: CLIENT_URI - valueFrom: - configMapKeyRef: - name: configmap - key: CLIENT_URI - - name: GRAPHQL_PORT - valueFrom: - configMapKeyRef: - name: configmap - key: GRAPHQL_PORT - - name: GRAPHQL_URI - valueFrom: - configMapKeyRef: - name: configmap - key: GRAPHQL_URI - - name: MAPBOX_TOKEN - valueFrom: - configMapKeyRef: - name: configmap - key: MAPBOX_TOKEN - - name: JWT_SECRET - valueFrom: - secretKeyRef: - name: human-connection - key: JWT_SECRET - optional: false - - name: NEO4J_URI - valueFrom: - configMapKeyRef: - name: configmap - key: NEO4J_URI + envFrom: + - configMapRef: + name: configmap + - secretRef: + name: human-connection volumeMounts: - mountPath: /nitro-backend/public/uploads name: uploads diff --git a/deployment/human-connection/deployment-neo4j.yaml b/deployment/human-connection/deployment-neo4j.yaml index 5ef5204a2..2c76a3322 100644 --- a/deployment/human-connection/deployment-neo4j.yaml +++ b/deployment/human-connection/deployment-neo4j.yaml @@ -6,7 +6,6 @@ namespace: human-connection spec: replicas: 1 - strategy: {} selector: matchLabels: human-connection.org/selector: deployment-human-connection-neo4j @@ -21,16 +20,12 @@ image: humanconnection/neo4j:latest imagePullPolicy: Always env: - - name: COMMIT - value: - name: NEO4J_apoc_import_file_enabled value: "true" - name: NEO4J_dbms_memory_pagecache_size value: 1G - name: NEO4J_dbms_memory_heap_max__size value: 1G - - name: NEO4J_AUTH - value: none - name: NEO4J_URI valueFrom: configMapKeyRef: diff --git a/deployment/human-connection/deployment-web.yaml b/deployment/human-connection/deployment-web.yaml index 64111a8ae..d69ebf617 100644 --- a/deployment/human-connection/deployment-web.yaml +++ b/deployment/human-connection/deployment-web.yaml @@ -3,6 +3,8 @@ kind: Deployment metadata: name: nitro-web namespace: human-connection + labels: + commit: "COMMIT" spec: replicas: 2 minReadySeconds: 15 @@ -18,27 +20,14 @@ spec: spec: containers: - name: web + envFrom: + - configMapRef: + name: configmap + - secretRef: + name: human-connection env: - - name: COMMIT - value: - name: HOST value: 0.0.0.0 - - name: BACKEND_URL - valueFrom: - configMapKeyRef: - name: configmap - key: GRAPHQL_URI - - name: MAPBOX_TOKEN - valueFrom: - configMapKeyRef: - name: configmap - key: MAPBOX_TOKEN - - name: JWT_SECRET - valueFrom: - secretKeyRef: - name: human-connection - key: JWT_SECRET - optional: false image: humanconnection/nitro-web:latest ports: - containerPort: 3000 diff --git a/deployment/human-connection/ingress/ingress.yaml b/deployment/human-connection/ingress/ingress.yaml index 52e358196..ba4681bc8 100644 --- a/deployment/human-connection/ingress/ingress.yaml +++ b/deployment/human-connection/ingress/ingress.yaml @@ -10,10 +10,10 @@ metadata: spec: tls: - hosts: - - nitro-master.human-connection.org + - nitro-staging.human-connection.org secretName: tls rules: - - host: nitro-master.human-connection.org + - host: nitro-staging.human-connection.org http: paths: - path: / diff --git a/deployment/secrets.template.yaml b/deployment/secrets.template.yaml index 915a31be5..ac56b7aa1 100644 --- a/deployment/secrets.template.yaml +++ b/deployment/secrets.template.yaml @@ -3,6 +3,7 @@ kind: Secret data: JWT_SECRET: "Yi8mJjdiNzhCRiZmdi9WZA==" MONGODB_PASSWORD: "TU9OR09EQl9QQVNTV09SRA==" + PRIVATE_KEY_PASSPHRASE: "YTdkc2Y3OHNhZGc4N2FkODdzZmFnc2FkZzc4" metadata: name: human-connection namespace: human-connection diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml index 4e84a665e..2c1a0a035 100644 --- a/docker-compose.travis.yml +++ b/docker-compose.travis.yml @@ -12,7 +12,7 @@ services: context: webapp target: build-and-test environment: - - BACKEND_URL=http://backend:4123 + - GRAPHQL_URI=http://backend:4123 backend: image: humanconnection/nitro-backend:builder build: diff --git a/docker-compose.yml b/docker-compose.yml index be604e273..a7e7c0802 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: - hc-network environment: - HOST=0.0.0.0 - - BACKEND_URL=http://backend:4000 + - GRAPHQL_URI=http://backend:4000 - MAPBOX_TOKEN="pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.bZ8KK9l70omjXbEkkbHGsQ" backend: image: humanconnection/nitro-backend:latest diff --git a/scripts/deploy.sh b/scripts/deploy.sh new file mode 100755 index 000000000..acb20ef21 --- /dev/null +++ b/scripts/deploy.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +sed -i "s//${TRAVIS_COMMIT}/g" patch-deployment.yaml +kubectl --namespace=human-connection patch deployment nitro-backend -p "$(cat patch-deployment.yaml)" +kubectl --namespace=human-connection patch deployment nitro-web -p "$(cat patch-deployment.yaml)" diff --git a/scripts/patch-deployment.yaml b/scripts/patch-deployment.yaml new file mode 100644 index 000000000..05afe9b31 --- /dev/null +++ b/scripts/patch-deployment.yaml @@ -0,0 +1,3 @@ +metadata: + labels: + commit: diff --git a/webapp/docker-compose.travis.yml b/webapp/docker-compose.travis.yml index 5cf1c4cb3..0f02ea27d 100644 --- a/webapp/docker-compose.travis.yml +++ b/webapp/docker-compose.travis.yml @@ -6,5 +6,5 @@ services: context: . target: build-and-test environment: - - BACKEND_URL=http://backend:4123 + - GRAPHQL_URI=http://backend:4123 - NODE_ENV=test diff --git a/webapp/docker-compose.yml b/webapp/docker-compose.yml index 3b09fa57d..4ce3de926 100644 --- a/webapp/docker-compose.yml +++ b/webapp/docker-compose.yml @@ -13,7 +13,7 @@ services: - hc-network environment: - HOST=0.0.0.0 - - BACKEND_URL=http://backend:4000 + - GRAPHQL_URI=http://backend:4000 - MAPBOX_TOKEN="pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.bZ8KK9l70omjXbEkkbHGsQ" networks: diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js index 9e3fa9575..70ab6333d 100644 --- a/webapp/nuxt.config.js +++ b/webapp/nuxt.config.js @@ -123,7 +123,7 @@ module.exports = { proxy: { '/api': { // make this configurable (nuxt-dotenv) - target: process.env.BACKEND_URL || 'http://localhost:4000', + target: process.env.GRAPHQL_URI || 'http://localhost:4000', pathRewrite: { '^/api': '' }, toProxy: true, // cloudflare needs that changeOrigin: true, diff --git a/webapp/plugins/apollo-config.js b/webapp/plugins/apollo-config.js index 42cff717a..f65700ab4 100644 --- a/webapp/plugins/apollo-config.js +++ b/webapp/plugins/apollo-config.js @@ -1,5 +1,5 @@ export default ({ app }) => { - const backendUrl = process.env.BACKEND_URL || 'http://localhost:4000' + const backendUrl = process.env.GRAPHQL_URI || 'http://localhost:4000' return { httpEndpoint: process.server ? backendUrl : '/api', httpLinkOptions: {