Merge pull request #1128 from newrelic/czeitler/kubernetes-1-31

feat(kubernetes): Add Kube 1.31 support and drop 1.26
newrelic · Oct 30, 2024 · 56937e6 · 56937e6
2 parents 130e1b0 + b0e9e5c
commit 56937e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/recipes/newrelic/infrastructure/kubernetes.yml b/recipes/newrelic/infrastructure/kubernetes.yml
@@ -180,14 +180,14 @@ install:
             exit 131
           fi
 
-          if [[ "$SERVER_MAJOR_VERSION" -lt 1 ]] || [[ "$SERVER_MAJOR_VERSION" -eq 1 && "$SERVER_MINOR_VERSION" -lt 26 ]]; then
-            echo "Installation failed. Kubernetes version less that v1.26 is not supported, found v${SERVER_MAJOR_VERSION}.${SERVER_MINOR_VERSION}" >&2
+          if [[ "$SERVER_MAJOR_VERSION" -lt 1 ]] || [[ "$SERVER_MAJOR_VERSION" -eq 1 && "$SERVER_MINOR_VERSION" -lt 27 ]]; then
+            echo "Installation failed. Kubernetes version less that v1.27 is not supported, found v${SERVER_MAJOR_VERSION}.${SERVER_MINOR_VERSION}" >&2
             echo "{\"Metadata\":{\"UnsupportedReason\":\"Unsupported k8s version - found $SERVER_MAJOR_VERSION.$SERVER_MINOR_VERSION\", \"K8sClientVersion\":\"$CLIENT_MAJOR_VERSION.$CLIENT_MINOR_VERSION\", \"K8sServerVersion\":\"$SERVER_MAJOR_VERSION.$SERVER_MINOR_VERSION\"}}" | tee -a {{.NR_CLI_OUTPUT}}
             exit 131
           fi
 
-          if [[ "$SERVER_MAJOR_VERSION" -eq 1 && "$SERVER_MINOR_VERSION" -gt 30 ]]; then
-            echo "Kubernetes version greater than v1.30 is not officially supported, found v${SERVER_MAJOR_VERSION}.${SERVER_MINOR_VERSION}" >&2
+          if [[ "$SERVER_MAJOR_VERSION" -eq 1 && "$SERVER_MINOR_VERSION" -gt 31 ]]; then
+            echo "Kubernetes version greater than v1.31 is not officially supported, found v${SERVER_MAJOR_VERSION}.${SERVER_MINOR_VERSION}" >&2
             echo "{\"Metadata\":{\"UnsupportedReason\":\"Unsupported k8s version - found $SERVER_MAJOR_VERSION.$SERVER_MINOR_VERSION\", \"K8sClientVersion\":\"$CLIENT_MAJOR_VERSION.$CLIENT_MINOR_VERSION\", \"K8sServerVersion\":\"$SERVER_MAJOR_VERSION.$SERVER_MINOR_VERSION\"}}" | tee -a {{.NR_CLI_OUTPUT}}
           fi
           

diff --git a/test/deploy/linux/kubernetes/minikube/roles/prepare/tasks/main.yml b/test/deploy/linux/kubernetes/minikube/roles/prepare/tasks/main.yml
@@ -58,7 +58,7 @@
   when: is_minikube_installed.stdout|int == 0
 
 - name: Start Minikube
-  shell: 'minikube start --memory 8192 --cpus 4 --kubernetes-version=v1.26.1'
+  shell: 'minikube start --memory 8192 --cpus 4 --kubernetes-version=v1.31.0'
 
 - name: Create kubectl wrap command
   template: