Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions frontend/server/integration-tests/tensorboard.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -813,14 +813,19 @@ describe('/apps/tensorboard', () => {
.delete(`/apps/tensorboard?logdir=${encodeURIComponent('log-dir-1')}&namespace=test-ns`)
.expect(200, 'Tensorboard deleted.', err => {
expect(k8sDeleteCustomObjectSpy.mock.calls[0]).toMatchInlineSnapshot(`
Array [
"kubeflow.org",
"v1beta1",
"test-ns",
"viewers",
"viewer-5e1404e679e27b0f0b8ecee8fe515830eaa736c5",
]
`);
Array [
"kubeflow.org",
"v1beta1",
"test-ns",
"viewers",
"viewer-5e1404e679e27b0f0b8ecee8fe515830eaa736c5",
V1DeleteOptions {
"apiVersion": "v1",
"kind": "DeleteOptions",
"propagationPolicy": "Foreground",
},
]
`);
done(err);
});
});
Expand Down
13 changes: 8 additions & 5 deletions frontend/server/k8s-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@
// limitations under the License.

import {
CoreV1Api,
CustomObjectsApi,
KubeConfig,
V1Pod,
V1EventList,
V1ConfigMap,
V1ConfigMap, Core_v1Api, Custom_objectsApi, V1DeleteOptions, V1Preconditions,
} from '@kubernetes/client-node';
import * as crypto from 'crypto-js';
import * as fs from 'fs';
Expand Down Expand Up @@ -54,8 +52,8 @@ if (fs.existsSync(namespaceFilePath)) {
const kc = new KubeConfig();
// This loads kubectl config when not in cluster.
kc.loadFromDefault();
const k8sV1Client = kc.makeApiClient(CoreV1Api);
const k8sV1CustomObjectClient = kc.makeApiClient(CustomObjectsApi);
const k8sV1Client = kc.makeApiClient(Core_v1Api);
const k8sV1CustomObjectClient = kc.makeApiClient(Custom_objectsApi);

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

const viewerName = getNameOfViewerResource(logdir);

const deleteOptions = new V1DeleteOptions();
deleteOptions.apiVersion = 'v1';
deleteOptions.kind = 'DeleteOptions';
deleteOptions.propagationPolicy = 'Foreground';
await k8sV1CustomObjectClient.deleteNamespacedCustomObject(
viewerGroup,
viewerVersion,
namespace,
viewerPlural,
viewerName,
deleteOptions,
);
}

Expand Down
Loading