chore: update support matrix (#2969)

* chore: update support matrix Signed-off-by: Dominik Rosiek <drosiek@sumologic.com> * chore: changelog Signed-off-by: Dominik Rosiek <drosiek@sumologic.com> * Update docs/README.md * Update .changelog/2969.changed.txt * Update docs/README.md * Update .changelog/2969.changed.txt * chore: update kindest/node covarage Signed-off-by: Dominik Rosiek <drosiek@sumologic.com> * chore: use autoscaling/v2 for k8s>1.26 Signed-off-by: Dominik Rosiek <drosiek@sumologic.com> --------- Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
SumoLogic · Apr 20, 2023 · 5793d41 · 5793d41
1 parent b249970
commit 5793d41
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 8 deletions.
diff --git a/.changelog/2969.changed.txt b/.changelog/2969.changed.txt
@@ -0,0 +1 @@
+chore: add support for KOPS 1.26, EKS 1.25, AKS 1.26, OpenShift 4.12; remove support for GKE 1.21, EKS 1.21, AKS 1.23
diff --git a/deploy/helm/sumologic/templates/logs/common/hpa.yaml b/deploy/helm/sumologic/templates/logs/common/hpa.yaml
@@ -1,5 +1,9 @@
 {{- if and (eq (include "logs.otelcol.enabled" .) "true") (.Values.metadata.logs.autoscaling.enabled) }}
+{{- if and (eq .Capabilities.KubeVersion.Major "1") (lt (int (include "kubernetes.minor" .)) 26) }}
 apiVersion: autoscaling/v2beta2
+{{- else }}
+apiVersion: autoscaling/v2
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ template "sumologic.metadata.name.logs.hpa" . }}

diff --git a/deploy/helm/sumologic/templates/logs/fluentd/hpa.yaml b/deploy/helm/sumologic/templates/logs/fluentd/hpa.yaml
@@ -1,5 +1,9 @@
 {{- if and (eq (include "logs.fluentd.enabled" .) "true") (.Values.fluentd.logs.autoscaling.enabled) }}
+{{- if and (eq .Capabilities.KubeVersion.Major "1") (lt (int (include "kubernetes.minor" .)) 26) }}
 apiVersion: autoscaling/v2beta2
+{{- else }}
+apiVersion: autoscaling/v2
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ template "sumologic.metadata.name.logs.hpa" . }}

diff --git a/deploy/helm/sumologic/templates/metrics/common/hpa.yaml b/deploy/helm/sumologic/templates/metrics/common/hpa.yaml
@@ -1,5 +1,9 @@
 {{- if and (eq (include "metrics.otelcol.enabled" .) "true") ( .Values.metadata.metrics.autoscaling.enabled) }}
+{{- if and (eq .Capabilities.KubeVersion.Major "1") (lt (int (include "kubernetes.minor" .)) 26) }}
 apiVersion: autoscaling/v2beta2
+{{- else }}
+apiVersion: autoscaling/v2
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ template "sumologic.metadata.name.metrics.hpa" . }}

diff --git a/deploy/helm/sumologic/templates/metrics/fluentd/hpa.yaml b/deploy/helm/sumologic/templates/metrics/fluentd/hpa.yaml
@@ -1,5 +1,9 @@
 {{- if and (eq (include "metrics.fluentd.enabled" .) "true") ( .Values.fluentd.metrics.autoscaling.enabled) }}
+{{- if and (eq .Capabilities.KubeVersion.Major "1") (lt (int (include "kubernetes.minor" .)) 26) }}
 apiVersion: autoscaling/v2beta2
+{{- else }}
+apiVersion: autoscaling/v2
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ template "sumologic.metadata.name.metrics.hpa" . }}

diff --git a/docs/README.md b/docs/README.md
@@ -86,11 +86,11 @@ The following table displays the tested Kubernetes and Helm versions.
 
 | Name          | Version                                  |
 | ------------- | ---------------------------------------- |
-| K8s with EKS  | 1.21<br/>1.22<br/>1.23<br/>1.24          |
-| K8s with Kops | 1.22<br/>1.23<br/>1.24<br/>1.25          |
-| K8s with GKE  | 1.21<br/>1.22<br/>1.23<br/>1.24<br/>1.25 |
-| K8s with AKS  | 1.23<br/>1.24<br/>1.25                   |
-| OpenShift     | 4.8<br/>4.9<br/>4.10<br/>4.11            |
+| K8s with EKS  | 1.22<br/>1.23<br/>1.24<br/>1.25          |
+| K8s with Kops | 1.22<br/>1.23<br/>1.24<br/>1.25<br/>1.26 |
+| K8s with GKE  | 1.22<br/>1.23<br/>1.24<br/>1.25          |
+| K8s with AKS  | 1.24<br/>1.25<br/>1.26                   |
+| OpenShift     | 4.8<br/>4.9<br/>4.10<br/>4.11<br/>4.12   |
 | Helm          | 3.8.2 (Linux)                            |
 | kubectl       | 1.23.6                                   |
 

diff --git a/tests/integration/kind_images.json b/tests/integration/kind_images.json
@@ -1,10 +1,10 @@
 {
   "supported": [
+    "kindest/node:v1.26.3",
     "kindest/node:v1.25.3",
     "kindest/node:v1.24.0",
     "kindest/node:v1.23.6",
-    "kindest/node:v1.22.9",
-    "kindest/node:v1.21.12"
+    "kindest/node:v1.22.9"
   ],
-  "default": "kindest/node:v1.25.3"
+  "default": "kindest/node:v1.26.3"
 }