[WIP] Drop support for (archived) Compose-on-Kubernetes

.golangci.yml

@@ -28,9 +28,6 @@ linters:
 
 run:
  timeout: 5m
- skip-dirs:
- - cli/command/stack/kubernetes/api/openapi
- - cli/command/stack/kubernetes/api/client
  skip-files:
  - cli/compose/schema/bindata.go
  - .*generated.*

cli/command/context/create.go

@@ -8,7 +8,6 @@ import (
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/context/docker"
-	"github.com/docker/cli/cli/context/kubernetes"
 	"github.com/docker/cli/cli/context/store"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -33,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()
 }
@@ -112,21 +104,6 @@ func createNewContext(o *CreateOptions, stackOrchestrator command.Orchestrator,
 	if dockerTLS != nil {
  contextTLSData.Endpoints[docker.DockerEndpoint] = *dockerTLS
 	}
-	if o.Kubernetes != nil {
- kubernetesEP, kubernetesTLS, err := getKubernetesEndpointMetadataAndTLS(cli, o.Kubernetes)
- if err != nil {
- return errors.Wrap(err, "unable to create kubernetes endpoint config")
- }
- if kubernetesEP == nil && stackOrchestrator.HasKubernetes() {
- return errors.Errorf("cannot specify orchestrator %q without configuring a Kubernetes endpoint", stackOrchestrator)
- }
- if kubernetesEP != nil {
- contextMetadata.Endpoints[kubernetes.KubernetesEndpoint] = kubernetesEP
- }
- if kubernetesTLS != nil {
- contextTLSData.Endpoints[kubernetes.KubernetesEndpoint] = *kubernetesTLS
- }
-	}
 	if err := validateEndpointsAndOrchestrator(contextMetadata); err != nil {
  return err
 	}

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")
  })
 	}
 }

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})

cli/command/context/export.go

@@ -1,18 +1,15 @@
 package context
 
 import (
-	"bytes"
 	"errors"
 	"fmt"
 	"io"
 	"os"
 
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/cli/cli/context/kubernetes"
 	"github.com/docker/cli/cli/context/store"
 	"github.com/spf13/cobra"
-	"k8s.io/client-go/tools/clientcmd"
 )
 
 // ExportOptions are the options used for exporting a context
@@ -82,31 +79,7 @@ func RunExport(dockerCli command.Cli, opts *ExportOptions) error {
 	if err := store.ValidateContextName(opts.ContextName); err != nil && opts.ContextName != command.DefaultContextName {
  return err
 	}
-	ctxMeta, err := dockerCli.ContextStore().GetMetadata(opts.ContextName)
-	if err != nil {
- return err
-	}
-	if !opts.Kubeconfig {
- reader := store.Export(opts.ContextName, dockerCli.ContextStore())
- defer reader.Close()
- return writeTo(dockerCli, reader, opts.Dest)
-	}
-	kubernetesEndpointMeta := kubernetes.EndpointFromContext(ctxMeta)
-	if kubernetesEndpointMeta == nil {
- return fmt.Errorf("context %q has no kubernetes endpoint", opts.ContextName)
-	}
-	kubernetesEndpoint, err := kubernetesEndpointMeta.WithTLSData(dockerCli.ContextStore(), opts.ContextName)
-	if err != nil {
- return err
-	}
-	kubeConfig := kubernetesEndpoint.KubernetesConfig()
-	rawCfg, err := kubeConfig.RawConfig()
-	if err != nil {
- return err
-	}
-	data, err := clientcmd.Write(rawCfg)
-	if err != nil {
- return err
-	}
-	return writeTo(dockerCli, bytes.NewBuffer(data), opts.Dest)
+	reader := store.Export(opts.ContextName, dockerCli.ContextStore())
+	defer reader.Close()
+	return writeTo(dockerCli, reader, opts.Dest)
 }

cli/command/context/list.go

@@ -9,7 +9,6 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/cli/cli/context/docker"
-	kubecontext "github.com/docker/cli/cli/context/kubernetes"
 	"github.com/fvbommel/sortorder"
 	"github.com/spf13/cobra"
 )
@@ -56,21 +55,15 @@ func runList(dockerCli command.Cli, opts *listOptions) error {
  if err != nil {
  return err
  }
- kubernetesEndpoint := kubecontext.EndpointFromContext(rawMeta)
- kubEndpointText := ""
- if kubernetesEndpoint != nil {
- kubEndpointText = fmt.Sprintf("%s (%s)", kubernetesEndpoint.Host, kubernetesEndpoint.DefaultNamespace)
- }
  if rawMeta.Name == command.DefaultContextName {
  meta.Description = "Current DOCKER_HOST based configuration"
  }
  desc := formatter.ClientContext{
- Name: rawMeta.Name,
- Current: rawMeta.Name == curContext,
- Description: meta.Description,
- StackOrchestrator: string(meta.StackOrchestrator),
- DockerEndpoint: dockerEndpoint.Host,
- KubernetesEndpoint: kubEndpointText,
+ Name: rawMeta.Name,
+ Current: rawMeta.Name == curContext,
+ Description: meta.Description,
+ StackOrchestrator: string(meta.StackOrchestrator),
+ DockerEndpoint: dockerEndpoint.Host,
  }
  contexts = append(contexts, &desc)
 	}