From a76937e08e9cfe2bc9501c3d9632fcdb145ff57c Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Tue, 2 May 2023 10:47:38 -0500 Subject: [PATCH 1/5] feat: Add listing proxies to cli 'coder proxy ls' --- codersdk/workspaceproxy.go | 6 ++-- enterprise/cli/workspaceproxy.go | 47 +++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/codersdk/workspaceproxy.go b/codersdk/workspaceproxy.go index 23a275f53d9b2..8c8e49e63aebc 100644 --- a/codersdk/workspaceproxy.go +++ b/codersdk/workspaceproxy.go @@ -29,7 +29,7 @@ const ( ) type WorkspaceProxyStatus struct { - Status ProxyHealthStatus `json:"status" table:"status"` + Status ProxyHealthStatus `json:"status" table:"status,default_sort"` // Report provides more information about the health of the workspace proxy. Report ProxyHealthReport `json:"report,omitempty" table:"report"` CheckedAt time.Time `json:"checked_at" table:"checked_at" format:"date-time"` @@ -60,11 +60,11 @@ type WorkspaceProxy struct { // Status is the latest status check of the proxy. This will be empty for deleted // proxies. This value can be used to determine if a workspace proxy is healthy // and ready to use. - Status WorkspaceProxyStatus `json:"status,omitempty" table:"status"` + Status WorkspaceProxyStatus `json:"status,omitempty" table:"status,recursive"` } type CreateWorkspaceProxyRequest struct { - Name string `json:"name"` + Name string `json:"name" validate:"required"` DisplayName string `json:"display_name"` Icon string `json:"icon"` } diff --git a/enterprise/cli/workspaceproxy.go b/enterprise/cli/workspaceproxy.go index 959ab3b509dce..ab5cecd1d16fd 100644 --- a/enterprise/cli/workspaceproxy.go +++ b/enterprise/cli/workspaceproxy.go @@ -23,6 +23,7 @@ func (r *RootCmd) workspaceProxy() *clibase.Cmd { r.proxyServer(), r.createProxy(), r.deleteProxy(), + r.listProxies(), }, } @@ -66,7 +67,8 @@ func (r *RootCmd) createProxy() *clibase.Cmd { if !ok { return nil, xerrors.Errorf("unexpected type %T", data) } - return fmt.Sprintf("Workspace Proxy %q registered successfully\nToken: %s", response.Proxy.Name, response.ProxyToken), nil + return fmt.Sprintf("Workspace Proxy %q created successfully. Save this token, it will not be shown again."+ + "\nToken: %s", response.Proxy.Name, response.ProxyToken), nil }), cliui.JSONFormat(), // Table formatter expects a slice, make a slice of one. @@ -91,6 +93,10 @@ func (r *RootCmd) createProxy() *clibase.Cmd { ), Handler: func(inv *clibase.Invocation) error { ctx := inv.Context() + if proxyName == "" { + return xerrors.Errorf("proxy name is required") + } + resp, err := client.CreateWorkspaceProxy(ctx, codersdk.CreateWorkspaceProxyRequest{ Name: proxyName, DisplayName: displayName, @@ -140,3 +146,42 @@ func (r *RootCmd) createProxy() *clibase.Cmd { ) return cmd } + +func (r *RootCmd) listProxies() *clibase.Cmd { + var ( + formatter = cliui.NewOutputFormatter( + cliui.TableFormat([]codersdk.WorkspaceProxy{}, []string{"name", "url", "status status"}), + cliui.JSONFormat(), + cliui.TextFormat(), + ) + ) + + client := new(codersdk.Client) + cmd := &clibase.Cmd{ + Use: "ls", + Aliases: []string{"list"}, + Short: "List all workspace proxies", + Middleware: clibase.Chain( + clibase.RequireNArgs(0), + r.InitClient(client), + ), + Handler: func(inv *clibase.Invocation) error { + ctx := inv.Context() + proxies, err := client.WorkspaceProxies(ctx) + if err != nil { + return xerrors.Errorf("list workspace proxies: %w", err) + } + + output, err := formatter.Format(ctx, proxies) + if err != nil { + return err + } + + _, err = fmt.Fprintln(inv.Stdout, output) + return err + }, + } + + formatter.AttachOptions(&cmd.Options) + return cmd +} From bff451b8d631aed6ee0095071024ea0e619eb82a Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Tue, 2 May 2023 10:50:19 -0500 Subject: [PATCH 2/5] Add unit test --- enterprise/cli/workspaceproxy.go | 24 +++++++++++++++++++++++- enterprise/cli/workspaceproxy_test.go | 15 +++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/enterprise/cli/workspaceproxy.go b/enterprise/cli/workspaceproxy.go index ab5cecd1d16fd..6825ee6957242 100644 --- a/enterprise/cli/workspaceproxy.go +++ b/enterprise/cli/workspaceproxy.go @@ -2,7 +2,9 @@ package cli import ( "fmt" + "strings" + "github.com/fatih/color" "golang.org/x/xerrors" "github.com/coder/coder/cli/clibase" @@ -152,7 +154,27 @@ func (r *RootCmd) listProxies() *clibase.Cmd { formatter = cliui.NewOutputFormatter( cliui.TableFormat([]codersdk.WorkspaceProxy{}, []string{"name", "url", "status status"}), cliui.JSONFormat(), - cliui.TextFormat(), + cliui.ChangeFormatterData(cliui.TextFormat(), func(data any) (any, error) { + resp, ok := data.([]codersdk.WorkspaceProxy) + if !ok { + return nil, xerrors.Errorf("unexpected type %T", data) + } + var str strings.Builder + str.WriteString("Workspace Proxies:\n") + sep := "" + for i, proxy := range resp { + str.WriteString(sep) + str.WriteString(fmt.Sprintf("%d: %s %s %s", i, proxy.Name, proxy.URL, proxy.Status.Status)) + for _, errMsg := range proxy.Status.Report.Errors { + str.WriteString(color.RedString("\n\tErr: %s", errMsg)) + } + for _, warnMsg := range proxy.Status.Report.Errors { + str.WriteString(color.YellowString("\n\tWarn: %s", warnMsg)) + } + sep = "\n" + } + return str.String(), nil + }), ) ) diff --git a/enterprise/cli/workspaceproxy_test.go b/enterprise/cli/workspaceproxy_test.go index 6e486b4c94d3b..31989b047dd54 100644 --- a/enterprise/cli/workspaceproxy_test.go +++ b/enterprise/cli/workspaceproxy_test.go @@ -65,6 +65,21 @@ func Test_ProxyCRUD(t *testing.T) { _, err = uuid.Parse(parts[0]) require.NoError(t, err, "expected token to be a uuid") + // Fetch proxies and check output + inv, conf = newCLI( + t, + "proxy", "ls", + ) + + pty = ptytest.New(t) + inv.Stdout = pty.Output() + clitest.SetupConfig(t, client, conf) + + err = inv.WithContext(ctx).Run() + require.NoError(t, err) + pty.ExpectMatch(expectedName) + + // Also check via the api proxies, err := client.WorkspaceProxies(ctx) require.NoError(t, err, "failed to get workspace proxies") require.Len(t, proxies, 1, "expected 1 proxy") From 7b6c4648d5b5980092fa10e67206cc0c5c8c6e30 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Tue, 2 May 2023 13:20:51 -0500 Subject: [PATCH 3/5] Ignore errors --- enterprise/cli/workspaceproxy.go | 46 +++++++++++++++----------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/enterprise/cli/workspaceproxy.go b/enterprise/cli/workspaceproxy.go index 6825ee6957242..54ecc21928595 100644 --- a/enterprise/cli/workspaceproxy.go +++ b/enterprise/cli/workspaceproxy.go @@ -150,32 +150,30 @@ func (r *RootCmd) createProxy() *clibase.Cmd { } func (r *RootCmd) listProxies() *clibase.Cmd { - var ( - formatter = cliui.NewOutputFormatter( - cliui.TableFormat([]codersdk.WorkspaceProxy{}, []string{"name", "url", "status status"}), - cliui.JSONFormat(), - cliui.ChangeFormatterData(cliui.TextFormat(), func(data any) (any, error) { - resp, ok := data.([]codersdk.WorkspaceProxy) - if !ok { - return nil, xerrors.Errorf("unexpected type %T", data) + formatter := cliui.NewOutputFormatter( + cliui.TableFormat([]codersdk.WorkspaceProxy{}, []string{"name", "url", "status status"}), + cliui.JSONFormat(), + cliui.ChangeFormatterData(cliui.TextFormat(), func(data any) (any, error) { + resp, ok := data.([]codersdk.WorkspaceProxy) + if !ok { + return nil, xerrors.Errorf("unexpected type %T", data) + } + var str strings.Builder + _, _ = str.WriteString("Workspace Proxies:\n") + sep := "" + for i, proxy := range resp { + _, _ = str.WriteString(sep) + _, _ = str.WriteString(fmt.Sprintf("%d: %s %s %s", i, proxy.Name, proxy.URL, proxy.Status.Status)) + for _, errMsg := range proxy.Status.Report.Errors { + _, _ = str.WriteString(color.RedString("\n\tErr: %s", errMsg)) } - var str strings.Builder - str.WriteString("Workspace Proxies:\n") - sep := "" - for i, proxy := range resp { - str.WriteString(sep) - str.WriteString(fmt.Sprintf("%d: %s %s %s", i, proxy.Name, proxy.URL, proxy.Status.Status)) - for _, errMsg := range proxy.Status.Report.Errors { - str.WriteString(color.RedString("\n\tErr: %s", errMsg)) - } - for _, warnMsg := range proxy.Status.Report.Errors { - str.WriteString(color.YellowString("\n\tWarn: %s", warnMsg)) - } - sep = "\n" + for _, warnMsg := range proxy.Status.Report.Errors { + _, _ = str.WriteString(color.YellowString("\n\tWarn: %s", warnMsg)) } - return str.String(), nil - }), - ) + sep = "\n" + } + return str.String(), nil + }), ) client := new(codersdk.Client) From dd3ae6392ea26e48af00df6c39dd73cf08af9787 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Tue, 2 May 2023 13:41:48 -0500 Subject: [PATCH 4/5] Make gen and update golden files --- coderd/apidoc/docs.go | 3 +++ coderd/apidoc/swagger.json | 1 + docs/api/schemas.md | 2 +- helm/tests/testdata/default_values.golden | 12 ++++++------ helm/tests/testdata/labels_annotations.golden | 12 ++++++------ helm/tests/testdata/sa.golden | 12 ++++++------ helm/tests/testdata/tls.golden | 12 ++++++------ 7 files changed, 29 insertions(+), 25 deletions(-) diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go index 91bae7945e422..bb26591f1d669 100644 --- a/coderd/apidoc/docs.go +++ b/coderd/apidoc/docs.go @@ -7002,6 +7002,9 @@ const docTemplate = `{ }, "codersdk.CreateWorkspaceProxyRequest": { "type": "object", + "required": [ + "name" + ], "properties": { "display_name": { "type": "string" diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json index 7e279b3643e56..c52f011a18a87 100644 --- a/coderd/apidoc/swagger.json +++ b/coderd/apidoc/swagger.json @@ -6226,6 +6226,7 @@ }, "codersdk.CreateWorkspaceProxyRequest": { "type": "object", + "required": ["name"], "properties": { "display_name": { "type": "string" diff --git a/docs/api/schemas.md b/docs/api/schemas.md index ee8e52e07a4a4..17e1dfe857efe 100644 --- a/docs/api/schemas.md +++ b/docs/api/schemas.md @@ -1615,7 +1615,7 @@ CreateParameterRequest is a structure used to create a new parameter value for a | -------------- | ------ | -------- | ------------ | ----------- | | `display_name` | string | false | | | | `icon` | string | false | | | -| `name` | string | false | | | +| `name` | string | true | | | ## codersdk.CreateWorkspaceRequest diff --git a/helm/tests/testdata/default_values.golden b/helm/tests/testdata/default_values.golden index e9f92678d4809..7fec27d8bd17a 100644 --- a/helm/tests/testdata/default_values.golden +++ b/helm/tests/testdata/default_values.golden @@ -9,7 +9,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -48,7 +48,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -65,7 +65,7 @@ spec: externalTrafficPolicy: "Cluster" selector: app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME --- # Source: coder/templates/coder.yaml apiVersion: apps/v1 @@ -75,7 +75,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -86,13 +86,13 @@ spec: selector: matchLabels: app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME template: metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm diff --git a/helm/tests/testdata/labels_annotations.golden b/helm/tests/testdata/labels_annotations.golden index f980dddf84b44..131ee5965eeda 100644 --- a/helm/tests/testdata/labels_annotations.golden +++ b/helm/tests/testdata/labels_annotations.golden @@ -9,7 +9,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -48,7 +48,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -65,7 +65,7 @@ spec: externalTrafficPolicy: "Cluster" selector: app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME --- # Source: coder/templates/coder.yaml apiVersion: apps/v1 @@ -75,7 +75,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -89,13 +89,13 @@ spec: selector: matchLabels: app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME template: metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm diff --git a/helm/tests/testdata/sa.golden b/helm/tests/testdata/sa.golden index a6531600df4c7..bff9a1d4ca70e 100644 --- a/helm/tests/testdata/sa.golden +++ b/helm/tests/testdata/sa.golden @@ -9,7 +9,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -48,7 +48,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -65,7 +65,7 @@ spec: externalTrafficPolicy: "Cluster" selector: app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME --- # Source: coder/templates/coder.yaml apiVersion: apps/v1 @@ -75,7 +75,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -86,13 +86,13 @@ spec: selector: matchLabels: app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME template: metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm diff --git a/helm/tests/testdata/tls.golden b/helm/tests/testdata/tls.golden index 81a5e68f06436..7e649644112eb 100644 --- a/helm/tests/testdata/tls.golden +++ b/helm/tests/testdata/tls.golden @@ -9,7 +9,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -48,7 +48,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -69,7 +69,7 @@ spec: externalTrafficPolicy: "Cluster" selector: app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME --- # Source: coder/templates/coder.yaml apiVersion: apps/v1 @@ -79,7 +79,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -90,13 +90,13 @@ spec: selector: matchLabels: app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME template: metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm From 51b50fc1a345243b206245c3d405c285b0e8eacb Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 3 May 2023 14:44:07 +0000 Subject: [PATCH 5/5] Update golden files --- helm/tests/testdata/default_values.golden | 12 ++++++------ helm/tests/testdata/labels_annotations.golden | 12 ++++++------ helm/tests/testdata/sa.golden | 12 ++++++------ helm/tests/testdata/tls.golden | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/helm/tests/testdata/default_values.golden b/helm/tests/testdata/default_values.golden index 7fec27d8bd17a..e9f92678d4809 100644 --- a/helm/tests/testdata/default_values.golden +++ b/helm/tests/testdata/default_values.golden @@ -9,7 +9,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -48,7 +48,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -65,7 +65,7 @@ spec: externalTrafficPolicy: "Cluster" selector: app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name --- # Source: coder/templates/coder.yaml apiVersion: apps/v1 @@ -75,7 +75,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -86,13 +86,13 @@ spec: selector: matchLabels: app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name template: metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm diff --git a/helm/tests/testdata/labels_annotations.golden b/helm/tests/testdata/labels_annotations.golden index 131ee5965eeda..f980dddf84b44 100644 --- a/helm/tests/testdata/labels_annotations.golden +++ b/helm/tests/testdata/labels_annotations.golden @@ -9,7 +9,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -48,7 +48,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -65,7 +65,7 @@ spec: externalTrafficPolicy: "Cluster" selector: app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name --- # Source: coder/templates/coder.yaml apiVersion: apps/v1 @@ -75,7 +75,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -89,13 +89,13 @@ spec: selector: matchLabels: app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name template: metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm diff --git a/helm/tests/testdata/sa.golden b/helm/tests/testdata/sa.golden index bff9a1d4ca70e..a6531600df4c7 100644 --- a/helm/tests/testdata/sa.golden +++ b/helm/tests/testdata/sa.golden @@ -9,7 +9,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -48,7 +48,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -65,7 +65,7 @@ spec: externalTrafficPolicy: "Cluster" selector: app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name --- # Source: coder/templates/coder.yaml apiVersion: apps/v1 @@ -75,7 +75,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -86,13 +86,13 @@ spec: selector: matchLabels: app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name template: metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm diff --git a/helm/tests/testdata/tls.golden b/helm/tests/testdata/tls.golden index 7e649644112eb..81a5e68f06436 100644 --- a/helm/tests/testdata/tls.golden +++ b/helm/tests/testdata/tls.golden @@ -9,7 +9,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -48,7 +48,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -69,7 +69,7 @@ spec: externalTrafficPolicy: "Cluster" selector: app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name --- # Source: coder/templates/coder.yaml apiVersion: apps/v1 @@ -79,7 +79,7 @@ metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm @@ -90,13 +90,13 @@ spec: selector: matchLabels: app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name template: metadata: labels: helm.sh/chart: coder-0.1.0 app.kubernetes.io/name: coder - app.kubernetes.io/instance: RELEASE-NAME + app.kubernetes.io/instance: release-name app.kubernetes.io/part-of: coder app.kubernetes.io/version: "0.1.0" app.kubernetes.io/managed-by: Helm