more kubernetes context

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker · Dec 10, 2021 · 02c94c2 · 02c94c2
1 parent a0f4c18
commit 02c94c2
Show file tree

Hide file tree

Showing 19 changed files with 39 additions and 313 deletions.
diff --git a/cli/command/context/create.go b/cli/command/context/create.go
@@ -32,13 +32,6 @@ func longCreateDescription() string {
 		fmt.Fprintf(tw, "%s\t%s\n", d.name, d.description)
 	}
 	tw.Flush()
-	buf.WriteString("\nKubernetes endpoint config:\n\n")
-	tw = tabwriter.NewWriter(buf, 20, 1, 3, ' ', 0)
-	fmt.Fprintln(tw, "NAME\tDESCRIPTION")
-	for _, d := range kubernetesConfigKeysDescriptions {
-		fmt.Fprintf(tw, "%s\t%s\n", d.name, d.description)
-	}
-	tw.Flush()
 	buf.WriteString("\nExample:\n\n$ docker context create my-context --description \"some description\" --docker \"host=tcp://myserver:2376,ca=~/ca-file,cert=~/cert-file,key=~/key-file\"\n")
 	return buf.String()
 }

diff --git a/cli/command/context/create_test.go b/cli/command/context/create_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/config/configfile"
 	"github.com/docker/cli/cli/context/docker"
-	"github.com/docker/cli/cli/context/kubernetes"
 	"github.com/docker/cli/cli/context/store"
 	"github.com/docker/cli/internal/test"
 	"gotest.tools/v3/assert"
@@ -22,7 +21,6 @@ func makeFakeCli(t *testing.T, opts ...func(*test.FakeCli)) (*test.FakeCli, func
 	storeConfig := store.NewConfig(
 		func() interface{} { return &command.DockerContext{} },
 		store.EndpointTypeGetter(docker.DockerEndpoint, func() interface{} { return &docker.EndpointMeta{} }),
-		store.EndpointTypeGetter(kubernetes.KubernetesEndpoint, func() interface{} { return &kubernetes.EndpointMeta{} }),
 	)
 	store := &command.ContextStoreWithDefault{
 		Store: store.New(dir, storeConfig),
@@ -106,14 +104,6 @@ func TestCreateInvalids(t *testing.T) {
 			},
 			expecterErr: `specified orchestrator "invalid" is invalid, please use either kubernetes, swarm or all`,
 		},
-		{
-			options: CreateOptions{
-				Name:                     "orchestrator-kubernetes-no-endpoint",
-				DefaultStackOrchestrator: "kubernetes",
-				Docker:                   map[string]string{},
-			},
-			expecterErr: `cannot specify orchestrator "kubernetes" without configuring a Kubernetes endpoint`,
-		},
 		{
 			options: CreateOptions{
 				Name:                     "orchestrator-all-no-endpoint",
@@ -162,43 +152,6 @@ func TestCreateOrchestratorEmpty(t *testing.T) {
 	assertContextCreateLogging(t, cli, "test")
 }
 
-func validateTestKubeEndpoint(t *testing.T, s store.Reader, name string) {
-	t.Helper()
-	ctxMetadata, err := s.GetMetadata(name)
-	assert.NilError(t, err)
-	kubeMeta := ctxMetadata.Endpoints[kubernetes.KubernetesEndpoint].(kubernetes.EndpointMeta)
-	kubeEP, err := kubeMeta.WithTLSData(s, name)
-	assert.NilError(t, err)
-	assert.Equal(t, "https://someserver.example.com", kubeEP.Host)
-	assert.Equal(t, "the-ca", string(kubeEP.TLSData.CA))
-	assert.Equal(t, "the-cert", string(kubeEP.TLSData.Cert))
-	assert.Equal(t, "the-key", string(kubeEP.TLSData.Key))
-}
-
-func createTestContextWithKube(t *testing.T, cli command.Cli) {
-	t.Helper()
-	revert := env.Patch(t, "KUBECONFIG", "./testdata/test-kubeconfig")
-	defer revert()
-
-	err := RunCreate(cli, &CreateOptions{
-		Name:                     "test",
-		DefaultStackOrchestrator: "all",
-		Kubernetes: map[string]string{
-			keyFrom: "default",
-		},
-		Docker: map[string]string{},
-	})
-	assert.NilError(t, err)
-}
-
-func TestCreateOrchestratorAllKubernetesEndpointFromCurrent(t *testing.T) {
-	cli, cleanup := makeFakeCli(t)
-	defer cleanup()
-	createTestContextWithKube(t, cli)
-	assertContextCreateLogging(t, cli, "test")
-	validateTestKubeEndpoint(t, cli.ContextStore(), "test")
-}
-
 func TestCreateFromContext(t *testing.T) {
 	cases := []struct {
 		name                 string
@@ -282,12 +235,9 @@ func TestCreateFromContext(t *testing.T) {
 			assert.NilError(t, err)
 			dockerEndpoint, err := docker.EndpointFromContext(newContext)
 			assert.NilError(t, err)
-			kubeEndpoint := kubernetes.EndpointFromContext(newContext)
-			assert.Check(t, kubeEndpoint != nil)
 			assert.Equal(t, newContextTyped.Description, c.expectedDescription)
 			assert.Equal(t, newContextTyped.StackOrchestrator, c.expectedOrchestrator)
 			assert.Equal(t, dockerEndpoint.Host, "tcp://42.42.42.42:2375")
-			assert.Equal(t, kubeEndpoint.Host, "https://someserver.example.com")
 		})
 	}
 }
@@ -311,12 +261,6 @@ func TestCreateFromCurrent(t *testing.T) {
 			expectedDescription:  "new description",
 			expectedOrchestrator: command.OrchestratorSwarm,
 		},
-		{
-			name:                 "override-orchestrator",
-			orchestrator:         "kubernetes",
-			expectedDescription:  "original description",
-			expectedOrchestrator: command.OrchestratorKubernetes,
-		},
 	}
 
 	cli, cleanup := makeFakeCli(t)
@@ -356,12 +300,9 @@ func TestCreateFromCurrent(t *testing.T) {
 			assert.NilError(t, err)
 			dockerEndpoint, err := docker.EndpointFromContext(newContext)
 			assert.NilError(t, err)
-			kubeEndpoint := kubernetes.EndpointFromContext(newContext)
-			assert.Check(t, kubeEndpoint != nil)
 			assert.Equal(t, newContextTyped.Description, c.expectedDescription)
 			assert.Equal(t, newContextTyped.StackOrchestrator, c.expectedOrchestrator)
 			assert.Equal(t, dockerEndpoint.Host, "tcp://42.42.42.42:2375")
-			assert.Equal(t, kubeEndpoint.Host, "https://someserver.example.com")
 		})
 	}
 }
diff --git a/cli/command/context/export-import_test.go b/cli/command/context/export-import_test.go
@@ -19,7 +19,6 @@ func TestExportImportWithFile(t *testing.T) {
 	contextFile := filepath.Join(contextDir, "exported")
 	cli, cleanup := makeFakeCli(t)
 	defer cleanup()
-	createTestContextWithKube(t, cli)
 	cli.ErrBuffer().Reset()
 	assert.NilError(t, RunExport(cli, &ExportOptions{
 		ContextName: "test",
@@ -45,7 +44,6 @@ func TestExportImportWithFile(t *testing.T) {
 func TestExportImportPipe(t *testing.T) {
 	cli, cleanup := makeFakeCli(t)
 	defer cleanup()
-	createTestContextWithKube(t, cli)
 	cli.ErrBuffer().Reset()
 	cli.OutBuffer().Reset()
 	assert.NilError(t, RunExport(cli, &ExportOptions{
@@ -70,39 +68,13 @@ func TestExportImportPipe(t *testing.T) {
 	assert.Equal(t, "Successfully imported context \"test2\"\n", cli.ErrBuffer().String())
 }
 
-func TestExportKubeconfig(t *testing.T) {
-	contextDir, err := ioutil.TempDir("", t.Name()+"context")
-	assert.NilError(t, err)
-	defer os.RemoveAll(contextDir)
-	contextFile := filepath.Join(contextDir, "exported")
-	cli, cleanup := makeFakeCli(t)
-	defer cleanup()
-	createTestContextWithKube(t, cli)
-	cli.ErrBuffer().Reset()
-	assert.NilError(t, RunExport(cli, &ExportOptions{
-		ContextName: "test",
-		Dest:        contextFile,
-		Kubeconfig:  true,
-	}))
-	assert.Equal(t, cli.ErrBuffer().String(), fmt.Sprintf("Written file %q\n", contextFile))
-	assert.NilError(t, RunCreate(cli, &CreateOptions{
-		Name: "test2",
-		Kubernetes: map[string]string{
-			keyKubeconfig: contextFile,
-		},
-		Docker: map[string]string{},
-	}))
-	validateTestKubeEndpoint(t, cli.ContextStore(), "test2")
-}
-
 func TestExportExistingFile(t *testing.T) {
 	contextDir, err := ioutil.TempDir("", t.Name()+"context")
 	assert.NilError(t, err)
 	defer os.RemoveAll(contextDir)
 	contextFile := filepath.Join(contextDir, "exported")
 	cli, cleanup := makeFakeCli(t)
 	defer cleanup()
-	createTestContextWithKube(t, cli)
 	cli.ErrBuffer().Reset()
 	assert.NilError(t, ioutil.WriteFile(contextFile, []byte{}, 0644))
 	err = RunExport(cli, &ExportOptions{ContextName: "test", Dest: contextFile})

diff --git a/cli/command/context/options.go b/cli/command/context/options.go
@@ -20,9 +20,6 @@ const (
 	keyCert          = "cert"
 	keyKey           = "key"
 	keySkipTLSVerify = "skip-tls-verify"
-	keyKubeconfig    = "config-file"
-	keyKubecontext   = "context-override"
-	keyKubenamespace = "namespace-override"
 )
 
 type configKeyDescription struct {
@@ -39,12 +36,6 @@ var (
 		keyKey:           {},
 		keySkipTLSVerify: {},
 	}
-	allowedKubernetesConfigKeys = map[string]struct{}{
-		keyFrom:          {},
-		keyKubeconfig:    {},
-		keyKubecontext:   {},
-		keyKubenamespace: {},
-	}
 	dockerConfigKeysDescriptions = []configKeyDescription{
 		{
 			name:        keyFrom,
@@ -71,24 +62,6 @@ var (
 			description: "Skip TLS certificate validation",
 		},
 	}
-	kubernetesConfigKeysDescriptions = []configKeyDescription{
-		{
-			name:        keyFrom,
-			description: "Copy named context's Kubernetes endpoint configuration",
-		},
-		{
-			name:        keyKubeconfig,
-			description: "Path to a Kubernetes config file",
-		},
-		{
-			name:        keyKubecontext,
-			description: "Overrides the context set in the kubernetes config file",
-		},
-		{
-			name:        keyKubenamespace,
-			description: "Overrides the namespace set in the kubernetes config file",
-		},
-	}
 )
 
 func parseBool(config map[string]string, name string) (bool, error) {

diff --git a/cli/command/context/testdata/inspect.golden b/cli/command/context/testdata/inspect.golden
@@ -9,20 +9,9 @@
             "docker": {
                 "Host": "https://someswarmserver.example.com",
                 "SkipTLSVerify": false
-            },
-            "kubernetes": {
-                "Host": "https://someserver.example.com",
-                "SkipTLSVerify": false,
-                "DefaultNamespace": "default"
             }
         },
-        "TLSMaterial": {
-            "kubernetes": [
-                "ca.pem",
-                "cert.pem",
-                "key.pem"
-            ]
-        },
+        "TLSMaterial": {},
         "Storage": {
             "MetadataPath": "<METADATA_PATH>",
             "TLSPath": "<TLS_PATH>"

diff --git a/cli/command/context/testdata/list.golden b/cli/command/context/testdata/list.golden
@@ -1,5 +1,5 @@
-NAME        DESCRIPTION                               DOCKER ENDPOINT                       KUBERNETES ENDPOINT                        ORCHESTRATOR
-current *   description of current                    https://someswarmserver.example.com   https://someserver.example.com (default)   all
-default     Current DOCKER_HOST based configuration   unix:///var/run/docker.sock                                                      swarm
-other       description of other                      https://someswarmserver.example.com   https://someserver.example.com (default)   all
-unset       description of unset                      https://someswarmserver.example.com   https://someserver.example.com (default)   
+NAME        DESCRIPTION                               DOCKER ENDPOINT                       ORCHESTRATOR
+current *   description of current                    https://someswarmserver.example.com   all
+default     Current DOCKER_HOST based configuration   unix:///var/run/docker.sock           swarm
+other       description of other                      https://someswarmserver.example.com   all
+unset       description of unset                      https://someswarmserver.example.com   
diff --git a/cli/command/context/update.go b/cli/command/context/update.go
@@ -31,13 +31,6 @@ func longUpdateDescription() string {
 		fmt.Fprintf(tw, "%s\t%s\n", d.name, d.description)
 	}
 	tw.Flush()
-	buf.WriteString("\nKubernetes endpoint config:\n\n")
-	tw = tabwriter.NewWriter(buf, 20, 1, 3, ' ', 0)
-	fmt.Fprintln(tw, "NAME\tDESCRIPTION")
-	for _, d := range kubernetesConfigKeysDescriptions {
-		fmt.Fprintf(tw, "%s\t%s\n", d.name, d.description)
-	}
-	tw.Flush()
 	buf.WriteString("\nExample:\n\n$ docker context update my-context --description \"some description\" --docker \"host=tcp://myserver:2376,ca=~/ca-file,cert=~/cert-file,key=~/key-file\"\n")
 	return buf.String()
 }

diff --git a/cli/command/context/update_test.go b/cli/command/context/update_test.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/context/docker"
-	"github.com/docker/cli/cli/context/kubernetes"
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/assert/cmp"
 )
@@ -52,38 +51,10 @@ func TestUpdateDockerOnly(t *testing.T) {
 	assert.NilError(t, err)
 	assert.Equal(t, dc.StackOrchestrator, command.OrchestratorSwarm)
 	assert.Equal(t, dc.Description, "description of test")
-	assert.Check(t, cmp.Contains(c.Endpoints, kubernetes.KubernetesEndpoint))
 	assert.Check(t, cmp.Contains(c.Endpoints, docker.DockerEndpoint))
 	assert.Equal(t, c.Endpoints[docker.DockerEndpoint].(docker.EndpointMeta).Host, "tcp://some-host")
 }
 
-func TestUpdateStackOrchestratorStrategy(t *testing.T) {
-	cli, cleanup := makeFakeCli(t)
-	defer cleanup()
-	err := RunCreate(cli, &CreateOptions{
-		Name:                     "test",
-		DefaultStackOrchestrator: "swarm",
-		Docker:                   map[string]string{},
-	})
-	assert.NilError(t, err)
-	err = RunUpdate(cli, &UpdateOptions{
-		Name:                     "test",
-		DefaultStackOrchestrator: "kubernetes",
-	})
-	assert.ErrorContains(t, err, `cannot specify orchestrator "kubernetes" without configuring a Kubernetes endpoint`)
-}
-
-func TestUpdateStackOrchestratorStrategyRemoveKubeEndpoint(t *testing.T) {
-	cli, cleanup := makeFakeCli(t)
-	defer cleanup()
-	createTestContextWithKubeAndSwarm(t, cli, "test", "kubernetes")
-	err := RunUpdate(cli, &UpdateOptions{
-		Name:       "test",
-		Kubernetes: map[string]string{},
-	})
-	assert.ErrorContains(t, err, `cannot specify orchestrator "kubernetes" without configuring a Kubernetes endpoint`)
-}
-
 func TestUpdateInvalidDockerHost(t *testing.T) {
 	cli, cleanup := makeFakeCli(t)
 	defer cleanup()

diff --git a/cli/command/formatter/context.go b/cli/command/formatter/context.go
@@ -2,10 +2,9 @@ package formatter
 
 const (
 	// ClientContextTableFormat is the default client context format
-	ClientContextTableFormat = "table {{.Name}}{{if .Current}} *{{end}}\t{{.Description}}\t{{.DockerEndpoint}}\t{{.KubernetesEndpoint}}\t{{.StackOrchestrator}}"
+	ClientContextTableFormat = "table {{.Name}}{{if .Current}} *{{end}}\t{{.Description}}\t{{.DockerEndpoint}}\t{{.StackOrchestrator}}"
 
 	dockerEndpointHeader     = "DOCKER ENDPOINT"
-	kubernetesEndpointHeader = "KUBERNETES ENDPOINT"
 	stackOrchestrastorHeader = "ORCHESTRATOR"
 	quietContextFormat       = "{{.Name}}"
 )
@@ -23,12 +22,11 @@ func NewClientContextFormat(source string, quiet bool) Format {
 
 // ClientContext is a context for display
 type ClientContext struct {
-	Name               string
-	Description        string
-	DockerEndpoint     string
-	KubernetesEndpoint string
-	StackOrchestrator  string
-	Current            bool
+	Name              string
+	Description       string
+	DockerEndpoint    string
+	StackOrchestrator string
+	Current           bool
 }
 
 // ClientContextWrite writes formatted contexts using the Context
@@ -52,11 +50,10 @@ type clientContextContext struct {
 func newClientContextContext() *clientContextContext {
 	ctx := clientContextContext{}
 	ctx.Header = SubHeaderContext{
-		"Name":               NameHeader,
-		"Description":        DescriptionHeader,
-		"DockerEndpoint":     dockerEndpointHeader,
-		"KubernetesEndpoint": kubernetesEndpointHeader,
-		"StackOrchestrator":  stackOrchestrastorHeader,
+		"Name":              NameHeader,
+		"Description":       DescriptionHeader,
+		"DockerEndpoint":    dockerEndpointHeader,
+		"StackOrchestrator": stackOrchestrastorHeader,
 	}
 	return &ctx
 }
@@ -82,7 +79,7 @@ func (c *clientContextContext) DockerEndpoint() string {
 }
 
 func (c *clientContextContext) KubernetesEndpoint() string {
-	return c.c.KubernetesEndpoint
+	return ""
 }
 
 func (c *clientContextContext) StackOrchestrator() string {

diff --git a/cli/command/orchestrator.go b/cli/command/orchestrator.go
@@ -24,6 +24,7 @@ const (
 )
 
 // HasKubernetes returns true if defined orchestrator has Kubernetes capabilities.
+// Deprecated: support for kubernetes as orchestrator was removed.
 func (o Orchestrator) HasKubernetes() bool {
 	return o == OrchestratorKubernetes || o == OrchestratorAll
 }