Merge pull request #42 from puppetlabs/maint_vmpooler_ingress

(DIO-3157) Update ingress for k8s 1.22

docs/index.yaml

@@ -3,7 +3,22 @@ entries:
   vmpooler:
   - apiVersion: v2
     appVersion: 1.5.0-prod-all-providers
-    created: "2022-04-19T10:04:21.870717-04:00"
+    created: "2022-06-06T17:18:54.124017643Z"
+    dependencies:
+    - name: redis
+      repository: https://charts.bitnami.com/bitnami
+      version: 16.10.1
+    description: A Helm chart to deploy vmpooler
+    digest: 6d7bd0a41ac8f27792d1c232b6cf0c1b47ddf3b8113146098ed36160c6b9d373
+    icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png
+    name: vmpooler
+    type: application
+    urls:
+    - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.13.0.tgz
+    version: 1.13.0
+  - apiVersion: v2
+    appVersion: 1.5.0-prod-all-providers
+    created: "2022-06-06T17:18:54.117163396Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -18,7 +33,7 @@ entries:
     version: 1.12.0
   - apiVersion: v2
     appVersion: 1.4.0-prod-all-providers
-    created: "2022-04-19T10:04:21.864097-04:00"
+    created: "2022-06-06T17:18:54.112765666Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -33,7 +48,7 @@ entries:
     version: 1.11.1
   - apiVersion: v2
     appVersion: 1.3.0-prod-all-providers
-    created: "2022-04-19T10:04:21.85893-04:00"
+    created: "2022-06-06T17:18:54.107092528Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -48,7 +63,7 @@ entries:
     version: 1.11.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-04-19T10:04:21.852303-04:00"
+    created: "2022-06-06T17:18:54.100796285Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -63,7 +78,7 @@ entries:
     version: 1.10.1
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-04-19T10:04:21.846676-04:00"
+    created: "2022-06-06T17:18:54.095674451Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -78,7 +93,7 @@ entries:
     version: 1.10.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-04-19T10:04:21.90604-04:00"
+    created: "2022-06-06T17:18:54.157081966Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -93,7 +108,7 @@ entries:
     version: 1.9.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-04-19T10:04:21.901372-04:00"
+    created: "2022-06-06T17:18:54.153793944Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -108,7 +123,7 @@ entries:
     version: 1.8.0
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2022-04-19T10:04:21.897342-04:00"
+    created: "2022-06-06T17:18:54.148988211Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -123,7 +138,7 @@ entries:
     version: 1.7.1
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2022-04-19T10:04:21.893321-04:00"
+    created: "2022-06-06T17:18:54.145584388Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -138,7 +153,7 @@ entries:
     version: 1.7.0
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-04-19T10:04:21.888365-04:00"
+    created: "2022-06-06T17:18:54.142103665Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -153,7 +168,7 @@ entries:
     version: 1.6.3
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-04-19T10:04:21.883885-04:00"
+    created: "2022-06-06T17:18:54.137599334Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -168,7 +183,7 @@ entries:
     version: 1.6.2
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-04-19T10:04:21.878862-04:00"
+    created: "2022-06-06T17:18:54.133191405Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -183,7 +198,7 @@ entries:
     version: 1.6.1
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-04-19T10:04:21.874923-04:00"
+    created: "2022-06-06T17:18:54.128352972Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -196,4 +211,4 @@ entries:
     urls:
     - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz
     version: 1.6.0
-generated: "2022-04-19T10:04:21.8396-04:00"
+generated: "2022-06-06T17:18:54.08662519Z"

helm-charts/vmpooler/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: redis
   repository: https://charts.bitnami.com/bitnami
-  version: 13.0.1
+  version: 16.10.1
-digest: sha256:7682a105e52b2e1bdd3441f59cc390e0d546655204ae5009295ec3253a25e230
+digest: sha256:b4278d10dd3a151323b761106d2ab00a742b08984d05e9102f852815d69d1a6a
-generated: "2022-03-28T11:00:18.357837-05:00"
+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:
+  architecture: standalone
-    enabled: false
   networkPolicy:
     enabled: true
-  securityContext:
+  master:
+    podSecurityContext:
       enabled: true
       fsGroup: 1001
+    containerSecurityContext:
+      enabled: true
       runAsUser: 1001
-  master:
     resources:
       requests:
         cpu: 1000m