From 32d285924e19061ef3a2b1b2ab98255f35da2ebb Mon Sep 17 00:00:00 2001 From: kahootali Date: Tue, 8 Jan 2019 13:47:34 +0500 Subject: [PATCH] change to global namespace --- Makefile | 2 +- deployments/kubernetes/chart/developer-handbook/values.yaml | 6 +++--- deployments/kubernetes/templates/chart/values.yaml.tmpl | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index a8cf92e..4887bb0 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CHART_NAME ?= developer-handbook -NAMESPACE_NAME ?= tools +NAMESPACE_NAME ?= global RELEASE_NAME ?= $(NAMESPACE_NAME)-$(CHART_NAME) install-chart: diff --git a/deployments/kubernetes/chart/developer-handbook/values.yaml b/deployments/kubernetes/chart/developer-handbook/values.yaml index ba46506..cc80244 100644 --- a/deployments/kubernetes/chart/developer-handbook/values.yaml +++ b/deployments/kubernetes/chart/developer-handbook/values.yaml @@ -8,13 +8,13 @@ handbook: annotations: xposer.stakater.com/annotations: |- kubernetes.io/ingress.class: external-ingress - ingress.kubernetes.io/force-ssl-redirect: false + ingress.kubernetes.io/force-ssl-redirect: true certmanager.k8s.io/cluster-issuer: letsencrypt-production forecastle.stakater.com/appName: Developer-Handbook forecastle.stakater.com/expose: true forecastle.stakater.com/icon: https://raw.githubusercontent.com/stakater/ForecastleIcons/master/book.png config.xposer.stakater.com/IngressURLTemplate: "{{ `{{.Service}}-{{.Namespace}}.{{.Domain}}` }}" - config.xposer.stakater.com/Domain: stackator.com + config.xposer.stakater.com/Domain: stakater.com config.xposer.stakater.com/TLS: "true" labels: expose: 'true' @@ -30,7 +30,7 @@ handbook: authproxy.stakater.com/enabled: "true" authproxy.stakater.com/upstream-url: "http://127.0.0.1:8080" authproxy.stakater.com/source-service-name: developerhandbook - authproxy.stakater.com/redirection-url: "https://developerhandbook.tools.stackator.com" + authproxy.stakater.com/redirection-url: "https://developerhandbook.global.stakater.com" authproxy.stakater.com/listen: "0.0.0.0:80" image: diff --git a/deployments/kubernetes/templates/chart/values.yaml.tmpl b/deployments/kubernetes/templates/chart/values.yaml.tmpl index b7a749b..a922ae5 100644 --- a/deployments/kubernetes/templates/chart/values.yaml.tmpl +++ b/deployments/kubernetes/templates/chart/values.yaml.tmpl @@ -11,13 +11,13 @@ handbook: annotations: xposer.stakater.com/annotations: |- kubernetes.io/ingress.class: external-ingress - ingress.kubernetes.io/force-ssl-redirect: false + ingress.kubernetes.io/force-ssl-redirect: true certmanager.k8s.io/cluster-issuer: letsencrypt-production forecastle.stakater.com/appName: Developer-Handbook forecastle.stakater.com/expose: true forecastle.stakater.com/icon: https://raw.githubusercontent.com/stakater/ForecastleIcons/master/book.png config.xposer.stakater.com/IngressURLTemplate: "{{ `{{.Service}}.{{.Namespace}}.{{.Domain}}` }}" - config.xposer.stakater.com/Domain: stackator.com + config.xposer.stakater.com/Domain: stakater.com config.xposer.stakater.com/TLS: "true" config.xposer.stakater.com/IngressNameTemplate: "{{ `{{.Service}}-{{.Namespace}}` }}" labels: @@ -34,7 +34,7 @@ handbook: authproxy.stakater.com/enabled: "true" authproxy.stakater.com/upstream-url: "http://127.0.0.1:8080" authproxy.stakater.com/source-service-name: developerhandbook - authproxy.stakater.com/redirection-url: "https://developerhandbook.tools.stackator.com" + authproxy.stakater.com/redirection-url: "https://developerhandbook.global.stakater.com" authproxy.stakater.com/listen: "0.0.0.0:80" image: name: {{ getenv "DOCKER_IMAGE" }}