Skip to content

Commit

Permalink
Simplify code. Show Volumes under Pod and Volume Mounts under Contain…
Browse files Browse the repository at this point in the history 
…ers.
  • Loading branch information
@sandipchitale
sandipchitale committed Nov 11, 2019
1 parent 82a612b commit e0156a6
Show file tree
Hide file tree
Showing 4 changed files with 117 additions and 76 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change Log

### 1.0.18

- Simplify code.
- Show Volumes under Pod and Volume Mounts under Containers.

### 1.0.17

- Update README.
Expand Down
7 changes: 6 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,9 @@ Update README.

### 1.0.17

Update README.
Update README.

### 1.0.18

Simplify code.
Show Volumes under Pod and Volume Mounts under Containers.
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "Kubernetes Pod File System Explorer",
"icon": "images/icon.png",
"description": "Kubernetes Pod File System Explorer.",
"version": "1.0.17",
"version": "1.0.18",
"keywords": [
"kubernetes"
],
Expand Down Expand Up @@ -36,7 +36,7 @@
"properties": {
"kubernetes-file-system-explorer.nsenter-image": {
"type": "string",
"description": "Specify nsenter images to use e.g. jpetazzo/nsenter:latest"
"description": "Specify nsenter images to use e.g. jpetazzo/nsenter:latest. WARNING: Use at your own risk."
}
}
},
Expand Down
177 changes: 104 additions & 73 deletions src/extension.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,41 +8,88 @@ const KUBERNETES_FILE_VIEW = 'kubernetes-file-view';
const KUBERNETES_FOLDER_FIND = 'kubernetes-folder-find';
const KUBERNETES_FOLDER_LS_AL = 'kubernetes-folder-ls-al';

class FileNode implements k8s.ClusterExplorerV1.Node {

class VolumeMountNode implements k8s.ClusterExplorerV1.Node {
private podName: string;
private namespace: string;
private containerName: string;
private path: string;
private name: string;
private volumeMount: any;

constructor(podName: string, namespace: string, path: string, name: string, containerName: string) {
constructor(podName: string, namespace: string, volumeMount: any) {
this.podName = podName;
this.namespace = namespace;
this.containerName = containerName;
this.path = path;
this.name = name
.replace(/\@$/, '')
.replace(/\*$/, '');
this.volumeMount = volumeMount;
}

async getChildren(): Promise<k8s.ClusterExplorerV1.Node[]> {
return [];
}

getTreeItem(): vscode.TreeItem {
const treeItem = new vscode.TreeItem(this.name, vscode.TreeItemCollapsibleState.None);
treeItem.tooltip = this.path + this.name;
treeItem.contextValue = 'containerfilenode';
const treeItem = new vscode.TreeItem('Volume mount: ' + this.volumeMount.name, vscode.TreeItemCollapsibleState.None);
treeItem.tooltip = JSON.stringify(this.volumeMount, null, ' ');
treeItem.contextValue = 'volumemountnode';
return treeItem;
}
}

isFile() {
return true;
class VolumeNode implements k8s.ClusterExplorerV1.Node {
private podName: string;
private namespace: string;
private volume: any;

constructor(podName: string, namespace: string, volume: any) {
this.podName = podName;
this.namespace = namespace;
this.volume = volume;
}

async viewFile() {
let doc = await vscode.workspace.openTextDocument(vscode.Uri.parse(`kubernetes-file-view:${this.podName}:${this.namespace}:${this.containerName}:${this.path}/${this.name}`));
await vscode.window.showTextDocument(doc, { preview: false });
async getChildren(): Promise<k8s.ClusterExplorerV1.Node[]> {
return [];
}

getTreeItem(): vscode.TreeItem {
const treeItem = new vscode.TreeItem('Volume: ' + this.volume.name, vscode.TreeItemCollapsibleState.None);
treeItem.tooltip = JSON.stringify(this.volume, null, ' ');
treeItem.contextValue = 'volumenode';
return treeItem;
}
}

class ContainerNode implements k8s.ClusterExplorerV1.Node {
private kubectl: k8s.KubectlV1;
podName: string;
namespace: string;
name: string;
private image: string;
private initContainer: boolean;
private volumeMounts: any;

constructor(kubectl: k8s.KubectlV1, podName: string, namespace: string, name: string, image: string, initContainer: boolean, volumeMounts: any) {
this.kubectl = kubectl;
this.podName = podName;
this.namespace = namespace;
this.name = name;
this.image = image;
this.initContainer = initContainer;
this.volumeMounts = volumeMounts;
}

async getChildren(): Promise<k8s.ClusterExplorerV1.Node[]> {
const volumeMountNodes = [];
if (this.volumeMounts && this.volumeMounts.length > 0) {
this.volumeMounts.forEach((volumeMount) => {
volumeMountNodes.push(new VolumeMountNode(this.name, this.namespace, volumeMount));
})
}
return volumeMountNodes;
}

getTreeItem(): vscode.TreeItem {
const treeItem = new vscode.TreeItem(`${this.initContainer ? 'Init Container:' : 'Container: ' } ${this.name} ( ${this.image } )`,
(this.volumeMounts && this.volumeMounts.length > 0 ? vscode.TreeItemCollapsibleState.Collapsed : vscode.TreeItemCollapsibleState.None));
treeItem.tooltip = `${this.initContainer ? 'Init Container:' : 'Container: ' } ${this.name} ( ${this.image } )`;
treeItem.contextValue = 'containernode';
return treeItem;
}
}

Expand Down Expand Up @@ -108,70 +155,45 @@ class FolderNode implements k8s.ClusterExplorerV1.Node {
}
}

class FileSystemNodeContributor {
private kubectl: k8s.KubectlV1;

constructor(kubectl: k8s.KubectlV1) {
this.kubectl = kubectl;
}

contributesChildren(parent: k8s.ClusterExplorerV1.ClusterExplorerNode | undefined): boolean {
return parent && parent.nodeType === 'resource' && parent.resourceKind.manifestKind === 'Pod';
}

async getChildren(parent: k8s.ClusterExplorerV1.ClusterExplorerNode | undefined): Promise<k8s.ClusterExplorerV1.Node[]> {
if (parent && parent.nodeType === 'resource' && parent.resourceKind.manifestKind === 'Pod') {
const explorer = await k8s.extension.clusterExplorer.v1;
if (explorer.available) {
const kubectl = await k8s.extension.kubectl.v1;
if (kubectl.available) {
const podDetails = await kubectl.api.invokeCommand(`get pods ${parent.name} -o json`);
if (podDetails && podDetails.stdout) {
const podDetailsAsJson = JSON.parse(podDetails.stdout);
const containers = [];
podDetailsAsJson.spec.containers.forEach((container) => {
containers.push(new FolderNode(this.kubectl, parent.name, parent.namespace, '/', '', container.name));
});
return containers;
}
}
}
return [ new FolderNode(this.kubectl, parent.name, parent.namespace, '/', '', undefined) ];
}
return [];
}
}
class ContainerNode implements k8s.ClusterExplorerV1.Node {
private kubectl: k8s.KubectlV1;
podName: string;
namespace: string;
name: string;
private image: string;
private initContainer: boolean;
class FileNode implements k8s.ClusterExplorerV1.Node {
private podName: string;
private namespace: string;
private containerName: string;
private path: string;
private name: string;

constructor(kubectl: k8s.KubectlV1, podName: string, namespace: string, name: string, image: string, initContainer: boolean) {
this.kubectl = kubectl;
constructor(podName: string, namespace: string, path: string, name: string, containerName: string) {
this.podName = podName;
this.namespace = namespace;
this.name = name;
this.image = image;
this.initContainer = initContainer;
this.containerName = containerName;
this.path = path;
this.name = name
.replace(/\@$/, '')
.replace(/\*$/, '');
}

async getChildren(): Promise<k8s.ClusterExplorerV1.Node[]> {
return [];
}

getTreeItem(): vscode.TreeItem {
const treeItem = new vscode.TreeItem(`${this.name} ( ${this.image } )`, vscode.TreeItemCollapsibleState.None);
treeItem.tooltip = `${this.initContainer ? 'Init Container:' : 'Container: ' } ${this.name} ( ${this.image } )`;
treeItem.contextValue = 'containernode';
const treeItem = new vscode.TreeItem(this.name, vscode.TreeItemCollapsibleState.None);
treeItem.tooltip = this.path + this.name;
treeItem.contextValue = 'containerfilenode';
return treeItem;
}
}

class ContainerNodeContributor {
isFile() {
return true;
}

async viewFile() {
let doc = await vscode.workspace.openTextDocument(vscode.Uri.parse(`kubernetes-file-view:${this.podName}:${this.namespace}:${this.containerName}:${this.path}/${this.name}`));
await vscode.window.showTextDocument(doc, { preview: false });
}
}

class FileSystemNodeContributor {
private kubectl: k8s.KubectlV1;

constructor(kubectl: k8s.KubectlV1) {
Expand All @@ -183,7 +205,6 @@ class ContainerNodeContributor {
}

async getChildren(parent: k8s.ClusterExplorerV1.ClusterExplorerNode | undefined): Promise<k8s.ClusterExplorerV1.Node[]> {
const containers = [];
if (parent && parent.nodeType === 'resource' && parent.resourceKind.manifestKind === 'Pod') {
const explorer = await k8s.extension.clusterExplorer.v1;
if (explorer.available) {
Expand All @@ -192,19 +213,30 @@ class ContainerNodeContributor {
const podDetails = await kubectl.api.invokeCommand(`get pods ${parent.name} -o json`);
if (podDetails && podDetails.stdout) {
const podDetailsAsJson = JSON.parse(podDetails.stdout);
const volumes = [];
podDetailsAsJson.spec.volumes.forEach((volume) => {
volumes.push(new VolumeNode(parent.name, parent.namespace, volume));
});
const containers = [];
if (podDetailsAsJson.spec.initContainers) {
podDetailsAsJson.spec.initContainers.forEach((container) => {
containers.push(new ContainerNode(this.kubectl, parent.name, parent.namespace, container.name, container.image, true));
containers.push(new ContainerNode(this.kubectl, parent.name, parent.namespace, container.name, container.image, true, container.volumeMounts));
});
}
podDetailsAsJson.spec.containers.forEach((container) => {
containers.push(new ContainerNode(this.kubectl, parent.name, parent.namespace, container.name, container.image, false));
containers.push(new ContainerNode(this.kubectl, parent.name, parent.namespace, container.name, container.image, false, container.volumeMounts));
});
const containerFilesystems = [];
podDetailsAsJson.spec.containers.forEach((container) => {
containerFilesystems.push(new FolderNode(this.kubectl, parent.name, parent.namespace, '/', '', container.name));
});
return [...volumes, ...containers, ...containerFilesystems];
}
}
}
return [ new FolderNode(this.kubectl, parent.name, parent.namespace, '/', '', undefined) ];
}
return containers;
return [];
}
}

Expand Down Expand Up @@ -255,7 +287,6 @@ export async function activate(context: vscode.ExtensionContext) {
return;
}

explorer.api.registerNodeContributor(new ContainerNodeContributor(kubectl.api));
explorer.api.registerNodeContributor(new FileSystemNodeContributor(kubectl.api));
let disposable = vscode.commands.registerCommand('k8s.node.terminal', nodeTerminal);
context.subscriptions.push(disposable);
Expand Down

0 comments on commit e0156a6

Please sign in to comment.