1.0.0 rc.14 improvements

wicked/README.md

@@ -110,7 +110,7 @@ Setting | Must Override | Default | Description
 `config.useCustomApiImage` | - | `false` | Set to `true` if you want to deploy your own derived `portal-api` image, e.g. if you have embedded the static configuration into this image to avoid using the (recommended) `git clone` method.
 `config.customApiImage` | - | `nil` | The (fully qualified) image name of your derived `portal-api` image. Take care that you have added `imagePullSecrets` (see `values.yaml`) if appropriate.
 `ingress.enabled` | - | `true` | Specify `false` to **not** deploy an ingress resource for routing the API Portal and Gateway to the corresponding services.
-`ingress.class` | - | `nginx` | The ingress class (`kubernetes.io/ingress.class`) to apply to the ingress resources.
+`ingress.class` | - | `nginx` | The ingress class (`ingressClassName`) to apply to the ingress resources.
 `ingress.apiHost` | **X** | `api.portal.com` | The (desired) FQDN of the API Gateway; this must point to the (load balancer of the) ingress controller selected via the ingress class, preferably before the deployment.
 `ingress.portalHost` | **X** | `portal.com` | The (desired) FQDN of the API Portal; this must point to the (load balancer of the) ingress controller selected via the ingress class, preferably before the deployment.
 `ingress.useKubeLego` | - | `false` | Set to `true` to add the necessary annotations for `kube-lego`; Note that this will **not** deploy `kube-lego` on your cluster, but merely use it if present (and usable in the desired namespace)

wicked/templates/ingress.yaml

@@ -1,20 +1,22 @@
 {{- if .Values.ingress.enabled -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ template "fullname" . }}-portal-ingress
   namespace: {{ default "default" .Values.namespace }}
   annotations:
-    kubernetes.io/ingress.class: {{ default "nginx" .Values.ingress.class }}
 {{- if .Values.ingress.useKubeLego }}
+    cert-manager.io/duration: 2160h
     kubernetes.io/tls-acme: "true"
 {{- end }}
   labels:
     app: {{ template "fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+    external-dns-exclude: "false"
 spec:
+  ingressClassName: {{ default "nginx" .Values.ingress.class }}
   tls:
   - hosts:
     - {{ default "portal.com" .Values.ingress.portalHost }}
@@ -24,26 +26,31 @@ spec:
     http:
       paths:
       - path: /
+        pathType: ImplementationSpecific
         backend:
-          serviceName: {{ template "fullname" . }}-portal
-          servicePort: 3000
+          service:
+            name: {{ template "fullname" . }}-portal
+            port:
+              number: 3000
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ template "fullname" . }}-gateway-ingress
   namespace: {{ default "default" .Values.namespace }}
   annotations:
-    kubernetes.io/ingress.class: {{ default "nginx" .Values.ingress.class }}
 {{- if .Values.ingress.useKubeLego }}
+    cert-manager.io/duration: 2160h
     kubernetes.io/tls-acme: "true"
 {{- end }}
   labels:
     app: {{ template "fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+    external-dns-exclude: "false"
 spec:
+  ingressClassName: {{ default "nginx" .Values.ingress.class }}
   tls:
   - hosts:
     - {{ default "api.portal.com" .Values.ingress.apiHost }}
@@ -53,7 +60,10 @@ spec:
     http:
       paths:
       - path: /
+        pathType: ImplementationSpecific
         backend:
-          serviceName: {{ template "fullname" . }}-kong
-          servicePort: 8000
+          service:
+            name: {{ template "fullname" . }}-kong
+            port:
+              number: 8000
 {{- end -}}

wicked/templates/kong-deployment.yaml

@@ -5,6 +5,9 @@ metadata:
   namespace: {{ default "default" .Values.namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    {{- with .Values.deployments.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   # Kong is scaled up in the post-install hook.
   replicas: 1
@@ -22,6 +25,9 @@ spec:
       labels:
         service: {{ template "fullname" . }}-kong
         wicked: "true"
+        {{- with .Values.deployments.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
         prometheus.io/scrape: 'true'
         prometheus.io/path: '/metrics'
@@ -78,6 +84,14 @@ spec:
             command:
               - kong
               - health
+        livenessProbe:
+          tcpSocket:
+            port: 8000
+          initialDelaySeconds: 30
+          timeoutSeconds: 5
+          periodSeconds: 5
+          failureThreshold: 5
+          successThreshold: 1
         ports:
         - name: "gateway"
           containerPort: 8000
@@ -93,8 +107,30 @@ spec:
           protocol: UDP
         resources:
 {{ toYaml .Values.kong.resources | indent 10 }}
+{{- if .Values.kong }}
+{{- if .Values.kong.securityContext }}
+        securityContext:
+{{ toYaml .Values.kong.securityContext | indent 10 }}
+{{- end }}
+{{- end }}
       restartPolicy: Always
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
-{{- end -}}
+{{- end -}}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.securityContext }}
+      securityContext:
+{{ toYaml .Values.securityContext | indent 8 }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+{{- end }}

wicked/templates/portal-api-deployment.yaml

@@ -5,6 +5,9 @@ metadata:
   namespace: {{ default "default" .Values.namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    {{- with .Values.deployments.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: 1
   strategy:
@@ -21,6 +24,9 @@ spec:
       labels:
         service: {{ template "fullname" . }}-api
         wicked: "true"
+        {{- with .Values.deployments.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
         prometheus.io/scrape: 'true'
         prometheus.io/path: '/metrics'
@@ -184,6 +190,12 @@ spec:
           timeoutSeconds: 2
         resources:
 {{ toYaml .Values.resources.api | indent 10 }}
+{{- if .Values.api }}
+{{- if .Values.api.securityContext }}
+        securityContext:
+{{ toYaml .Values.api.securityContext | indent 10 }}
+{{- end }}
+{{- end }}
       volumes:
       - name: portal-api-data-dynamic
 {{- if not .Values.persistence.enabled }}
@@ -199,3 +211,19 @@ spec:
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
 {{- end -}}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.securityContext }}
+      securityContext:
+{{ toYaml .Values.securityContext | indent 8 }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+{{- end }}

wicked/templates/portal-auth-deployment.yaml

@@ -5,6 +5,9 @@ metadata:
   namespace: {{ default "default" .Values.namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    {{- with .Values.deployments.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: 1
   strategy:
@@ -21,6 +24,9 @@ spec:
       labels:
         service: {{ template "fullname" . }}-auth
         wicked: "true"
+        {{- with .Values.deployments.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
         prometheus.io/scrape: 'true'
         prometheus.io/path: '/metrics'
@@ -72,8 +78,30 @@ spec:
           timeoutSeconds: 2
         resources:
 {{ toYaml .Values.resources.auth | indent 10 }}
+{{- if .Values.auth }}
+{{- if .Values.auth.securityContext }}
+        securityContext:
+{{ toYaml .Values.auth.securityContext | indent 10 }}
+{{- end }}
+{{- end }}
       restartPolicy: Always
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
 {{- end -}}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.securityContext }}
+      securityContext:
+{{ toYaml .Values.securityContext | indent 8 }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+{{- end }}

wicked/templates/portal-chatbot-deployment.yaml

@@ -6,6 +6,9 @@ metadata:
   namespace: {{ default "default" .Values.namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    {{- with .Values.deployments.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: 1
   strategy:
@@ -22,9 +25,28 @@ spec:
       labels:
         service: {{ template "fullname" . }}-chatbot
         wicked: "true"
+        {{- with .Values.deployments.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
 {{- if .Values.useRbac }}
       serviceAccountName: {{ template "fullname" . }}-role
+{{- end }}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.securityContext }}
+      securityContext:
+{{ toYaml .Values.securityContext | indent 8 }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
 {{- end }}
       initContainers:
       - name: {{ template "fullname" . }}-chatbot-init
@@ -69,6 +91,12 @@ spec:
           timeoutSeconds: 2
         resources:
 {{ toYaml .Values.resources.chatbot | indent 10 }}
+{{- if .Values.chatbot }}
+{{- if .Values.chatbot.securityContext }}
+        securityContext:
+{{ toYaml .Values.chatbot.securityContext | indent 10 }}
+{{- end }}
+{{- end }}
       restartPolicy: Always
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:

wicked/templates/portal-deployment.yaml

@@ -5,6 +5,9 @@ metadata:
   namespace: {{ default "default" .Values.namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    {{- with .Values.deployments.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: 1
   strategy:
@@ -21,6 +24,9 @@ spec:
       labels:
         service: {{ template "fullname" . }}-portal
         wicked: "true"
+        {{- with .Values.deployments.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
 {{- if .Values.useRbac }}
       serviceAccountName: {{ template "fullname" . }}-role
@@ -68,7 +74,29 @@ spec:
           timeoutSeconds: 2
         resources:
 {{ toYaml .Values.resources.portal | indent 10 }}
+{{- if .Values.portal }}
+{{- if .Values.portal.securityContext }}
+        securityContext:
+{{ toYaml .Values.portal.securityContext | indent 10 }}
+{{- end }}
+{{- end }}
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
-{{- end -}}
+{{- end -}}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.securityContext }}
+      securityContext:
+{{ toYaml .Values.securityContext | indent 8 }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+{{- end }}