(DIO-3157) Update ingress for k8s 1.22

helm-charts/vmpooler/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: redis
   repository: https://charts.bitnami.com/bitnami
-  version: 13.0.1
-digest: sha256:7682a105e52b2e1bdd3441f59cc390e0d546655204ae5009295ec3253a25e230
-generated: "2022-03-28T11:00:18.357837-05:00"
+  version: 16.10.1
+digest: sha256:b4278d10dd3a151323b761106d2ab00a742b08984d05e9102f852815d69d1a6a
+generated: "2022-06-03T11:04:59.151842094-07:00"

helm-charts/vmpooler/Chart.yaml

@@ -3,9 +3,9 @@ name: vmpooler
 description: A Helm chart to deploy vmpooler
 type: application
 icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png
-version: 1.12.0
+version: 1.13.0
 appVersion: 1.5.0-prod-all-providers
 dependencies:
   - name: redis
     repository: https://charts.bitnami.com/bitnami
-    version: 13.0.1
+    version: 16.10.1

helm-charts/vmpooler/templates/ingress.yaml

@@ -1,7 +1,9 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "vmpooler.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}
 apiVersion: extensions/v1beta1
@@ -21,9 +23,19 @@ spec:
       http:
         paths:
           - backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+              service:
+                name: {{ $fullName }}-api
+                port:
+                  number: {{ $svcPort }}
+              {{- else }}
               serviceName: {{ $fullName }}-api
               servicePort: {{ $svcPort }}
+              {{- end }}
             path: /
+            {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
+            pathType: ImplementationSpecific
+            {{- end }}
   {{ if .Values.ingress.useTLS -}}
   tls:
     - hosts:

helm-charts/vmpooler/values.yaml

@@ -10,8 +10,9 @@ configmapName: 'vmpooler-baseconfig'
 sut_domain: 'vmpooler.example.com'
 usage_stats: true
 
+# .json private key, set in ENV var
 gce:
-  keyfile: '/vault/secrets/gce-keyfile.json' #.json private key, set in ENV var
+  keyfile: '/vault/secrets/gce-keyfile.json'
 
 tracing:
   enabled: 'false'
@@ -112,15 +113,16 @@ affinity: {}
 # For a full list of parameters see: https://github.com/bitnami/charts/tree/master/bitnami/redis/
 redis:
   fullnameOverride: redis
-  cluster:
-    enabled: false
+  architecture: standalone
   networkPolicy:
     enabled: true
-  securityContext:
-    enabled: true
-    fsGroup: 1001
-    runAsUser: 1001
   master:
+    podSecurityContext:
+      enabled: true
+      fsGroup: 1001
+    containerSecurityContext:
+      enabled: true
+      runAsUser: 1001
     resources:
       requests:
         cpu: 1000m