remove "kubernetes" from docker context

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

Hide file tree

Showing 1,031 changed files with 13 additions and 383,253 deletions.
diff --git a/cli/command/context/create.go b/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"
@@ -112,21 +111,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
 	}

diff --git a/cli/command/context/export.go b/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)
 }
diff --git a/cli/command/context/list.go b/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)
 	}

diff --git a/cli/command/context/options.go b/cli/command/context/options.go
@@ -2,18 +2,14 @@ package context
 
 import (
 	"fmt"
-	"os"
-	"path/filepath"
 	"strconv"
 	"strings"
 
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/context"
 	"github.com/docker/cli/cli/context/docker"
-	"github.com/docker/cli/cli/context/kubernetes"
 	"github.com/docker/cli/cli/context/store"
 	"github.com/docker/docker/client"
-	"github.com/docker/docker/pkg/homedir"
 	"github.com/pkg/errors"
 )
 
@@ -164,56 +160,3 @@ func getDockerEndpointMetadataAndTLS(dockerCli command.Cli, config map[string]st
 	}
 	return ep.EndpointMeta, ep.TLSData.ToStoreTLSData(), nil
 }
-
-func getKubernetesEndpoint(dockerCli command.Cli, config map[string]string) (*kubernetes.Endpoint, error) {
-	if err := validateConfig(config, allowedKubernetesConfigKeys); err != nil {
-		return nil, err
-	}
-	if len(config) == 0 {
-		return nil, nil
-	}
-	if contextName, ok := config[keyFrom]; ok {
-		ctxMeta, err := dockerCli.ContextStore().GetMetadata(contextName)
-		if err != nil {
-			return nil, err
-		}
-		endpointMeta := kubernetes.EndpointFromContext(ctxMeta)
-		if endpointMeta != nil {
-			res, err := endpointMeta.WithTLSData(dockerCli.ContextStore(), dockerCli.CurrentContext())
-			if err != nil {
-				return nil, err
-			}
-			return &res, nil
-		}
-
-		// fallback to env-based kubeconfig
-		kubeconfig := os.Getenv("KUBECONFIG")
-		if kubeconfig == "" {
-			kubeconfig = filepath.Join(homedir.Get(), ".kube/config")
-		}
-		ep, err := kubernetes.FromKubeConfig(kubeconfig, "", "")
-		if err != nil {
-			return nil, err
-		}
-		return &ep, nil
-	}
-	if config[keyKubeconfig] != "" {
-		ep, err := kubernetes.FromKubeConfig(config[keyKubeconfig], config[keyKubecontext], config[keyKubenamespace])
-		if err != nil {
-			return nil, err
-		}
-		return &ep, nil
-	}
-	return nil, nil
-}
-
-func getKubernetesEndpointMetadataAndTLS(dockerCli command.Cli, config map[string]string) (*kubernetes.EndpointMeta, *store.EndpointTLSData, error) {
-	ep, err := getKubernetesEndpoint(dockerCli, config)
-	if err != nil {
-		return nil, nil, err
-	}
-	if ep == nil {
-		return nil, nil, err
-	}
-	return &ep.EndpointMeta, ep.TLSData.ToStoreTLSData(), nil
-}
diff --git a/cli/command/context/update.go b/cli/command/context/update.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"
@@ -106,18 +105,6 @@ func RunUpdate(cli command.Cli, o *UpdateOptions) error {
 		c.Endpoints[docker.DockerEndpoint] = dockerEP
 		tlsDataToReset[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 {
-			delete(c.Endpoints, kubernetes.KubernetesEndpoint)
-		} else {
-			c.Endpoints[kubernetes.KubernetesEndpoint] = kubernetesEP
-			tlsDataToReset[kubernetes.KubernetesEndpoint] = kubernetesTLS
-		}
-	}
 	if err := validateEndpointsAndOrchestrator(c); err != nil {
 		return err
 	}
@@ -136,12 +123,6 @@ func RunUpdate(cli command.Cli, o *UpdateOptions) error {
 }
 
 func validateEndpointsAndOrchestrator(c store.Metadata) error {
-	dockerContext, err := command.GetDockerContext(c)
-	if err != nil {
-		return err
-	}
-	if _, ok := c.Endpoints[kubernetes.KubernetesEndpoint]; !ok && dockerContext.StackOrchestrator.HasKubernetes() {
-		return errors.Errorf("cannot specify orchestrator %q without configuring a Kubernetes endpoint", dockerContext.StackOrchestrator)
-	}
-	return nil
+	_, err := command.GetDockerContext(c)
+	return err
 }
diff --git a/cli/command/system/version.go b/cli/command/system/version.go
@@ -11,18 +11,12 @@ import (
 
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	kubecontext "github.com/docker/cli/cli/context/kubernetes"
 	"github.com/docker/cli/cli/version"
-	"github.com/docker/cli/kubernetes"
 	"github.com/docker/cli/templates"
-	kubeapi "github.com/docker/compose-on-kubernetes/api"
 	"github.com/docker/docker/api/types"
 	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/tonistiigi/go-rosetta"
-	kubernetesClient "k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/tools/clientcmd"
 )
 
 var versionTemplate = `{{with .Client -}}
@@ -146,6 +140,9 @@ func runVersion(dockerCli command.Cli, opts *versionOptions) error {
 	if err != nil {
 		return cli.StatusError{StatusCode: 64, Status: err.Error()}
 	}
+	if orchestrator.HasKubernetes() {
+		// TODO print error if kubernetes is used?
+	}
 
 	vd := versionInfo{
 		Client: clientVersion{
@@ -166,12 +163,7 @@ func runVersion(dockerCli command.Cli, opts *versionOptions) error {
 	sv, err := dockerCli.Client().ServerVersion(context.Background())
 	if err == nil {
 		vd.Server = &sv
-		var kubeVersion *kubernetesVersion
-		if orchestrator.HasKubernetes() {
-			kubeVersion = getKubernetesVersion(dockerCli, opts.kubeConfig)
-		}
 		foundEngine := false
-		foundKubernetes := false
 		for _, component := range sv.Components {
 			switch component.Name {
 			case "Engine":
@@ -180,11 +172,6 @@ func runVersion(dockerCli command.Cli, opts *versionOptions) error {
 				if ok {
 					component.Details["BuildTime"] = reformatDate(buildTime)
 				}
-			case "Kubernetes":
-				foundKubernetes = true
-				if _, ok := component.Details["StackAPI"]; !ok && kubeVersion != nil {
-					component.Details["StackAPI"] = kubeVersion.StackAPI
-				}
 			}
 		}
 
@@ -204,15 +191,6 @@ func runVersion(dockerCli command.Cli, opts *versionOptions) error {
 				},
 			})
 		}
-		if !foundKubernetes && kubeVersion != nil {
-			vd.Server.Components = append(vd.Server.Components, types.ComponentVersion{
-				Name:    "Kubernetes",
-				Version: kubeVersion.Kubernetes,
-				Details: map[string]string{
-					"StackAPI": kubeVersion.StackAPI,
-				},
-			})
-		}
 	}
 	if err2 := prettyPrintVersion(dockerCli, vd, tmpl); err2 != nil && err == nil {
 		err = err2
@@ -246,54 +224,3 @@ func getDetailsOrder(v types.ComponentVersion) []string {
 	sort.Strings(out)
 	return out
 }
-
-func getKubernetesVersion(dockerCli command.Cli, kubeConfig string) *kubernetesVersion {
-	version := kubernetesVersion{
-		Kubernetes: "Unknown",
-		StackAPI:   "Unknown",
-	}
-	var (
-		clientConfig clientcmd.ClientConfig
-		err          error
-	)
-	if dockerCli.CurrentContext() == "" {
-		clientConfig = kubeapi.NewKubernetesConfig(kubeConfig)
-	} else {
-		clientConfig, err = kubecontext.ConfigFromContext(dockerCli.CurrentContext(), dockerCli.ContextStore())
-	}
-	if err != nil {
-		logrus.Debugf("failed to get Kubernetes configuration: %s", err)
-		return &version
-	}
-	config, err := clientConfig.ClientConfig()
-	if err != nil {
-		logrus.Debugf("failed to get Kubernetes client config: %s", err)
-		return &version
-	}
-	kubeClient, err := kubernetesClient.NewForConfig(config)
-	if err != nil {
-		logrus.Debugf("failed to get Kubernetes client: %s", err)
-		return &version
-	}
-	version.StackAPI = getStackVersion(kubeClient)
-	version.Kubernetes = getKubernetesServerVersion(kubeClient)
-	return &version
-}
-
-func getStackVersion(client *kubernetesClient.Clientset) string {
-	apiVersion, err := kubernetes.GetStackAPIVersion(client)
-	if err != nil {
-		logrus.Debugf("failed to get Stack API version: %s", err)
-		return "Unknown"
-	}
-	return string(apiVersion)
-}
-
-func getKubernetesServerVersion(client *kubernetesClient.Clientset) string {
-	kubeVersion, err := client.DiscoveryClient.ServerVersion()
-	if err != nil {
-		logrus.Debugf("failed to get Kubernetes server version: %s", err)
-		return "Unknown"
-	}
-	return kubeVersion.String()
-}
diff --git a/kubernetes/README.md b/kubernetes/README.md