chore: support e2e testing on openshift 4.20 (#1401)

Author: jamescripter

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+### enhancement
+- Support OpenShift 4.20 @jamescripter [#1401](https://github.com/newrelic/nri-kubernetes/pull/1401)
+
 ## v3.56.0 - 2026-03-09
 
 ### 🚀 Enhancements

e2e/1_33-exceptions-openshift.yml

@@ -0,0 +1,5 @@
+except_metrics: [
+  k8s.node.netErrorsPerSecond,
+  k8s.node.netRxBytesPerSecond,
+  k8s.node.netTxBytesPerSecond
+]

e2e/test-specs-openshift.yml

@@ -9,7 +9,7 @@ scenarios:
     before:
       - helm dependency update ../charts/internal/e2e-resources
       - helm dependency update ../charts/newrelic-infrastructure
-      - function ver { printf $((10#$(printf "%03d%03d" $(echo "$1" | tr '.' ' ')))); } && K8S_VERSION=$(kubectl version 2>&1 | grep 'Server Version' | awk -F' v' '{ print $2; }' | awk -F. '{ print $1"."$2; }') && if [[ $(ver $K8S_VERSION) -gt $(ver "1.30") ]]; then KSM_IMAGE_VERSION="v2.13.0"; else KSM_IMAGE_VERSION="v2.10.0"; fi && echo "Will use KSM image version ${KSM_IMAGE_VERSION}" && helm upgrade --install ${SCENARIO_TAG}-resources --namespace nr-${SCENARIO_TAG} --create-namespace ../charts/internal/e2e-resources --set persistentVolume.enabled=true --set kube-state-metrics.image.tag=${KSM_IMAGE_VERSION} --set openShift.enabled=true --set demo.enabled=true
+      - function ver { printf $((10#$(printf "%03d%03d" $(echo "$1" | tr '.' ' ')))); } && K8S_VERSION=$(kubectl version 2>&1 | grep 'Server Version' | awk -F' v' '{ print $2; }' | awk -F. '{ print $1"."$2; }') && if [[ $(ver $K8S_VERSION) -gt $(ver "1.30") ]]; then KSM_IMAGE_VERSION="v2.17.0"; else KSM_IMAGE_VERSION="v2.10.0"; fi && echo "Will use KSM image version ${KSM_IMAGE_VERSION}" && helm upgrade --install ${SCENARIO_TAG}-resources --namespace nr-${SCENARIO_TAG} --create-namespace ../charts/internal/e2e-resources --set persistentVolume.enabled=true --set kube-state-metrics.image.tag=${KSM_IMAGE_VERSION} --set openShift.enabled=true --set demo.enabled=true
       - helm upgrade --install ${SCENARIO_TAG} --namespace nr-${SCENARIO_TAG} --create-namespace ../charts/newrelic-infrastructure --values e2e-values-openshift.yml --set global.licenseKey=${LICENSE_KEY} --set global.cluster=${SCENARIO_TAG} --set kubelet.fetchPodsFromKubeService=${FETCH_PODS_FROM_KUBE_SERVICE}
       # Allow for resources to settle before starting checks
       - sleep 60
@@ -731,7 +731,7 @@ scenarios:
       - kubectl delete pv ${SCENARIO_TAG}-resources-pv-storage --wait=true --timeout=30s || true
       - helm dependency update ../charts/internal/e2e-resources
       - helm dependency update ../charts/newrelic-infrastructure
-      - function ver { printf $((10#$(printf "%03d%03d" $(echo "$1" | tr '.' ' ')))); } && K8S_VERSION=$(kubectl version 2>&1 | grep 'Server Version' | awk -F' v' '{ print $2; }' | awk -F. '{ print $1"."$2; }') && if [[ $(ver $K8S_VERSION) -gt $(ver "1.29") ]]; then KSM_IMAGE_VERSION="v2.13.0"; else KSM_IMAGE_VERSION="v2.10.0"; fi && echo "Will use KSM image version ${KSM_IMAGE_VERSION}" && helm upgrade --install ${SCENARIO_TAG}-resources --namespace nr-${SCENARIO_TAG} --create-namespace ../charts/internal/e2e-resources --set persistentVolume.enabled=true --set kube-state-metrics.image.tag=${KSM_IMAGE_VERSION} --set openShift.enabled=true --set demo.enabled=true
+      - function ver { printf $((10#$(printf "%03d%03d" $(echo "$1" | tr '.' ' ')))); } && K8S_VERSION=$(kubectl version 2>&1 | grep 'Server Version' | awk -F' v' '{ print $2; }' | awk -F. '{ print $1"."$2; }') && if [[ $(ver $K8S_VERSION) -gt $(ver "1.29") ]]; then KSM_IMAGE_VERSION="v2.17.0"; else KSM_IMAGE_VERSION="v2.10.0"; fi && echo "Will use KSM image version ${KSM_IMAGE_VERSION}" && helm upgrade --install ${SCENARIO_TAG}-resources --namespace nr-${SCENARIO_TAG} --create-namespace ../charts/internal/e2e-resources --set persistentVolume.enabled=true --set kube-state-metrics.image.tag=${KSM_IMAGE_VERSION} --set openShift.enabled=true --set demo.enabled=true
       - helm upgrade --install ${SCENARIO_TAG} --namespace nr-${SCENARIO_TAG} --create-namespace ../charts/newrelic-infrastructure --values e2e-values-openshift.yml --set global.licenseKey=${LICENSE_KEY} --set global.cluster=${SCENARIO_TAG} --set privileged=false --set kubelet.fetchPodsFromKubeService=${FETCH_PODS_FROM_KUBE_SERVICE}
       # Allow for resources to settle before starting checks
       - sleep 60