gh-221: Try to get options server working with kubernetes 1.22

gchq · May 31, 2022 · de26d6a · de26d6a
1 parent 828cd34
commit de26d6a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml
@@ -26,7 +26,7 @@ jobs:
     - name: Start KinD
       run: |
         source ./docker/accumulo/.env
-        kind create cluster --config ./cd/kind.yaml --image kindest/node:v1.21.10
+        kind create cluster --config ./cd/kind.yaml --image kindest/node:v1.22.9
         kind load docker-image gchq/hdfs:$HADOOP_VERSION
         kind load docker-image gchq/gaffer:$GAFFER_VERSION
         kind load docker-image gchq/gaffer-rest:$GAFFER_VERSION

diff --git a/cd/deploy_to_kind.sh b/cd/deploy_to_kind.sh
@@ -16,7 +16,7 @@
 
 set -e
 
-kind create cluster --quiet --config ./cd/kind.yaml --image kindest/node:v1.21.10
+kind create cluster --quiet --config ./cd/kind.yaml --image kindest/node:v1.22.9
 
 # This sets the values for:
 # HADOOP_VERSION

diff --git a/docker/gaffer-jhub-options-server/package.json b/docker/gaffer-jhub-options-server/package.json
@@ -10,7 +10,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@kubernetes/client-node": "^0.12.2",
+    "@kubernetes/client-node": "^0.16.3",
     "aws-arn-parser": "^1.0.1",
     "body-parser": "^1.19.0",
     "express": "^4.17.1",

diff --git a/docker/gaffer-jhub-options-server/src/spark-config-provisioner.js b/docker/gaffer-jhub-options-server/src/spark-config-provisioner.js
@@ -128,9 +128,14 @@ class SparkConfigProvisioner {
 		if (!host && !path) return null
 
 		const ingressPath = {
+            pathType: 'ImplementationSpecific',
 			backend: {
-				serviceName: serviceName,
-				servicePort: servicePort
+                service: {
+                    name: serviceName,
+                    port: {
+                        number: servicePort
+                    }
+                }
 			}
 		}
 		if (path) ingressPath.path = path
@@ -143,7 +148,7 @@ class SparkConfigProvisioner {
 		if (host) rule.host = host
 
 		const ingress = {
-			apiVersion: 'extensions/v1beta1',
+			apiVersion: 'networking.k8s.io/v1',
 			kind: 'Ingress',
 			metadata: {
 				name: name,

diff --git a/kubernetes/docs/kind-deployment.md b/kubernetes/docs/kind-deployment.md
@@ -15,7 +15,7 @@ The following instructions will guide you through provisioning and configuring a
 
 Simply run the following command to spin up a local Kubernetes cluster, running inside a Docker container:
 ```
-kind create cluster --image kindest/node:v1.21.10
+kind create cluster --image kindest/node:v1.22.9
 ```
-Original file line number
+Diff line change
@@ Expand Up @@
     Simply run the following command to spin up a local Kubernetes cluster, running inside a Docker container:
     ```
-    kind create cluster --image kindest/node:v1.21.10
+    kind create cluster --image kindest/node:v1.22.9
     ```
@@ Expand Down @@