createClusterForm: show registry status

Helps you to not connect to an exited registry
k3d-io · Jan 18, 2021 · a78a0c4 · a78a0c4
1 parent 7558f01
commit a78a0c4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/src/commands/createClusterForm.ts b/src/commands/createClusterForm.ts
@@ -1,17 +1,16 @@
 import * as vscode from 'vscode';
-
-import { ClusterCreateSettings } from './createClusterSettings';
-
 import { getClustersNetworks, getRegistries } from '../k3d/k3d';
-
 import * as config from '../utils/config';
-import { Errorable } from '../utils/errorable';
-import { failed } from '../utils/errorable';
-import * as registry from '../utils/registry';
 import * as docker from '../utils/docker';
+import { Errorable, failed } from '../utils/errorable';
 import { longRunning } from '../utils/host';
-import { shell } from '../utils/shell';
 import { logChannel } from "../utils/log";
+import * as registry from '../utils/registry';
+import { shell } from '../utils/shell';
+import { ClusterCreateSettings } from './createClusterSettings';
+
+
+
 
 const DEFAULT_IMAGE_REGISTRY = "https://registry.hub.docker.com";
 const DEFAULT_IMAGE_REPO = "rancher/k3s";
@@ -239,7 +238,7 @@ export async function getCreateClusterForm(defaults: ClusterCreateSettings): Pro
     const registries = registriesResult.result;
     if (registries.length > 0) {
       res += `<datalist id="registries">`;
-      res += registries.map((s) => `<option value="${s.name}">${s.name}</option>`).join("\n");
+      res += registries.map((s) => `<option value="${s.name}">${s.name} (${s.status})</option>`).join("\n");
       res += `</datalist>`;
 
       datalistParam = `list="registries"`;

diff --git a/src/k3d/k3d.objectmodel.ts b/src/k3d/k3d.objectmodel.ts
@@ -25,4 +25,5 @@ export interface K3dRegistryInfo {
     readonly name: string;
     readonly network: string;
     readonly created: Date;
+    readonly status: string;
 }
diff --git a/src/k3d/k3d.ts b/src/k3d/k3d.ts
@@ -1,15 +1,15 @@
 import { Observable, throwError } from 'rxjs';
-
-import { K3dClusterInfo, K3dRegistryInfo } from "./k3d.objectmodel";
 import { ClusterCreateSettings, createClusterArgsFromSettings } from '../commands/createClusterSettings';
-import { getOrInstallK3D, EnsureMode } from '../installer/installer';
-
+import { EnsureMode, getOrInstallK3D } from '../installer/installer';
+import '../utils/array';
 import { Errorable, failed } from '../utils/errorable';
-import * as shell from '../utils/shell';
+import * as kubectl from '../utils/kubectl';
 import { logChannel } from '../utils/log';
-import '../utils/array';
+import * as shell from '../utils/shell';
 import { minDate } from '../utils/time';
-import * as kubectl from '../utils/kubectl';
+import { K3dClusterInfo, K3dRegistryInfo } from "./k3d.objectmodel";
+
+
 
 
 // invokeK3DCommandObj runs the k3d command with some
@@ -176,7 +176,8 @@ export async function getRegistries(sh: shell.Shell): Promise<Errorable<K3dRegis
                 {
                     name: registry.name,
                     network: registry.Network,
-                    created: new Date(registry.created)
+                    created: new Date(registry.created),
+                    status: registry.State.status
                 }))
             .orderBy((registry: K3dRegistryInfo) => registry.name);
     }