bump kube client

Author: williamlardier

tests/@setup/src/buckets.ts

@@ -33,11 +33,11 @@ async function setupAWSBuckets(k8s: KubernetesClient, options: BucketsOptions):
     const awsSecret = await k8s.coreApi.readNamespacedSecret('aws-mock-credentials', options.namespace);
     const awsConfig = {
         credentials: {
-            accessKeyId: Buffer.from(awsSecret.body.data!['aws-access-key-id'], 'base64').toString(),
-            secretAccessKey: Buffer.from(awsSecret.body.data!['aws-secret-access-key'], 'base64').toString()
-        },
-        region: Buffer.from(awsSecret.body.data!['aws-region'], 'base64').toString(),
-        endpoint: Buffer.from(awsSecret.body.data!['aws-endpoint'], 'base64').toString(),
+        accessKeyId: Buffer.from(awsSecret.data!['aws-access-key-id'], 'base64').toString(),
+        secretAccessKey: Buffer.from(awsSecret.data!['aws-secret-access-key'], 'base64').toString()
+    },
+    region: Buffer.from(awsSecret.data!['aws-region'], 'base64').toString(),
+    endpoint: Buffer.from(awsSecret.data!['aws-endpoint'], 'base64').toString(),
         forcePathStyle: true
     };
 
@@ -105,10 +105,10 @@ async function setupAzureBuckets(k8s: KubernetesClient, options: BucketsOptions)
 
     // Get Azure credentials from mock service
     const azureSecret = await k8s.coreApi.readNamespacedSecret('azure-mock-credentials', options.namespace);
-    const accountName = Buffer.from(azureSecret.body.data!['account-name'], 'base64').toString();
-    const accountKey = Buffer.from(azureSecret.body.data!['account-key'], 'base64').toString();
-    const blobEndpoint = Buffer.from(azureSecret.body.data!['blob-endpoint'], 'base64').toString();
-    const queueEndpoint = Buffer.from(azureSecret.body.data!['queue-endpoint'], 'base64').toString();
+    const accountName = Buffer.from(azureSecret.data!['account-name'], 'base64').toString();
+    const accountKey = Buffer.from(azureSecret.data!['account-key'], 'base64').toString();
+    const blobEndpoint = Buffer.from(azureSecret.data!['blob-endpoint'], 'base64').toString();
+    const queueEndpoint = Buffer.from(azureSecret.data!['queue-endpoint'], 'base64').toString();
 
     const blobSharedKeyCredential = new BlobStorageSharedKeyCredential(accountName, accountKey);
     const queueSharedKeyCredential = new StorageSharedKeyCredential(accountName, accountKey);

tests/@setup/src/dns.ts

@@ -45,7 +45,7 @@ export async function setupDNS(options: DNSOptions): Promise<void> {
     }
 
     // Parse current Corefile
-    const currentCorefile = coreDnsConfigMap.body.data?.['Corefile'] || '';
+    const currentCorefile = coreDnsConfigMap.data?.['Corefile'] || '';
 
     // Generate rewrite rules for test domains
     const rewriteRules = generateRewriteRules(options.subdomain, options.namespace);
@@ -63,7 +63,7 @@ export async function setupDNS(options: DNSOptions): Promise<void> {
     const updatedConfigMap = {
         ...coreDnsConfigMap.body,
         data: {
-            ...coreDnsConfigMap.body.data,
+            ...coreDnsConfigMap.data,
             'Corefile': newCorefile
         }
     };
@@ -179,10 +179,10 @@ async function restartCoreDNS(k8s: KubernetesClient): Promise<void> {
         const deployment = await k8s.appsApi.readNamespacedDeployment('coredns', 'kube-system');
 
         // Add/update restart annotation to trigger rolling restart
-        const annotations = deployment.body.spec?.template.metadata?.annotations || {};
+        const annotations = deployment.spec?.template.metadata?.annotations || {};
         annotations['kubectl.kubernetes.io/restartedAt'] = new Date().toISOString();
 
-        deployment.body.spec!.template.metadata!.annotations = annotations;
+        deployment.spec!.template.metadata!.annotations = annotations;
 
         await k8s.appsApi.replaceNamespacedDeployment('coredns', 'kube-system', deployment.body);
 

tests/@setup/src/keycloak.ts

@@ -39,7 +39,7 @@ async function getKeycloakConfig(k8s: KubernetesClient, namespace: string): Prom
     try {
         // Look for Keycloak service
         const services = await k8s.coreApi.listNamespacedService(namespace);
-        const keycloakService = services.body.items.find(svc =>
+        const keycloakService = services.items.find(svc =>
             svc.metadata?.name?.toLowerCase().includes('keycloak') ||
             svc.metadata?.name?.toLowerCase().includes('auth')
         );
@@ -50,7 +50,7 @@ async function getKeycloakConfig(k8s: KubernetesClient, namespace: string): Prom
 
         // Look for Keycloak admin credentials
         const secrets = await k8s.coreApi.listNamespacedSecret(namespace);
-        const keycloakSecret = secrets.body.items.find(secret =>
+        const keycloakSecret = secrets.items.find(secret =>
             secret.metadata?.name?.toLowerCase().includes('keycloak') &&
             (secret.metadata?.name?.toLowerCase().includes('admin') ||
                 secret.metadata?.name?.toLowerCase().includes('credentials'))

tests/@setup/src/locations.ts

@@ -82,7 +82,7 @@ async function getManagementEndpoint(k8s: KubernetesClient, namespace: string):
     try {
         // Try to find Management API service
         const services = await k8s.coreApi.listNamespacedService(namespace);
-        const mgmtService = services.body.items.find(svc =>
+        const mgmtService = services.items.find(svc =>
             svc.metadata?.name?.includes('management') ||
             svc.metadata?.name?.includes('api') ||
             svc.metadata?.name?.includes('zenko-management')
@@ -106,7 +106,7 @@ async function getManagementCredentials(k8s: KubernetesClient, namespace: string
     try {
         // Look for admin credentials in secrets
         const secrets = await k8s.coreApi.listNamespacedSecret(namespace);
-        const adminSecret = secrets.body.items.find(secret =>
+        const adminSecret = secrets.items.find(secret =>
             secret.metadata?.name?.includes('admin') ||
             secret.metadata?.name?.includes('management') ||
             secret.metadata?.name?.includes('credentials')

tests/@setup/src/rbac.ts

@@ -30,7 +30,7 @@ export async function setupRBAC(options: RBACOptions): Promise<void> {
 
     // Get all service accounts in the namespace
     const serviceAccounts = await k8s.coreApi.listNamespacedServiceAccount(options.namespace);
-    const zenkoServiceAccounts = serviceAccounts.body.items.filter(sa =>
+    const zenkoServiceAccounts = serviceAccounts.items.filter(sa =>
         sa.metadata?.name?.includes('zenko') ||
         sa.metadata?.name?.includes('cloudserver') ||
         sa.metadata?.name?.includes('backbeat') ||

tests/@setup/src/utils/k8s.ts

@@ -173,7 +173,7 @@ export class KubernetesClient {
         while (Date.now() - startTime < timeoutMs) {
             try {
                 const deployment = await this.appsApi.readNamespacedDeployment(name, namespace);
-                const status = deployment.body.status;
+                const status = deployment.status;
 
                 if (status?.readyReplicas === status?.replicas && status?.replicas && status.replicas > 0) {
                     logger.debug(`Deployment ${name} is ready`);

tests/ctst/package.json

@@ -8,7 +8,7 @@
   "license": "ISC",
   "private": true,
   "dependencies": {
-    "@kubernetes/client-node": "^0.21.0",
+    "@kubernetes/client-node": "^1.3.0",
     "@types/node": "^18.19.121",
     "@types/proper-lockfile": "^4.1.4",
     "@types/qs": "^6.9.15",