From f901e55081d724ff7865e7d2d63630f7a8fef7fb Mon Sep 17 00:00:00 2001 From: Travis Raines Date: Mon, 10 Aug 2020 10:58:21 -0700 Subject: [PATCH] chore: update single manifests from base --- .../all-in-one-dbless-k4k8s-enterprise.yaml | 20 ++++++------- deploy/single/all-in-one-dbless.yaml | 20 ++++++------- .../all-in-one-postgres-enterprise.yaml | 28 +++++++++---------- deploy/single/all-in-one-postgres.yaml | 24 ++++++++-------- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/deploy/single/all-in-one-dbless-k4k8s-enterprise.yaml b/deploy/single/all-in-one-dbless-k4k8s-enterprise.yaml index ddcf4900cd..6682c20522 100644 --- a/deploy/single/all-in-one-dbless-k4k8s-enterprise.yaml +++ b/deploy/single/all-in-one-dbless-k4k8s-enterprise.yaml @@ -651,24 +651,24 @@ spec: secretKeyRef: key: license name: kong-enterprise-license - - name: KONG_ADMIN_ACCESS_LOG - value: /dev/stdout - - name: KONG_ADMIN_ERROR_LOG - value: /dev/stderr + - name: KONG_PROXY_LISTEN + value: 0.0.0.0:8000, 0.0.0.0:8443 ssl http2 + - name: KONG_PORT_MAPS + value: 80:8000, 443:8443 - name: KONG_ADMIN_LISTEN value: 127.0.0.1:8444 ssl + - name: KONG_STATUS_LISTEN + value: 0.0.0.0:8100 - name: KONG_DATABASE value: "off" - name: KONG_NGINX_WORKER_PROCESSES value: "1" - - name: KONG_PORT_MAPS - value: "80:8000, 443:8443" + - name: KONG_ADMIN_ACCESS_LOG + value: /dev/stdout + - name: KONG_ADMIN_ERROR_LOG + value: /dev/stderr - name: KONG_PROXY_ERROR_LOG value: /dev/stderr - - name: KONG_PROXY_LISTEN - value: 0.0.0.0:8000, 0.0.0.0:8443 ssl http2 - - name: KONG_STATUS_LISTEN - value: 0.0.0.0:8100 image: kong-docker-kong-enterprise-k8s.bintray.io/kong-enterprise-k8s:2.0.4.1-alpine lifecycle: preStop: diff --git a/deploy/single/all-in-one-dbless.yaml b/deploy/single/all-in-one-dbless.yaml index b480eeceb2..67647082d0 100644 --- a/deploy/single/all-in-one-dbless.yaml +++ b/deploy/single/all-in-one-dbless.yaml @@ -646,24 +646,24 @@ spec: spec: containers: - env: - - name: KONG_ADMIN_ACCESS_LOG - value: /dev/stdout - - name: KONG_ADMIN_ERROR_LOG - value: /dev/stderr + - name: KONG_PROXY_LISTEN + value: 0.0.0.0:8000, 0.0.0.0:8443 ssl http2 + - name: KONG_PORT_MAPS + value: 80:8000, 443:8443 - name: KONG_ADMIN_LISTEN value: 127.0.0.1:8444 ssl + - name: KONG_STATUS_LISTEN + value: 0.0.0.0:8100 - name: KONG_DATABASE value: "off" - name: KONG_NGINX_WORKER_PROCESSES value: "1" - - name: KONG_PORT_MAPS - value: "80:8000, 443:8443" + - name: KONG_ADMIN_ACCESS_LOG + value: /dev/stdout + - name: KONG_ADMIN_ERROR_LOG + value: /dev/stderr - name: KONG_PROXY_ERROR_LOG value: /dev/stderr - - name: KONG_PROXY_LISTEN - value: 0.0.0.0:8000, 0.0.0.0:8443 ssl http2 - - name: KONG_STATUS_LISTEN - value: 0.0.0.0:8100 image: kong:2.0 lifecycle: preStop: diff --git a/deploy/single/all-in-one-postgres-enterprise.yaml b/deploy/single/all-in-one-postgres-enterprise.yaml index 923854e232..f7abc7bb7a 100644 --- a/deploy/single/all-in-one-postgres-enterprise.yaml +++ b/deploy/single/all-in-one-postgres-enterprise.yaml @@ -697,36 +697,36 @@ spec: secretKeyRef: key: license name: kong-enterprise-license - - name: KONG_ADMIN_ACCESS_LOG - value: /dev/stdout - name: KONG_ADMIN_API_URI value: set-me - - name: KONG_ADMIN_ERROR_LOG - value: /dev/stderr - name: KONG_ADMIN_GUI_AUTH value: basic-auth + - name: KONG_ENFORCE_RBAC + value: "on" - name: KONG_ADMIN_GUI_SESSION_CONF value: '{"cookie_secure":false,"storage":"kong","cookie_name":"admin_session","cookie_lifetime":31557600,"cookie_samesite":"off","secret":"please-change-me"}' + - name: KONG_PROXY_LISTEN + value: 0.0.0.0:8000, 0.0.0.0:8443 ssl http2 + - name: KONG_PORT_MAPS + value: 80:8000, 443:8443 - name: KONG_ADMIN_LISTEN value: 0.0.0.0:8001, 0.0.0.0:8444 ssl + - name: KONG_STATUS_LISTEN + value: 0.0.0.0:8100 - name: KONG_DATABASE value: postgres - - name: KONG_ENFORCE_RBAC - value: "on" - - name: KONG_NGINX_WORKER_PROCESSES - value: "1" - name: KONG_PG_HOST value: postgres - name: KONG_PG_PASSWORD value: kong - - name: KONG_PORT_MAPS - value: "80:8000, 443:8443" - - name: KONG_PROXY_LISTEN - value: 0.0.0.0:8000, 0.0.0.0:8443 ssl http2 + - name: KONG_NGINX_WORKER_PROCESSES + value: "1" + - name: KONG_ADMIN_ACCESS_LOG + value: /dev/stdout + - name: KONG_ADMIN_ERROR_LOG + value: /dev/stderr - name: KONG_PROXY_ERROR_LOG value: /dev/stderr - - name: KONG_STATUS_LISTEN - value: 0.0.0.0:8100 image: kong-docker-kong-enterprise-edition-docker.bintray.io/kong-enterprise-edition:1.5.0.2-alpine lifecycle: preStop: diff --git a/deploy/single/all-in-one-postgres.yaml b/deploy/single/all-in-one-postgres.yaml index 307f4e5723..b85ee48816 100644 --- a/deploy/single/all-in-one-postgres.yaml +++ b/deploy/single/all-in-one-postgres.yaml @@ -660,28 +660,28 @@ spec: spec: containers: - env: - - name: KONG_ADMIN_ACCESS_LOG - value: /dev/stdout - - name: KONG_ADMIN_ERROR_LOG - value: /dev/stderr + - name: KONG_PROXY_LISTEN + value: 0.0.0.0:8000, 0.0.0.0:8443 ssl http2 + - name: KONG_PORT_MAPS + value: 80:8000, 443:8443 - name: KONG_ADMIN_LISTEN value: 127.0.0.1:8444 ssl + - name: KONG_STATUS_LISTEN + value: 0.0.0.0:8100 - name: KONG_DATABASE value: postgres - - name: KONG_NGINX_WORKER_PROCESSES - value: "1" - name: KONG_PG_HOST value: postgres - name: KONG_PG_PASSWORD value: kong - - name: KONG_PORT_MAPS - value: "80:8000, 443:8443" + - name: KONG_NGINX_WORKER_PROCESSES + value: "1" + - name: KONG_ADMIN_ACCESS_LOG + value: /dev/stdout + - name: KONG_ADMIN_ERROR_LOG + value: /dev/stderr - name: KONG_PROXY_ERROR_LOG value: /dev/stderr - - name: KONG_PROXY_LISTEN - value: 0.0.0.0:8000, 0.0.0.0:8443 ssl http2 - - name: KONG_STATUS_LISTEN - value: 0.0.0.0:8100 image: kong:2.0 lifecycle: preStop: