fix: (Chart) remove Nginx rewrite-path: / annotation

igdianov · igdianov · commit ff82e662b817 · 2019-02-07T21:51:51.000-08:00
diff --git a/charts/activiti-cloud-notifications-graphql/templates/_common.tpl b/charts/activiti-cloud-notifications-graphql/templates/_common.tpl
@@ -0,0 +1,79 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Create a default tls secrtet name.
+*/}}
+{{- define "tlssecretname" -}}
+{{- tpl (default (printf "tls-%s" (include "ingresshost" $) )  (default .Values.global.gateway.tlsSecret .Values.ingress.tlsSecret)) $ | replace "." "-" -}}
+{{- end -}}
+
+{{/*
+Create a default ingress host.
+*/}}
+{{- define "ingresshost" -}}
+{{- tpl (default (printf "%s.%s" (include "gateway-prefix" $) (include "domain" $)) ( default .Values.global.gateway.host .Values.ingress.hostName ) ) $ -}}
+{{- end -}}
+
+{{/*
+Create a keycloak url.
+*/}}
+{{- define "keycloak-url" -}}
+{{- tpl (printf "%s" (default (include "keycloak-default-url" $) .Values.global.keycloak.url )) $ -}}
+{{- end -}}
+
+{{/*
+Create a default keycloak url
+*/}}
+{{- define "keycloak-default-url" -}}
+{{- printf "%s://%s%s" (include "keycloak-proto" $) (include "keycloak-host" $) (include "keycloak-path" $) -}}
+{{- end -}}
+
+{{/*
+Create a keycloak path, .i.e /auth.
+*/}}
+{{- define "keycloak-path" -}}
+{{- default "/auth" .Values.global.keycloak.path -}}
+{{- end -}}
+
+{{/*
+Create a keycloak prefix, .i.e activiti-keycloak
+*/}}
+{{- define "keycloak-prefix" -}}
+{{- default "activiti-keycloak" (default .Values.global.config.prefix .Values.global.keycloak.prefix) -}}
+{{- end -}}
+
+{{/*
+Create a gateway prefix, .i.e activiti-cloud-gateway
+*/}}
+{{- define "gateway-prefix" -}}
+{{- default "activiti-cloud-gateway" (default .Values.global.config.prefix .Values.global.gateway.prefix) -}}
+{{- end -}}
+
+{{/*
+Create a domain 
+*/}}
+{{- define "domain" -}}
+{{- tpl (default "127.0.0.1.nip.io" .Values.global.config.domain) $ -}}
+{{- end -}}
+
+{{/*
+Create a keycloak host.
+*/}}
+{{- define "keycloak-host" -}}
+{{- tpl (default (printf "%s.%s" (include "keycloak-prefix" $) (include "domain" $)) .Values.global.keycloak.host) $ -}}
+{{- end -}}
+
+{{/*
+Create a keycloak protocol
+*/}}
+{{- define "keycloak-proto" -}}
+{{- tpl "http{{ if $.Values.global.config.tls }}s{{ end }}" $ -}}
+{{- end -}}
+
+{{/*
+Create a kubernetes.io/tls-acme annotation
+*/}}
+{{- define "kubernetes.io/tls-acme" -}}
+{{- if (default .Values.global.config.tls .Values.ingress.tls) }}
+kubernetes.io/tls-acme: "true"
+{{- end }}
+{{- end -}}
diff --git a/charts/activiti-cloud-notifications-graphql/templates/_helpers.tpl b/charts/activiti-cloud-notifications-graphql/templates/_helpers.tpl
@@ -27,17 +27,6 @@ Create a default service name.
 {{- printf "%s" $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{/*
-Create a default tls secrtet name.
-*/}}
-{{- define "tlssecretname" -}}
-{{- $name := default (printf "tls-%s-%s" .Release.Name "activiti-cloud-gateway")  (or .Values.ingress.tlsSecret .Values.global.gateway.ingress.tlsSecret) -}}
-{{- printf "%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
 
-{{/*
-Create a default ingress host.
-*/}}
-{{- define "ingresshost" -}}
-{{- default .Values.global.gateway.host .Values.ingress.hostName -}}
-{{- end -}}
+
+
diff --git a/charts/activiti-cloud-notifications-graphql/templates/deployment.yaml b/charts/activiti-cloud-notifications-graphql/templates/deployment.yaml
@@ -28,21 +28,19 @@ spec:
           value: {{ template "servicename" . }}
         - name: SPRING_RABBITMQ_HOST
         {{- if .Values.global.rabbitmq.host.value }}
-          value: "{{ .Values.global.rabbitmq.host.value }}"
+          value: "{{ tpl .Values.global.rabbitmq.host.value $ }}"
         {{ else }}
           value: "{{ .Release.Name }}-rabbitmq"
-        {{ end }}
+        {{- end }}
         - name: SPRING_RABBITMQ_USERNAME
           value: {{ .Values.global.rabbitmq.username.value }}
         - name: SPRING_RABBITMQ_PASSWORD
           value: {{ .Values.global.rabbitmq.password.value }}
-        {{- if .Values.global.keycloak.url }}
         - name: ACT_KEYCLOAK_URL
-          value: "{{ .Values.global.keycloak.url }}"
-        {{ end }}
+          value: {{ include "keycloak-url" $ | quote }}
         - name: SPRING_DATASOURCE_URL
   {{- if .Values.db.uri }}
-          value: "{{ .Values.db.uri }}"
+          value: "{{ tpl .Values.db.uri $ }}"
   {{- else }}
           value: "jdbc:postgresql://{{ .Release.Name }}-{{ .Values.db.name }}:{{ .Values.db.port }}/postgres"
   {{- end }}
diff --git a/charts/activiti-cloud-notifications-graphql/templates/ingress.yaml b/charts/activiti-cloud-notifications-graphql/templates/ingress.yaml
@@ -2,83 +2,58 @@
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: {{ template "fullname" . }}-backend
+  name: {{ template "fullname" . }}
   labels:
     app: {{ template "fullname" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   annotations:
-    {{- range $key, $value := .Values.global.gateway.ingress.annotations }}
+    kubernetes.io/ingress.class: "nginx"
+    {{- include "kubernetes.io/tls-acme" . | indent 4}} 
+    nginx.ingress.kubernetes.io/enable-cors: "true"
+    nginx.ingress.kubernetes.io/cors-allow-headers: "*"
+    nginx.ingress.kubernetes.io/cors-allow-origin: "*" 
+    nginx.ingress.kubernetes.io/cors-allow-methods: "GET,PUT,POST,DELETE,PATCH,OPTIONS"
+    nginx.ingress.kubernetes.io/cors-allow-credentials: "true"   
+    nginx.ingress.kubernetes.io/x-forwarded-prefix: "true"
+    nginx.ingress.kubernetes.io/affinity: cookie
+    nginx.ingress.kubernetes.io/session-cookie-name: "activiti-cloud-notifications-graphql-route"
+    nginx.ingress.kubernetes.io/session-cookie-hash: "md5"
+    nginx.ingress.kubernetes.io/session-cookie-path: "/"
+    {{- range $key, $value := .Values.global.gateway.annotations }}
     {{ $key }}: {{ tpl $value $ | quote }}
     {{- end }}
     {{- range $key, $value := .Values.ingress.annotations }}
     {{ $key }}: {{ tpl $value $ | quote }}
     {{- end }}
 spec:
   rules:
-    {{- if default .Values.global.gateway.host .Values.ingress.hostName }}
-    - host: {{ template "ingresshost" . }}
+    - host: {{ include "ingresshost" $ }}
       http:
-    {{- else }}
-    - http:
-    {{- end }} 
         paths:
-          - path: {{ .Values.ingress.web.path }}
-            backend:
-              serviceName: {{ template "servicename" . }}
-              servicePort: {{ .Values.service.externalPort }}
-          - path: {{ .Values.ingress.ws.path }}
-            backend:
-              serviceName: {{ template "servicename" . }}
-              servicePort: {{ .Values.service.externalPort }}
-{{- if default .Values.global.gateway.ingress.tls .Values.ingress.tls }}
+        {{- if .Values.ingress.web.enabled }}
+        - path: {{ .Values.ingress.web.path }}
+          backend:
+            serviceName: {{ template "servicename" . }}
+            servicePort: {{ .Values.service.externalPort }}
+        {{- end }}
+        {{- if .Values.ingress.ws.enabled }}
+        - path: {{ .Values.ingress.ws.path }}
+          backend:
+            serviceName: {{ template "servicename" . }}
+            servicePort: {{ .Values.service.externalPort }}
+        {{- end }}
+        {{- if .Values.ingress.graphiql.enabled }}
+        - path: {{ .Values.ingress.graphiql.path }}
+          backend:
+            serviceName: {{ template "servicename" . }}
+            servicePort: {{ .Values.service.externalPort }}
+        {{- end }}
+  {{- if default .Values.global.config.tls .Values.ingress.tls}}
   tls:
-    - secretName: {{ template "tlssecretname" . }}
-      {{- if default .Values.global.gateway.host .Values.ingress.hostName }}
-      hosts:
-        - {{ template "ingresshost" . }}
-      {{- end }}
-{{- end }}
----
-{{- if .Values.ingress.graphiql.enabled }}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ template "fullname" . }}-graphiql
-  labels:
-    app: {{ template "fullname" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  annotations:
-    {{- range $key, $value := .Values.global.gateway.ingress.annotations }}
-    {{ $key }}: {{ tpl $value $ | quote }}
-    {{- end }}
-    {{- range $key, $value := .Values.ingress.graphiql.annotations }}
-    {{ $key }}: {{ tpl $value $ | quote }}
-    {{- end }}
-spec:
-  rules:
-    {{- if default .Values.global.gateway.host .Values.ingress.hostName }}
-    - host: {{ template "ingresshost" . }}
-      http:
-    {{- else }}
-    - http:
-    {{- end }} 
-        paths:
-          - path: {{ .Values.ingress.graphiql.path }}
-            backend:
-              serviceName: {{ template "servicename" . }}
-              servicePort: {{ .Values.service.externalPort }}
-{{- if default .Values.global.gateway.ingress.tls .Values.ingress.tls }}
-  tls:
-    - secretName: {{ template "tlssecretname" . }}
-      {{- if default .Values.global.gateway.host .Values.ingress.hostName }}
-      hosts:
-        - {{ template "ingresshost" . }}
-      {{- end }}
-{{- end }}
-{{- end }}
-{{- end }}
-
+  - secretName: {{ template "tlssecretname" . }}
+    hosts:
+    - {{ include "ingresshost" $ }}
+  {{- end }}
+{{- end }}
diff --git a/charts/activiti-cloud-notifications-graphql/values.yaml b/charts/activiti-cloud-notifications-graphql/values.yaml
@@ -3,7 +3,12 @@
 # Declare variables to be passed into your templates.
 replicaCount: 1
 
+# Application 
 global:
+  config: 
+    domain: "192.168.99.100.nip.io" 
+    tls: # true | false
+    prefix: # commmon domain prefix, i.e. activiti
   rabbitmq:
     host:
       value: ""
@@ -12,21 +17,18 @@ global:
     password:
       value: guest
   keycloak:
-    url: ""
+    url: # "http{{ if $.Values.global.config.tls }}s{{ end }}://activiti-keycloak.{{ .Values.global.config.domain }}/auth"
+    host: # "activiti-keycloak.{{ .Release.Name }}.{{ .Values.global.config.domain }}"
+    path: # /auth 
     name: keycloak
     service:
       type: http
       port: 80
-  gateway:
-    host: ""
-    ingress:
-      tls: # true | false
-      tlsSecret: # custom secret name or auto-generated 'tls-.Release.Name-activiti-cloud-gateway' if tls true
-      # global annotations to be added to all service ingresses i.e.        
-      # certmanager.k8s.io/issuer: letsencrypt-prod
-      # kubernetes.io/tls-acme: "true"    
-      annotations: 
-        kubernetes.io/ingress.class: "nginx"
+  gateway: 
+    host: # "activiti-cloud-gateway.{{ .Release.Name }}.{{ .Values.global.config.domain }}"
+    tlsSecret: # tls-{{ .Release.Name }}-activiti-cloud-gateway
+    # global annotations to be added to all service ingresses
+    annotations: {}
 
 db:
   uri: ""
@@ -37,7 +39,7 @@ db:
   ddlAuto: none
 
 javaOpts:
-  xmx: 2048m
+  xmx: 1768m
   xms: 1024m
   other: -XX:+UnlockExperimentalVMOptions -Dsun.zip.disableMemoryMapping=true -XX:+UseParallelGC -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90
 
@@ -92,21 +94,12 @@ ingress:
   graphiql: 
     enabled: true
     path: /graphiql
-    annotations:
-      nginx.ingress.kubernetes.io/rewrite-target: /
-      nginx.ingress.kubernetes.io/add-base-url: "true"    
   web:
+    enabled: true
     path: /graphql
   ws: 
+    enabled: true
     path: /ws/graphql
-  annotations: 
-    nginx.ingress.kubernetes.io/enable-cors: "true"
-    nginx.ingress.kubernetes.io/cors-allow-headers: "*"
-    nginx.ingress.kubernetes.io/cors-allow-origin: "*" 
-    nginx.ingress.kubernetes.io/cors-allow-methods: "GET,PUT,POST,DELETE,PATCH,OPTIONS"
-    nginx.ingress.kubernetes.io/cors-allow-credentials: "true"   
-    nginx.ingress.kubernetes.io/x-forwarded-prefix: "true"
-    nginx.ingress.kubernetes.io/affinity: cookie
-    nginx.ingress.kubernetes.io/session-cookie-name: "activiti-cloud-notifications-graphql-route"
-    nginx.ingress.kubernetes.io/session-cookie-hash: "sha1"
+  annotations: {} 
+
     
