From 6389615d17d1686a0cbf1529a4d22c16d19eb7c1 Mon Sep 17 00:00:00 2001
From: Ryan Thorn <rthorn@newrelic.com>
Date: Wed, 30 Nov 2022 11:56:57 -0800
Subject: [PATCH 1/2] chore: use k8s version 1.24.8 for minikube testing

---
 .../linux/kubernetes/minikube/roles/prepare/tasks/main.yml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/deploy/linux/kubernetes/minikube/roles/prepare/tasks/main.yml b/test/deploy/linux/kubernetes/minikube/roles/prepare/tasks/main.yml
index 73697febf..006dc6ab9 100644
--- 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'
+  shell: 'minikube start --memory 8192 --cpus 4 --kubernetes-version=v1.24.8'
 
 - name: Create kubectl wrap command
   template:

From 4a4282bfe90b324ff9f0873367d5a7e2de395df7 Mon Sep 17 00:00:00 2001
From: Ryan Thorn <rthorn@newrelic.com>
Date: Wed, 30 Nov 2022 11:58:06 -0800
Subject: [PATCH 2/2] chore: check k8s int installed in minikube test

---
 test/definitions/ohi/linux/k8-linux2.json | 34 +++++++++++++----------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/test/definitions/ohi/linux/k8-linux2.json b/test/definitions/ohi/linux/k8-linux2.json
index 07ba4fea9..3e450ff8d 100644
--- a/test/definitions/ohi/linux/k8-linux2.json
+++ b/test/definitions/ohi/linux/k8-linux2.json
@@ -1,41 +1,45 @@
 {
-    "global_tags": {
-      "owning_team": "virtuoso",
-      "Environment": "development",
-      "Department": "product",
-      "Product": "virtuoso"
-    },
-  
-    "resources": [{
+  "global_tags": {
+    "owning_team": "virtuoso",
+    "Environment": "development",
+    "Department": "product",
+    "Product": "virtuoso"
+  },
+  "resources": [
+    {
       "id": "k8mini",
       "provider": "aws",
       "type": "ec2",
       "size": "t3.xlarge",
       "ami_name": "amazonlinux-2-base*"
-    }],
-  
-    "services": [
+    }
+  ],
+  "services": [
     {
       "id": "minik1",
       "source_repository": "https://github.com/newrelic/open-install-library.git",
       "deploy_script_path": "test/deploy/linux/kubernetes/minikube/roles",
       "port": 9999,
-      "destinations": ["k8mini"]
+      "destinations": [
+        "k8mini"
+      ]
     }
   ],
   "instrumentations": {
     "resources": [
       {
         "id": "nr_k8",
-        "resource_ids": ["k8mini"],
+        "resource_ids": [
+          "k8mini"
+        ],
         "provider": "newrelic",
         "source_repository": "https://github.com/newrelic/open-install-library.git",
         "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
         "params": {
           "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/awslinux.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/kubernetes.yml",
-          "validate_output": "New Relic installation complete"
+          "validate_output": "(Kubernetes Integration)\\s+\\(installed\\)"
         }
       }
     ]
   }
-}
+}
\ No newline at end of file