Skip to content

Commit 17a2eae

Browse files
committed
update k8shelper deps
Signed-off-by: Humair Khan <[email protected]>
1 parent 5a8cbf1 commit 17a2eae

File tree

2 files changed

+21
-13
lines changed

2 files changed

+21
-13
lines changed

frontend/server/integration-tests/tensorboard.test.ts

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -813,14 +813,19 @@ describe('/apps/tensorboard', () => {
813813
.delete(`/apps/tensorboard?logdir=${encodeURIComponent('log-dir-1')}&namespace=test-ns`)
814814
.expect(200, 'Tensorboard deleted.', err => {
815815
expect(k8sDeleteCustomObjectSpy.mock.calls[0]).toMatchInlineSnapshot(`
816-
Array [
817-
"kubeflow.org",
818-
"v1beta1",
819-
"test-ns",
820-
"viewers",
821-
"viewer-5e1404e679e27b0f0b8ecee8fe515830eaa736c5",
822-
]
823-
`);
816+
Array [
817+
"kubeflow.org",
818+
"v1beta1",
819+
"test-ns",
820+
"viewers",
821+
"viewer-5e1404e679e27b0f0b8ecee8fe515830eaa736c5",
822+
V1DeleteOptions {
823+
"apiVersion": "v1",
824+
"kind": "DeleteOptions",
825+
"propagationPolicy": "Foreground",
826+
},
827+
]
828+
`);
824829
done(err);
825830
});
826831
});

frontend/server/k8s-helper.ts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@
1313
// limitations under the License.
1414

1515
import {
16-
CoreV1Api,
17-
CustomObjectsApi,
1816
KubeConfig,
1917
V1Pod,
2018
V1EventList,
21-
V1ConfigMap,
19+
V1ConfigMap, Core_v1Api, Custom_objectsApi, V1DeleteOptions, V1Preconditions,
2220
} from '@kubernetes/client-node';
2321
import * as crypto from 'crypto-js';
2422
import * as fs from 'fs';
@@ -54,8 +52,8 @@ if (fs.existsSync(namespaceFilePath)) {
5452
const kc = new KubeConfig();
5553
// This loads kubectl config when not in cluster.
5654
kc.loadFromDefault();
57-
const k8sV1Client = kc.makeApiClient(CoreV1Api);
58-
const k8sV1CustomObjectClient = kc.makeApiClient(CustomObjectsApi);
55+
const k8sV1Client = kc.makeApiClient(Core_v1Api);
56+
const k8sV1CustomObjectClient = kc.makeApiClient(Custom_objectsApi);
5957

6058
function getNameOfViewerResource(logdir: string): string {
6159
// TODO: find some hash function with shorter resulting message.
@@ -203,12 +201,17 @@ export async function deleteTensorboardInstance(logdir: string, namespace: strin
203201

204202
const viewerName = getNameOfViewerResource(logdir);
205203

204+
const deleteOptions = new V1DeleteOptions();
205+
deleteOptions.apiVersion = 'v1';
206+
deleteOptions.kind = 'DeleteOptions';
207+
deleteOptions.propagationPolicy = 'Foreground';
206208
await k8sV1CustomObjectClient.deleteNamespacedCustomObject(
207209
viewerGroup,
208210
viewerVersion,
209211
namespace,
210212
viewerPlural,
211213
viewerName,
214+
deleteOptions,
212215
);
213216
}
214217

0 commit comments

Comments
 (0)