diff --git a/.changelog/2969.changed.txt b/.changelog/2969.changed.txt new file mode 100644 index 0000000000..a0bb14076a --- /dev/null +++ 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 \ No newline at end of file diff --git a/deploy/helm/sumologic/templates/logs/common/hpa.yaml b/deploy/helm/sumologic/templates/logs/common/hpa.yaml index 3172d08a60..34ee9b0c0f 100644 --- 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 index 4e3213fe19..d6cdd0df4b 100644 --- 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 index 114e1cf6dc..3d3659321f 100644 --- 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 index 69e65130c7..1fd39a3777 100644 --- 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 index bd8cc5b79e..2c0e7ecfd6 100644 --- 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
1.22
1.23
1.24 | -| K8s with Kops | 1.22
1.23
1.24
1.25 | -| K8s with GKE | 1.21
1.22
1.23
1.24
1.25 | -| K8s with AKS | 1.23
1.24
1.25 | -| OpenShift | 4.8
4.9
4.10
4.11 | +| K8s with EKS | 1.22
1.23
1.24
1.25 | +| K8s with Kops | 1.22
1.23
1.24
1.25
1.26 | +| K8s with GKE | 1.22
1.23
1.24
1.25 | +| K8s with AKS | 1.24
1.25
1.26 | +| OpenShift | 4.8
4.9
4.10
4.11
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 index eb9443b0e7..c42f9f2921 100644 --- 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" }