Merge pull request #14 from stakater/remove-proxy

remove proxy
stakater · Jan 16, 2019 · 13daa55 · 13daa55
2 parents 3dbd6b4 + 81e52bd
commit 13daa55
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 17 deletions.
diff --git a/deployments/kubernetes/chart/developer-handbook/templates/deployment.yaml b/deployments/kubernetes/chart/developer-handbook/templates/deployment.yaml
@@ -5,8 +5,10 @@ metadata:
 {{ include "developer-handbook.labels.stakater" . | indent 4 }}
 {{ include "developer-handbook.labels.chart" . | indent 4 }}
   name: {{ template "developer-handbook.name" . }}
+{{ if .Values.handbook.deployment.annotations }}
   annotations:
 {{ toYaml .Values.handbook.deployment.annotations | indent 4 }}
+{{ end }}
 spec:
   replicas: {{ .Values.handbook.deployment.replicas }}
   template:

diff --git a/deployments/kubernetes/chart/developer-handbook/templates/service.yaml b/deployments/kubernetes/chart/developer-handbook/templates/service.yaml
@@ -6,8 +6,10 @@ metadata:
 {{ include "developer-handbook.labels.chart" . | indent 4 }}
     expose: {{ .Values.handbook.service.labels.expose | quote }}
   name: {{ .Values.handbook.service.name | quote }}
+{{ if .Values.handbook.service.annotations }}
   annotations:
 {{ toYaml .Values.handbook.service.annotations | indent 4 }}  
+{{ end }}
 spec:
   selector:
 {{ toYaml .Values.handbook.deployment.podLabels | indent 4 }}

diff --git a/deployments/kubernetes/chart/developer-handbook/values.yaml b/deployments/kubernetes/chart/developer-handbook/values.yaml
@@ -24,14 +24,6 @@ handbook:
       app: developer-handbook
     containerName: handbook
     imagePullSecrets: docker-registry-secret 
-    annotations:
-      authproxy.stakater.com/image-name: quay.io/gambol99/keycloak-proxy
-      authproxy.stakater.com/image-tag: v2.1.1
-      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.global.stakater.com"
-      authproxy.stakater.com/listen: "0.0.0.0:80"
 
     image:
       name: stakater/developer-handbook

diff --git a/deployments/kubernetes/templates/chart/values.yaml.tmpl b/deployments/kubernetes/templates/chart/values.yaml.tmpl
@@ -27,15 +27,7 @@ handbook:
     podLabels:      
       app: developer-handbook
     containerName: handbook
-    imagePullSecrets: docker-registry-secret 
-    annotations:
-      authproxy.stakater.com/image-name: quay.io/gambol99/keycloak-proxy
-      authproxy.stakater.com/image-tag: v2.1.1
-      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.global.stakater.com"
-      authproxy.stakater.com/listen: "0.0.0.0:80"
+    imagePullSecrets: docker-registry-secret       
     image:
       name: {{ getenv "DOCKER_IMAGE" }}
       tag: "{{ getenv "VERSION" }}"