Merge pull request #984 from NERC-CEH/ED-121-yarnaudit

fix: bump kubernetes-client and fix deprecated k8s auto-scaler API
NERC-CEH · Jun 24, 2024 · 791e0f4 · 791e0f4
2 parents 6d65d97 + da44e16
commit 791e0f4
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 269 deletions.
diff --git a/code/workspaces/infrastructure-api/package.json b/code/workspaces/infrastructure-api/package.json
@@ -7,7 +7,7 @@
   "private": true,
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@kubernetes/client-node": "^0.16.3",
+    "@kubernetes/client-node": "^0.20",
     "axios": "0.28.0",
     "bluebird": "3.5.5",
     "body-parser": "1.20.2",

diff --git a/code/workspaces/infrastructure-api/resources/auto-scaler.template.yml b/code/workspaces/infrastructure-api/resources/auto-scaler.template.yml
@@ -1,4 +1,4 @@
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{name}}

diff --git a/...rkspaces/infrastructure-api/src/kubernetes/__snapshots__/deploymentGenerator.spec.js.snap b/...rkspaces/infrastructure-api/src/kubernetes/__snapshots__/deploymentGenerator.spec.js.snap
@@ -1028,7 +1028,7 @@ spec:
 `;
 
 exports[`deploymentGenerator generates createAutoScaler manifest 1`] = `
-"apiVersion: autoscaling/v2beta2
+"apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: auto-scaler-name

diff --git a/code/workspaces/infrastructure-api/src/kubernetes/autoScalerApi.js b/code/workspaces/infrastructure-api/src/kubernetes/autoScalerApi.js
@@ -7,7 +7,7 @@ const API_BASE = config.get('kubernetesApi');
 
 const getAutoScalerUrl = (namespace, name) => {
   const nameComponent = name ? `/${name}` : '';
-  return `${API_BASE}/apis/autoscaling/v2beta2/namespaces/${namespace}/horizontalpodautoscalers${nameComponent}`;
+  return `${API_BASE}/apis/autoscaling/v2/namespaces/${namespace}/horizontalpodautoscalers${nameComponent}`;
 };
 
 const YAML_CONTENT_HEADER = { headers: { 'Content-Type': 'application/yaml' } };

diff --git a/code/workspaces/infrastructure-api/src/kubernetes/autoScalerApi.spec.js b/code/workspaces/infrastructure-api/src/kubernetes/autoScalerApi.spec.js
@@ -6,7 +6,7 @@ import autoScalerApi from './autoScalerApi';
 const mockAxios = new MockAdapter(axios);
 const apiBase = config.get('kubernetesApi');
 const namespace = 'namespace';
-const hpaUrl = `${apiBase}/apis/autoscaling/v2beta2/namespaces/${namespace}/horizontalpodautoscalers`;
+const hpaUrl = `${apiBase}/apis/autoscaling/v2/namespaces/${namespace}/horizontalpodautoscalers`;
 const hpaName = 'hpa-name';
 
 const hpaResource = {