fix(helm): update helm and traefik (#761)

* first draft

* first draft

* working configuration

* update preview script

* Update Phonebook/readme.md

* Update demo/assets/Dockerfile

.azure/pipelines/Phonebook.preview.yml

@@ -93,9 +93,7 @@ jobs:
         artifact: $(helm_artifact_name)
 
       - task: HelmInstaller@1
-        displayName: 'Install Helm 2.14.2'
-        inputs:
-          helmVersionToInstall: 2.14.2
+        displayName: 'Install Helm'
 
       - task: Kubernetes@1
         displayName: 'Create Namespace'

Phonebook/local-values.yml

@@ -19,14 +19,33 @@ source:
 
 traefik:
   enabled: true
-  startupArguments:
-    - ''
+  additional:
+    checkNewVersion: false
+    sendAnonymousUsage: false
   dashboard:
-    enabled: true
-    domain: board.demo-phonebook.local
-    ingress:
-      annotations:
-        traefik.frontend.priority: '100'
+    # Enable the dashboard on Traefik
+    enable: true
+    # Expose the dashboard and api through an ingress route at /dashboard
+    # and /api This is not secure and SHOULD NOT be enabled on production
+    # deployments
+    ingressRoute: true
+
+  additionalArguments:
+    - '--providers.kubernetesingress'
+    - '--api.insecure=true'
+  logs:
+    loglevel: debug
+  globalArguments:
+    - ''
+  # Old
+  # startupArguments:
+  #   - ''
+  # dashboard:
+  #   enabled: true
+  #   domain: board.demo-phonebook.local
+  #   ingress:
+  #     annotations:
+  #       traefik.frontend.priority: '100'
 
   ssl:
     enabled: true

Phonebook/phonebook/requirements.lock

@@ -1,6 +1,6 @@
 dependencies:
   - name: traefik
-    repository: https://kubernetes-charts.storage.googleapis.com
-    version: 1.86.2
-digest: sha256:6a6097b475625d15d6e156f79ec0950f5a850ae13b3dd7463c75e39526b6bc14
-generated: "2020-04-10T21:54:06.4266672+02:00"
+    repository: https://containous.github.io/traefik-helm-chart
+    version: 3.4.0
+digest: sha256:69f27dcbfa7eacbaa64365626276506c7050ab2c65d0db8780f4c2adc882d3d6
+generated: '2020-04-08T14:26:29.6008416+02:00'

Phonebook/phonebook/requirements.yaml

@@ -1,6 +1,6 @@
 dependencies:
   - name: traefik
     condition: traefik.enabled
-    version: 1.86.2
-    appVersion: 1.7.14
-    repository: https://kubernetes-charts.storage.googleapis.com
+    version: 3.4.0
+    appVersion: 2.1.3
+    repository: https://containous.github.io/traefik-helm-chart

Phonebook/phonebook/templates/frontend-ingress.yaml

@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "phonebook.fullname" . -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -10,8 +10,11 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
   annotations:
+    traefik.ingress.kubernetes.io/router.entrypoints: "web"
+    traefik.ingress.kubernetes.io/router.priority: "42"
+    traefik.ingress.kubernetes.io/router.tls: "true"
+    traefik.ingress.kubernetes.io/router.tls.certresolver: http-01
     kubernetes.io/ingress.class: traefik
-    traefik.frontend.priority: '10'
   {{- with .Values.ingress.annotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}

Phonebook/phonebook/templates/source-peoplesoft-deployment.yaml

@@ -29,6 +29,9 @@ spec:
             - name: http
               containerPort: 80
               protocol: TCP
+            - name: https
+              containerPort: 443
+              protocol: TCP
           # TODO: use when issue #594 is resolved
           # livenessProbe:
           #   httpGet:

Phonebook/phonebook/templates/source-peoplesoft-ingress.yaml

@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "phonebook.fullname" . -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}-peoplesoft
@@ -10,8 +10,10 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
   annotations:
+    traefik.ingress.kubernetes.io/router.pathmatcher: PathPrefix
+    traefik.ingress.kubernetes.io/router.priority: "50"
+    traefik.ingress.kubernetes.io/router.tls: "true"
     kubernetes.io/ingress.class: traefik
-    traefik.frontend.priority: '50'
   {{- with .Values.ingress.annotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}

Phonebook/phonebook/values.yaml

@@ -38,14 +38,36 @@ ingress:
 
 # Traefik Configuration
 traefik:
-  enabled: true
-  startupArguments:
-    - ""
+  deployment:
+    enabled: true
+
+  additionalArguments:
+    - --entryPoints.websecure.http.tls=true
+    - --entrypoints.web.http.redirections.entrypoint.to=:443
+    - --entrypoints.web.http.redirections.entrypoint.permanent=true
+    - --providers.kubernetesingress
+    - --providers.kubernetesingress.ingressclass=public
+    - --providers.kubernetesingress.ingressendpoint.publishedservice=kube-system/traefik-v2
+    - --providers.kubernetescrd.ingressclass=public
+    - --serverstransport.insecureskipverify
+    # - --entryPoints.metrics.address=:8082
+    # - --metrics.prometheus.entryPoint=metrics
+    # - --metrics.prometheus
+    # - --log.level=DEBUG
+    - --accesslog
+
+  logs:
+    loglevel: warn
+
+  globalArguments:
+    - ''
   ssl:
     enabled: true
     enforced: true
+
   rbac:
     enabled: true
+
   kubernetes:
     namespaces:
       - kube-public

Phonebook/readme.md

@@ -63,7 +63,7 @@ helm delete <deployment-name>
 
 ## Development
 
-You need `helm2` and a running kubernetes cluster.
+You need `helm3` and a running kubernetes cluster.
 
 1. Add `phonebook-demo.local` to your hosts, pointing to `localhost` (127.0.0.1).
 2. cd into the `/Phonebook` Folder

demo/Phonebook.Assets.yml

@@ -45,9 +45,7 @@ kind: Ingress
 metadata:
   name: phonebook-assets-ingress
   annotations:
-    kubernetes.io/ingress.class: traefik
-    traefik.frontend.rule.type: PathPrefixStrip
-    traefik.frontend.priority: '50'
+    traefik.ingress.kubernetes.io/router.pathmatcher: PathPrefix
 spec:
   rules:
     - http:

demo/values.yml

@@ -42,15 +42,8 @@ affinity: {}
 
 # Traefik Configuration
 traefik:
-  enabled: true
-  startupArguments:
-    - ''
-  dashboard:
+  deployment:
     enabled: true
-    domain: board.demo-phonebook.aquiver.de
-    ingress:
-      annotations:
-        traefik.frontend.priority: '100'
   ssl:
     enabled: true
     enforced: true
@@ -64,5 +57,8 @@ traefik:
       enabled: true
   rbac:
     enabled: true
+
   kubernetes:
     namespaces:
+      - kube-public
+      - default