Merge branch 'master' into std-labels

Author: cognifloyd

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## In Development
 * BREAKING: Use the standardized labels recommended in the Helm docs. You can use `migrations/v1.0/standardize-labels.sh` to prepare an existing cluster before running `helm update`. (#351) (by @cognifloyd)
+* Drop support for `networking.k8s.io/v1beta1` which was removed in kubernetes v1.22 (EOL 2022-10-28) (#353) (by @cognifloyd)
 
 ## v0.110.0
 * Switch st2 to `v3.8` as a new default stable version (#347)

templates/ingress.yaml

@@ -1,10 +1,6 @@
 {{- if .Values.ingress.enabled }}
 ---
-{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
 apiVersion: networking.k8s.io/v1
-{{- else }}
-apiVersion: networking.k8s.io/v1beta1
-{{- end }}
 kind: Ingress
 metadata:
   name: {{ .Release.Name }}-st2web-ingress

tests/unit/ingress_test.yaml

@@ -13,11 +13,12 @@ tests:
       - hasDocuments:
           count: 0
 
-  - it: Ingress is present when enabled without hosts (older k8s)
-    capabilities: &cap_older
+  - it: Ingress is present when enabled without hosts
+    capabilities: &cap_newer
       majorVersion: 1
-      minorVersion: 18
+      minorVersion: 19
       apiVersions:
+        - networking.k8s.io/v1 # introduced in 1.19, stable in 1.22
         - networking.k8s.io/v1beta1
     set:
       ingress:
@@ -39,42 +40,6 @@ tests:
       - equal: &st2web_rules_host
           path: spec.rules[0].host
           value: *st2web_hostname
-      - contains:
-          path: spec.rules[0].http.paths
-          count: 1
-          content:
-            path: "/"
-            backend:
-              serviceName: st2ha-st2web
-              servicePort: 80
-      - isNull:
-          path: spec.rules[0].http.paths[0].pathType
-
-  - it: Ingress is present when enabled without hosts (newer k8s)
-    capabilities: &cap_newer
-      majorVersion: 1
-      minorVersion: 19
-      apiVersions:
-        - networking.k8s.io/v1 # introduced in 1.19, stable in 1.22
-        - networking.k8s.io/v1beta1
-    set:
-      ingress:
-        enabled: true
-        hosts: []
-        tls: []
-      st2web:
-        service:
-          hostname: *st2web_hostname
-    release:
-      name: st2ha
-    asserts:
-      - hasDocuments:
-          count: 1
-      - equal:
-          path: kind
-          value: Ingress
-      # no ingress.hosts, so only st2web.hostname
-      - equal: *st2web_rules_host
       - contains:
           path: spec.rules[0].http.paths
           count: 1
@@ -87,12 +52,12 @@ tests:
                 port:
                   number: 80
 
-  - it: Ingress is present when enabled with hosts (older k8s)
-    capabilities: *cap_older
+  - it: Ingress is present when enabled with hosts
+    capabilities: *cap_newer
     set:
       ingress:
         enabled: true
-        hosts: &hosts
+        hosts:
           - host: *st2web_hostname
             paths:
               - serviceName: st2ha-st2web
@@ -114,49 +79,9 @@ tests:
           value: Ingress
       # no ingress.hosts, so only st2web.hostname
       - equal: *st2web_rules_host
-      - equal: &host_path_is_root_glob
+      - equal:
           path: spec.rules[0].http.paths[0].path
           value: "/*"
-      - isNull:
-          path: spec.rules[0].http.paths[0].pathType
-      - equal:
-          path: spec.rules[0].http.paths[0].backend
-          value:
-            serviceName: st2ha-st2web
-            servicePort: 80
-
-      - equal:
-          path: spec.rules[0].http.paths[1].path
-          value: "/fancy-sensor"
-      - isNull:
-          path: spec.rules[0].http.paths[1].pathType
-      - equal:
-          path: spec.rules[0].http.paths[1].backend
-          value:
-            serviceName: fancy-sensor
-            servicePort: 8080
-
-  - it: Ingress is present when enabled with hosts (newer k8s)
-    capabilities: *cap_newer
-    set:
-      ingress:
-        enabled: true
-        hosts: *hosts
-        tls: []
-      st2web:
-        service:
-          hostname: *st2web_hostname
-    release:
-      name: st2ha
-    asserts:
-      - hasDocuments:
-          count: 1
-      - equal:
-          path: kind
-          value: Ingress
-      # no ingress.hosts, so only st2web.hostname
-      - equal: *st2web_rules_host
-      - equal: *host_path_is_root_glob
       - equal:
           path: spec.rules[0].http.paths[0].pathType
           value: Prefix