vendor: update docker/cli to 8667ccd
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>pull/973/head
							parent
							
								
									f62c02329e
								
							
						
					
					
						commit
						971b5d2b73
					
				@ -1,4 +1,4 @@
 | 
			
		||||
package kubernetes
 | 
			
		||||
package context
 | 
			
		||||
 | 
			
		||||
const (
 | 
			
		||||
	// KubernetesEndpoint is the kubernetes endpoint name in a stored context
 | 
			
		||||
@ -0,0 +1,225 @@
 | 
			
		||||
package context
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"io/ioutil"
 | 
			
		||||
	"os"
 | 
			
		||||
	"testing"
 | 
			
		||||
 | 
			
		||||
	"github.com/docker/cli/cli/context"
 | 
			
		||||
	"github.com/docker/cli/cli/context/store"
 | 
			
		||||
	"github.com/stretchr/testify/assert"
 | 
			
		||||
	"github.com/stretchr/testify/require"
 | 
			
		||||
	"k8s.io/client-go/tools/clientcmd"
 | 
			
		||||
	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
func testEndpoint(server, defaultNamespace string, ca, cert, key []byte, skipTLSVerify bool) Endpoint {
 | 
			
		||||
	var tlsData *context.TLSData
 | 
			
		||||
	if ca != nil || cert != nil || key != nil {
 | 
			
		||||
		tlsData = &context.TLSData{
 | 
			
		||||
			CA:   ca,
 | 
			
		||||
			Cert: cert,
 | 
			
		||||
			Key:  key,
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	return Endpoint{
 | 
			
		||||
		EndpointMeta: EndpointMeta{
 | 
			
		||||
			EndpointMetaBase: context.EndpointMetaBase{
 | 
			
		||||
				Host:          server,
 | 
			
		||||
				SkipTLSVerify: skipTLSVerify,
 | 
			
		||||
			},
 | 
			
		||||
			DefaultNamespace: defaultNamespace,
 | 
			
		||||
		},
 | 
			
		||||
		TLSData: tlsData,
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
var testStoreCfg = store.NewConfig(
 | 
			
		||||
	func() interface{} {
 | 
			
		||||
		return &map[string]interface{}{}
 | 
			
		||||
	},
 | 
			
		||||
	store.EndpointTypeGetter(KubernetesEndpoint, func() interface{} { return &EndpointMeta{} }),
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
func TestSaveLoadContexts(t *testing.T) {
 | 
			
		||||
	storeDir, err := ioutil.TempDir("", "test-load-save-k8-context")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	defer os.RemoveAll(storeDir)
 | 
			
		||||
	store := store.New(storeDir, testStoreCfg)
 | 
			
		||||
	require.NoError(t, save(store, testEndpoint("https://test", "test", nil, nil, nil, false), "raw-notls"))
 | 
			
		||||
	require.NoError(t, save(store, testEndpoint("https://test", "test", nil, nil, nil, true), "raw-notls-skip"))
 | 
			
		||||
	require.NoError(t, save(store, testEndpoint("https://test", "test", []byte("ca"), []byte("cert"), []byte("key"), true), "raw-tls"))
 | 
			
		||||
 | 
			
		||||
	kcFile, err := ioutil.TempFile(os.TempDir(), "test-load-save-k8-context")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	defer os.Remove(kcFile.Name())
 | 
			
		||||
	defer kcFile.Close()
 | 
			
		||||
	cfg := clientcmdapi.NewConfig()
 | 
			
		||||
	cfg.AuthInfos["user"] = clientcmdapi.NewAuthInfo()
 | 
			
		||||
	cfg.Contexts["context1"] = clientcmdapi.NewContext()
 | 
			
		||||
	cfg.Clusters["cluster1"] = clientcmdapi.NewCluster()
 | 
			
		||||
	cfg.Contexts["context2"] = clientcmdapi.NewContext()
 | 
			
		||||
	cfg.Clusters["cluster2"] = clientcmdapi.NewCluster()
 | 
			
		||||
	cfg.AuthInfos["user"].ClientCertificateData = []byte("cert")
 | 
			
		||||
	cfg.AuthInfos["user"].ClientKeyData = []byte("key")
 | 
			
		||||
	cfg.Clusters["cluster1"].Server = "https://server1"
 | 
			
		||||
	cfg.Clusters["cluster1"].InsecureSkipTLSVerify = true
 | 
			
		||||
	cfg.Clusters["cluster2"].Server = "https://server2"
 | 
			
		||||
	cfg.Clusters["cluster2"].CertificateAuthorityData = []byte("ca")
 | 
			
		||||
	cfg.Contexts["context1"].AuthInfo = "user"
 | 
			
		||||
	cfg.Contexts["context1"].Cluster = "cluster1"
 | 
			
		||||
	cfg.Contexts["context1"].Namespace = "namespace1"
 | 
			
		||||
	cfg.Contexts["context2"].AuthInfo = "user"
 | 
			
		||||
	cfg.Contexts["context2"].Cluster = "cluster2"
 | 
			
		||||
	cfg.Contexts["context2"].Namespace = "namespace2"
 | 
			
		||||
	cfg.CurrentContext = "context1"
 | 
			
		||||
	cfgData, err := clientcmd.Write(*cfg)
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	_, err = kcFile.Write(cfgData)
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	kcFile.Close()
 | 
			
		||||
 | 
			
		||||
	epDefault, err := FromKubeConfig(kcFile.Name(), "", "")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	epContext2, err := FromKubeConfig(kcFile.Name(), "context2", "namespace-override")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	require.NoError(t, save(store, epDefault, "embed-default-context"))
 | 
			
		||||
	require.NoError(t, save(store, epContext2, "embed-context2"))
 | 
			
		||||
 | 
			
		||||
	rawNoTLSMeta, err := store.GetMetadata("raw-notls")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	rawNoTLSSkipMeta, err := store.GetMetadata("raw-notls-skip")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	rawTLSMeta, err := store.GetMetadata("raw-tls")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	embededDefaultMeta, err := store.GetMetadata("embed-default-context")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	embededContext2Meta, err := store.GetMetadata("embed-context2")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
 | 
			
		||||
	rawNoTLS := EndpointFromContext(rawNoTLSMeta)
 | 
			
		||||
	rawNoTLSSkip := EndpointFromContext(rawNoTLSSkipMeta)
 | 
			
		||||
	rawTLS := EndpointFromContext(rawTLSMeta)
 | 
			
		||||
	embededDefault := EndpointFromContext(embededDefaultMeta)
 | 
			
		||||
	embededContext2 := EndpointFromContext(embededContext2Meta)
 | 
			
		||||
 | 
			
		||||
	rawNoTLSEP, err := rawNoTLS.WithTLSData(store, "raw-notls")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	checkClientConfig(t, rawNoTLSEP, "https://test", "test", nil, nil, nil, false)
 | 
			
		||||
	rawNoTLSSkipEP, err := rawNoTLSSkip.WithTLSData(store, "raw-notls-skip")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	checkClientConfig(t, rawNoTLSSkipEP, "https://test", "test", nil, nil, nil, true)
 | 
			
		||||
	rawTLSEP, err := rawTLS.WithTLSData(store, "raw-tls")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	checkClientConfig(t, rawTLSEP, "https://test", "test", []byte("ca"), []byte("cert"), []byte("key"), true)
 | 
			
		||||
	embededDefaultEP, err := embededDefault.WithTLSData(store, "embed-default-context")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	checkClientConfig(t, embededDefaultEP, "https://server1", "namespace1", nil, []byte("cert"), []byte("key"), true)
 | 
			
		||||
	embededContext2EP, err := embededContext2.WithTLSData(store, "embed-context2")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	checkClientConfig(t, embededContext2EP, "https://server2", "namespace-override", []byte("ca"), []byte("cert"), []byte("key"), false)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func checkClientConfig(t *testing.T, ep Endpoint, server, namespace string, ca, cert, key []byte, skipTLSVerify bool) {
 | 
			
		||||
	config := ep.KubernetesConfig()
 | 
			
		||||
	cfg, err := config.ClientConfig()
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	ns, _, _ := config.Namespace()
 | 
			
		||||
	assert.Equal(t, server, cfg.Host)
 | 
			
		||||
	assert.Equal(t, namespace, ns)
 | 
			
		||||
	assert.Equal(t, ca, cfg.CAData)
 | 
			
		||||
	assert.Equal(t, cert, cfg.CertData)
 | 
			
		||||
	assert.Equal(t, key, cfg.KeyData)
 | 
			
		||||
	assert.Equal(t, skipTLSVerify, cfg.Insecure)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func save(s store.Writer, ep Endpoint, name string) error {
 | 
			
		||||
	meta := store.Metadata{
 | 
			
		||||
		Endpoints: map[string]interface{}{
 | 
			
		||||
			KubernetesEndpoint: ep.EndpointMeta,
 | 
			
		||||
		},
 | 
			
		||||
		Name: name,
 | 
			
		||||
	}
 | 
			
		||||
	if err := s.CreateOrUpdate(meta); err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
	return s.ResetEndpointTLSMaterial(name, KubernetesEndpoint, ep.TLSData.ToStoreTLSData())
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestSaveLoadGKEConfig(t *testing.T) {
 | 
			
		||||
	storeDir, err := ioutil.TempDir("", t.Name())
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	defer os.RemoveAll(storeDir)
 | 
			
		||||
	store := store.New(storeDir, testStoreCfg)
 | 
			
		||||
	cfg, err := clientcmd.LoadFromFile("fixtures/gke-kubeconfig")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	clientCfg := clientcmd.NewDefaultClientConfig(*cfg, &clientcmd.ConfigOverrides{})
 | 
			
		||||
	expectedCfg, err := clientCfg.ClientConfig()
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	ep, err := FromKubeConfig("fixtures/gke-kubeconfig", "", "")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	require.NoError(t, save(store, ep, "gke-context"))
 | 
			
		||||
	persistedMetadata, err := store.GetMetadata("gke-context")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	persistedEPMeta := EndpointFromContext(persistedMetadata)
 | 
			
		||||
	assert.True(t, persistedEPMeta != nil)
 | 
			
		||||
	persistedEP, err := persistedEPMeta.WithTLSData(store, "gke-context")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	persistedCfg := persistedEP.KubernetesConfig()
 | 
			
		||||
	actualCfg, err := persistedCfg.ClientConfig()
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	assert.Equal(t, expectedCfg.AuthProvider, actualCfg.AuthProvider)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestSaveLoadEKSConfig(t *testing.T) {
 | 
			
		||||
	storeDir, err := ioutil.TempDir("", t.Name())
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	defer os.RemoveAll(storeDir)
 | 
			
		||||
	store := store.New(storeDir, testStoreCfg)
 | 
			
		||||
	cfg, err := clientcmd.LoadFromFile("fixtures/eks-kubeconfig")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	clientCfg := clientcmd.NewDefaultClientConfig(*cfg, &clientcmd.ConfigOverrides{})
 | 
			
		||||
	expectedCfg, err := clientCfg.ClientConfig()
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	ep, err := FromKubeConfig("fixtures/eks-kubeconfig", "", "")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	require.NoError(t, save(store, ep, "eks-context"))
 | 
			
		||||
	persistedMetadata, err := store.GetMetadata("eks-context")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	persistedEPMeta := EndpointFromContext(persistedMetadata)
 | 
			
		||||
	assert.True(t, persistedEPMeta != nil)
 | 
			
		||||
	persistedEP, err := persistedEPMeta.WithTLSData(store, "eks-context")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	persistedCfg := persistedEP.KubernetesConfig()
 | 
			
		||||
	actualCfg, err := persistedCfg.ClientConfig()
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	assert.Equal(t, expectedCfg.ExecProvider, actualCfg.ExecProvider)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestSaveLoadK3SConfig(t *testing.T) {
 | 
			
		||||
	storeDir, err := ioutil.TempDir("", t.Name())
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	defer os.RemoveAll(storeDir)
 | 
			
		||||
	store := store.New(storeDir, testStoreCfg)
 | 
			
		||||
	cfg, err := clientcmd.LoadFromFile("fixtures/k3s-kubeconfig")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	clientCfg := clientcmd.NewDefaultClientConfig(*cfg, &clientcmd.ConfigOverrides{})
 | 
			
		||||
	expectedCfg, err := clientCfg.ClientConfig()
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	ep, err := FromKubeConfig("fixtures/k3s-kubeconfig", "", "")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	require.NoError(t, save(store, ep, "k3s-context"))
 | 
			
		||||
	persistedMetadata, err := store.GetMetadata("k3s-context")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	persistedEPMeta := EndpointFromContext(persistedMetadata)
 | 
			
		||||
	assert.True(t, persistedEPMeta != nil)
 | 
			
		||||
	persistedEP, err := persistedEPMeta.WithTLSData(store, "k3s-context")
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	persistedCfg := persistedEP.KubernetesConfig()
 | 
			
		||||
	actualCfg, err := persistedCfg.ClientConfig()
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	assert.True(t, len(actualCfg.Username) > 0)
 | 
			
		||||
	assert.True(t, len(actualCfg.Password) > 0)
 | 
			
		||||
	assert.Equal(t, expectedCfg.Username, actualCfg.Username)
 | 
			
		||||
	assert.Equal(t, expectedCfg.Password, actualCfg.Password)
 | 
			
		||||
}
 | 
			
		||||
@ -0,0 +1,23 @@
 | 
			
		||||
  apiVersion: v1
 | 
			
		||||
  clusters:
 | 
			
		||||
  - cluster:
 | 
			
		||||
      server: https://some-server      
 | 
			
		||||
    name: kubernetes
 | 
			
		||||
  contexts:
 | 
			
		||||
  - context:
 | 
			
		||||
      cluster: kubernetes
 | 
			
		||||
      user: aws
 | 
			
		||||
    name: aws
 | 
			
		||||
  current-context: aws
 | 
			
		||||
  kind: Config
 | 
			
		||||
  preferences: {}
 | 
			
		||||
  users:
 | 
			
		||||
  - name: aws
 | 
			
		||||
    user:
 | 
			
		||||
      exec:
 | 
			
		||||
        apiVersion: client.authentication.k8s.io/v1alpha1
 | 
			
		||||
        command: heptio-authenticator-aws
 | 
			
		||||
        args:
 | 
			
		||||
          - "token"
 | 
			
		||||
          - "-i"
 | 
			
		||||
          - "eks-cf"
 | 
			
		||||
@ -0,0 +1,23 @@
 | 
			
		||||
apiVersion: v1
 | 
			
		||||
clusters:
 | 
			
		||||
- cluster:    
 | 
			
		||||
    server: https://some-server
 | 
			
		||||
  name: gke_sample
 | 
			
		||||
contexts:
 | 
			
		||||
- context:
 | 
			
		||||
    cluster: gke_sample
 | 
			
		||||
    user: gke_sample
 | 
			
		||||
  name: gke_sample
 | 
			
		||||
current-context: gke_sample
 | 
			
		||||
kind: Config
 | 
			
		||||
preferences: {}
 | 
			
		||||
users:
 | 
			
		||||
- name: gke_sample
 | 
			
		||||
  user:
 | 
			
		||||
    auth-provider:
 | 
			
		||||
      config:
 | 
			
		||||
        cmd-args: config config-helper --format=json
 | 
			
		||||
        cmd-path: /google/google-cloud-sdk/bin/gcloud
 | 
			
		||||
        expiry-key: '{.credential.token_expiry}'
 | 
			
		||||
        token-key: '{.credential.access_token}'
 | 
			
		||||
      name: gcp
 | 
			
		||||
@ -0,0 +1,20 @@
 | 
			
		||||
apiVersion: v1
 | 
			
		||||
clusters:
 | 
			
		||||
- cluster:
 | 
			
		||||
    certificate-authority-data: dGhlLWNh
 | 
			
		||||
    server: https://someserver
 | 
			
		||||
  name: test-cluster
 | 
			
		||||
contexts:
 | 
			
		||||
- context:
 | 
			
		||||
    cluster: test-cluster
 | 
			
		||||
    user: test-user
 | 
			
		||||
    namespace: zoinx
 | 
			
		||||
  name: test
 | 
			
		||||
current-context: test
 | 
			
		||||
kind: Config
 | 
			
		||||
preferences: {}
 | 
			
		||||
users:
 | 
			
		||||
- name: test-user
 | 
			
		||||
  user:
 | 
			
		||||
    username: admin
 | 
			
		||||
    password: testpwd
 | 
			
		||||
@ -0,0 +1,20 @@
 | 
			
		||||
apiVersion: v1
 | 
			
		||||
clusters:
 | 
			
		||||
- cluster:
 | 
			
		||||
    certificate-authority-data: dGhlLWNh
 | 
			
		||||
    server: https://someserver
 | 
			
		||||
  name: test-cluster
 | 
			
		||||
contexts:
 | 
			
		||||
- context:
 | 
			
		||||
    cluster: test-cluster
 | 
			
		||||
    user: test-user
 | 
			
		||||
    namespace: zoinx
 | 
			
		||||
  name: test
 | 
			
		||||
current-context: test
 | 
			
		||||
kind: Config
 | 
			
		||||
preferences: {}
 | 
			
		||||
users:
 | 
			
		||||
- name: test-user
 | 
			
		||||
  user:
 | 
			
		||||
    client-certificate-data: dGhlLWNlcnQ=
 | 
			
		||||
    client-key-data: dGhlLWtleQ==
 | 
			
		||||
@ -0,0 +1,23 @@
 | 
			
		||||
package context
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"os"
 | 
			
		||||
	"testing"
 | 
			
		||||
 | 
			
		||||
	"github.com/docker/cli/cli/command"
 | 
			
		||||
	"github.com/docker/cli/cli/config/configfile"
 | 
			
		||||
	cliflags "github.com/docker/cli/cli/flags"
 | 
			
		||||
	"github.com/stretchr/testify/assert"
 | 
			
		||||
	"github.com/stretchr/testify/require"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
func TestDefaultContextInitializer(t *testing.T) {
 | 
			
		||||
	cli, err := command.NewDockerCli()
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	os.Setenv("KUBECONFIG", "./fixtures/test-kubeconfig")
 | 
			
		||||
	defer os.Unsetenv("KUBECONFIG")
 | 
			
		||||
	ctx, err := command.ResolveDefaultContext(&cliflags.CommonOptions{}, &configfile.ConfigFile{}, command.DefaultContextStoreConfig(), cli.Err())
 | 
			
		||||
	require.NoError(t, err)
 | 
			
		||||
	assert.Equal(t, "default", ctx.Meta.Name)
 | 
			
		||||
	assert.Equal(t, "zoinx", ctx.Meta.Endpoints[KubernetesEndpoint].(EndpointMeta).DefaultNamespace)
 | 
			
		||||
}
 | 
			
		||||
@ -1,4 +1,4 @@
 | 
			
		||||
package kubernetes
 | 
			
		||||
package context
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"io/ioutil"
 | 
			
		||||
@ -1,84 +0,0 @@
 | 
			
		||||
package command
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"io"
 | 
			
		||||
	"os"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// Orchestrator type acts as an enum describing supported orchestrators.
 | 
			
		||||
type Orchestrator string
 | 
			
		||||
 | 
			
		||||
const (
 | 
			
		||||
	// OrchestratorKubernetes orchestrator
 | 
			
		||||
	OrchestratorKubernetes = Orchestrator("kubernetes")
 | 
			
		||||
	// OrchestratorSwarm orchestrator
 | 
			
		||||
	OrchestratorSwarm = Orchestrator("swarm")
 | 
			
		||||
	// OrchestratorAll orchestrator
 | 
			
		||||
	OrchestratorAll   = Orchestrator("all")
 | 
			
		||||
	orchestratorUnset = Orchestrator("")
 | 
			
		||||
 | 
			
		||||
	defaultOrchestrator           = OrchestratorSwarm
 | 
			
		||||
	envVarDockerStackOrchestrator = "DOCKER_STACK_ORCHESTRATOR"
 | 
			
		||||
	envVarDockerOrchestrator      = "DOCKER_ORCHESTRATOR"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// HasKubernetes returns true if defined orchestrator has Kubernetes capabilities.
 | 
			
		||||
func (o Orchestrator) HasKubernetes() bool {
 | 
			
		||||
	return o == OrchestratorKubernetes || o == OrchestratorAll
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// HasSwarm returns true if defined orchestrator has Swarm capabilities.
 | 
			
		||||
func (o Orchestrator) HasSwarm() bool {
 | 
			
		||||
	return o == OrchestratorSwarm || o == OrchestratorAll
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// HasAll returns true if defined orchestrator has both Swarm and Kubernetes capabilities.
 | 
			
		||||
func (o Orchestrator) HasAll() bool {
 | 
			
		||||
	return o == OrchestratorAll
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func normalize(value string) (Orchestrator, error) {
 | 
			
		||||
	switch value {
 | 
			
		||||
	case "kubernetes":
 | 
			
		||||
		return OrchestratorKubernetes, nil
 | 
			
		||||
	case "swarm":
 | 
			
		||||
		return OrchestratorSwarm, nil
 | 
			
		||||
	case "", "unset": // unset is the old value for orchestratorUnset. Keep accepting this for backward compat
 | 
			
		||||
		return orchestratorUnset, nil
 | 
			
		||||
	case "all":
 | 
			
		||||
		return OrchestratorAll, nil
 | 
			
		||||
	default:
 | 
			
		||||
		return defaultOrchestrator, fmt.Errorf("specified orchestrator %q is invalid, please use either kubernetes, swarm or all", value)
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// NormalizeOrchestrator parses an orchestrator value and checks if it is valid
 | 
			
		||||
func NormalizeOrchestrator(value string) (Orchestrator, error) {
 | 
			
		||||
	return normalize(value)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// GetStackOrchestrator checks DOCKER_STACK_ORCHESTRATOR environment variable and configuration file
 | 
			
		||||
// orchestrator value and returns user defined Orchestrator.
 | 
			
		||||
func GetStackOrchestrator(flagValue, contextValue, globalDefault string, stderr io.Writer) (Orchestrator, error) {
 | 
			
		||||
	// Check flag
 | 
			
		||||
	if o, err := normalize(flagValue); o != orchestratorUnset {
 | 
			
		||||
		return o, err
 | 
			
		||||
	}
 | 
			
		||||
	// Check environment variable
 | 
			
		||||
	env := os.Getenv(envVarDockerStackOrchestrator)
 | 
			
		||||
	if env == "" && os.Getenv(envVarDockerOrchestrator) != "" {
 | 
			
		||||
		fmt.Fprintf(stderr, "WARNING: experimental environment variable %s is set. Please use %s instead\n", envVarDockerOrchestrator, envVarDockerStackOrchestrator)
 | 
			
		||||
	}
 | 
			
		||||
	if o, err := normalize(env); o != orchestratorUnset {
 | 
			
		||||
		return o, err
 | 
			
		||||
	}
 | 
			
		||||
	if o, err := normalize(contextValue); o != orchestratorUnset {
 | 
			
		||||
		return o, err
 | 
			
		||||
	}
 | 
			
		||||
	if o, err := normalize(globalDefault); o != orchestratorUnset {
 | 
			
		||||
		return o, err
 | 
			
		||||
	}
 | 
			
		||||
	// Nothing set, use default orchestrator
 | 
			
		||||
	return defaultOrchestrator, nil
 | 
			
		||||
}
 | 
			
		||||
@ -1,201 +0,0 @@
 | 
			
		||||
                                 Apache License
 | 
			
		||||
                           Version 2.0, January 2004
 | 
			
		||||
                        http://www.apache.org/licenses/
 | 
			
		||||
 | 
			
		||||
   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 | 
			
		||||
 | 
			
		||||
   1. Definitions.
 | 
			
		||||
 | 
			
		||||
      "License" shall mean the terms and conditions for use, reproduction,
 | 
			
		||||
      and distribution as defined by Sections 1 through 9 of this document.
 | 
			
		||||
 | 
			
		||||
      "Licensor" shall mean the copyright owner or entity authorized by
 | 
			
		||||
      the copyright owner that is granting the License.
 | 
			
		||||
 | 
			
		||||
      "Legal Entity" shall mean the union of the acting entity and all
 | 
			
		||||
      other entities that control, are controlled by, or are under common
 | 
			
		||||
      control with that entity. For the purposes of this definition,
 | 
			
		||||
      "control" means (i) the power, direct or indirect, to cause the
 | 
			
		||||
      direction or management of such entity, whether by contract or
 | 
			
		||||
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
 | 
			
		||||
      outstanding shares, or (iii) beneficial ownership of such entity.
 | 
			
		||||
 | 
			
		||||
      "You" (or "Your") shall mean an individual or Legal Entity
 | 
			
		||||
      exercising permissions granted by this License.
 | 
			
		||||
 | 
			
		||||
      "Source" form shall mean the preferred form for making modifications,
 | 
			
		||||
      including but not limited to software source code, documentation
 | 
			
		||||
      source, and configuration files.
 | 
			
		||||
 | 
			
		||||
      "Object" form shall mean any form resulting from mechanical
 | 
			
		||||
      transformation or translation of a Source form, including but
 | 
			
		||||
      not limited to compiled object code, generated documentation,
 | 
			
		||||
      and conversions to other media types.
 | 
			
		||||
 | 
			
		||||
      "Work" shall mean the work of authorship, whether in Source or
 | 
			
		||||
      Object form, made available under the License, as indicated by a
 | 
			
		||||
      copyright notice that is included in or attached to the work
 | 
			
		||||
      (an example is provided in the Appendix below).
 | 
			
		||||
 | 
			
		||||
      "Derivative Works" shall mean any work, whether in Source or Object
 | 
			
		||||
      form, that is based on (or derived from) the Work and for which the
 | 
			
		||||
      editorial revisions, annotations, elaborations, or other modifications
 | 
			
		||||
      represent, as a whole, an original work of authorship. For the purposes
 | 
			
		||||
      of this License, Derivative Works shall not include works that remain
 | 
			
		||||
      separable from, or merely link (or bind by name) to the interfaces of,
 | 
			
		||||
      the Work and Derivative Works thereof.
 | 
			
		||||
 | 
			
		||||
      "Contribution" shall mean any work of authorship, including
 | 
			
		||||
      the original version of the Work and any modifications or additions
 | 
			
		||||
      to that Work or Derivative Works thereof, that is intentionally
 | 
			
		||||
      submitted to Licensor for inclusion in the Work by the copyright owner
 | 
			
		||||
      or by an individual or Legal Entity authorized to submit on behalf of
 | 
			
		||||
      the copyright owner. For the purposes of this definition, "submitted"
 | 
			
		||||
      means any form of electronic, verbal, or written communication sent
 | 
			
		||||
      to the Licensor or its representatives, including but not limited to
 | 
			
		||||
      communication on electronic mailing lists, source code control systems,
 | 
			
		||||
      and issue tracking systems that are managed by, or on behalf of, the
 | 
			
		||||
      Licensor for the purpose of discussing and improving the Work, but
 | 
			
		||||
      excluding communication that is conspicuously marked or otherwise
 | 
			
		||||
      designated in writing by the copyright owner as "Not a Contribution."
 | 
			
		||||
 | 
			
		||||
      "Contributor" shall mean Licensor and any individual or Legal Entity
 | 
			
		||||
      on behalf of whom a Contribution has been received by Licensor and
 | 
			
		||||
      subsequently incorporated within the Work.
 | 
			
		||||
 | 
			
		||||
   2. Grant of Copyright License. Subject to the terms and conditions of
 | 
			
		||||
      this License, each Contributor hereby grants to You a perpetual,
 | 
			
		||||
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
 | 
			
		||||
      copyright license to reproduce, prepare Derivative Works of,
 | 
			
		||||
      publicly display, publicly perform, sublicense, and distribute the
 | 
			
		||||
      Work and such Derivative Works in Source or Object form.
 | 
			
		||||
 | 
			
		||||
   3. Grant of Patent License. Subject to the terms and conditions of
 | 
			
		||||
      this License, each Contributor hereby grants to You a perpetual,
 | 
			
		||||
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
 | 
			
		||||
      (except as stated in this section) patent license to make, have made,
 | 
			
		||||
      use, offer to sell, sell, import, and otherwise transfer the Work,
 | 
			
		||||
      where such license applies only to those patent claims licensable
 | 
			
		||||
      by such Contributor that are necessarily infringed by their
 | 
			
		||||
      Contribution(s) alone or by combination of their Contribution(s)
 | 
			
		||||
      with the Work to which such Contribution(s) was submitted. If You
 | 
			
		||||
      institute patent litigation against any entity (including a
 | 
			
		||||
      cross-claim or counterclaim in a lawsuit) alleging that the Work
 | 
			
		||||
      or a Contribution incorporated within the Work constitutes direct
 | 
			
		||||
      or contributory patent infringement, then any patent licenses
 | 
			
		||||
      granted to You under this License for that Work shall terminate
 | 
			
		||||
      as of the date such litigation is filed.
 | 
			
		||||
 | 
			
		||||
   4. Redistribution. You may reproduce and distribute copies of the
 | 
			
		||||
      Work or Derivative Works thereof in any medium, with or without
 | 
			
		||||
      modifications, and in Source or Object form, provided that You
 | 
			
		||||
      meet the following conditions:
 | 
			
		||||
 | 
			
		||||
      (a) You must give any other recipients of the Work or
 | 
			
		||||
          Derivative Works a copy of this License; and
 | 
			
		||||
 | 
			
		||||
      (b) You must cause any modified files to carry prominent notices
 | 
			
		||||
          stating that You changed the files; and
 | 
			
		||||
 | 
			
		||||
      (c) You must retain, in the Source form of any Derivative Works
 | 
			
		||||
          that You distribute, all copyright, patent, trademark, and
 | 
			
		||||
          attribution notices from the Source form of the Work,
 | 
			
		||||
          excluding those notices that do not pertain to any part of
 | 
			
		||||
          the Derivative Works; and
 | 
			
		||||
 | 
			
		||||
      (d) If the Work includes a "NOTICE" text file as part of its
 | 
			
		||||
          distribution, then any Derivative Works that You distribute must
 | 
			
		||||
          include a readable copy of the attribution notices contained
 | 
			
		||||
          within such NOTICE file, excluding those notices that do not
 | 
			
		||||
          pertain to any part of the Derivative Works, in at least one
 | 
			
		||||
          of the following places: within a NOTICE text file distributed
 | 
			
		||||
          as part of the Derivative Works; within the Source form or
 | 
			
		||||
          documentation, if provided along with the Derivative Works; or,
 | 
			
		||||
          within a display generated by the Derivative Works, if and
 | 
			
		||||
          wherever such third-party notices normally appear. The contents
 | 
			
		||||
          of the NOTICE file are for informational purposes only and
 | 
			
		||||
          do not modify the License. You may add Your own attribution
 | 
			
		||||
          notices within Derivative Works that You distribute, alongside
 | 
			
		||||
          or as an addendum to the NOTICE text from the Work, provided
 | 
			
		||||
          that such additional attribution notices cannot be construed
 | 
			
		||||
          as modifying the License.
 | 
			
		||||
 | 
			
		||||
      You may add Your own copyright statement to Your modifications and
 | 
			
		||||
      may provide additional or different license terms and conditions
 | 
			
		||||
      for use, reproduction, or distribution of Your modifications, or
 | 
			
		||||
      for any such Derivative Works as a whole, provided Your use,
 | 
			
		||||
      reproduction, and distribution of the Work otherwise complies with
 | 
			
		||||
      the conditions stated in this License.
 | 
			
		||||
 | 
			
		||||
   5. Submission of Contributions. Unless You explicitly state otherwise,
 | 
			
		||||
      any Contribution intentionally submitted for inclusion in the Work
 | 
			
		||||
      by You to the Licensor shall be under the terms and conditions of
 | 
			
		||||
      this License, without any additional terms or conditions.
 | 
			
		||||
      Notwithstanding the above, nothing herein shall supersede or modify
 | 
			
		||||
      the terms of any separate license agreement you may have executed
 | 
			
		||||
      with Licensor regarding such Contributions.
 | 
			
		||||
 | 
			
		||||
   6. Trademarks. This License does not grant permission to use the trade
 | 
			
		||||
      names, trademarks, service marks, or product names of the Licensor,
 | 
			
		||||
      except as required for reasonable and customary use in describing the
 | 
			
		||||
      origin of the Work and reproducing the content of the NOTICE file.
 | 
			
		||||
 | 
			
		||||
   7. Disclaimer of Warranty. Unless required by applicable law or
 | 
			
		||||
      agreed to in writing, Licensor provides the Work (and each
 | 
			
		||||
      Contributor provides its Contributions) on an "AS IS" BASIS,
 | 
			
		||||
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
 | 
			
		||||
      implied, including, without limitation, any warranties or conditions
 | 
			
		||||
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
 | 
			
		||||
      PARTICULAR PURPOSE. You are solely responsible for determining the
 | 
			
		||||
      appropriateness of using or redistributing the Work and assume any
 | 
			
		||||
      risks associated with Your exercise of permissions under this License.
 | 
			
		||||
 | 
			
		||||
   8. Limitation of Liability. In no event and under no legal theory,
 | 
			
		||||
      whether in tort (including negligence), contract, or otherwise,
 | 
			
		||||
      unless required by applicable law (such as deliberate and grossly
 | 
			
		||||
      negligent acts) or agreed to in writing, shall any Contributor be
 | 
			
		||||
      liable to You for damages, including any direct, indirect, special,
 | 
			
		||||
      incidental, or consequential damages of any character arising as a
 | 
			
		||||
      result of this License or out of the use or inability to use the
 | 
			
		||||
      Work (including but not limited to damages for loss of goodwill,
 | 
			
		||||
      work stoppage, computer failure or malfunction, or any and all
 | 
			
		||||
      other commercial damages or losses), even if such Contributor
 | 
			
		||||
      has been advised of the possibility of such damages.
 | 
			
		||||
 | 
			
		||||
   9. Accepting Warranty or Additional Liability. While redistributing
 | 
			
		||||
      the Work or Derivative Works thereof, You may choose to offer,
 | 
			
		||||
      and charge a fee for, acceptance of support, warranty, indemnity,
 | 
			
		||||
      or other liability obligations and/or rights consistent with this
 | 
			
		||||
      License. However, in accepting such obligations, You may act only
 | 
			
		||||
      on Your own behalf and on Your sole responsibility, not on behalf
 | 
			
		||||
      of any other Contributor, and only if You agree to indemnify,
 | 
			
		||||
      defend, and hold each Contributor harmless for any liability
 | 
			
		||||
      incurred by, or claims asserted against, such Contributor by reason
 | 
			
		||||
      of your accepting any such warranty or additional liability.
 | 
			
		||||
 | 
			
		||||
   END OF TERMS AND CONDITIONS
 | 
			
		||||
 | 
			
		||||
   APPENDIX: How to apply the Apache License to your work.
 | 
			
		||||
 | 
			
		||||
      To apply the Apache License to your work, attach the following
 | 
			
		||||
      boilerplate notice, with the fields enclosed by brackets "{}"
 | 
			
		||||
      replaced with your own identifying information. (Don't include
 | 
			
		||||
      the brackets!)  The text should be enclosed in the appropriate
 | 
			
		||||
      comment syntax for the file format. We also recommend that a
 | 
			
		||||
      file or class name and description of purpose be included on the
 | 
			
		||||
      same "printed page" as the copyright notice for easier
 | 
			
		||||
      identification within third-party archives.
 | 
			
		||||
 | 
			
		||||
   Copyright 2016 Docker, Inc.
 | 
			
		||||
 | 
			
		||||
   Licensed under the Apache License, Version 2.0 (the "License");
 | 
			
		||||
   you may not use this file except in compliance with the License.
 | 
			
		||||
   You may obtain a copy of the License at
 | 
			
		||||
 | 
			
		||||
       http://www.apache.org/licenses/LICENSE-2.0
 | 
			
		||||
 | 
			
		||||
   Unless required by applicable law or agreed to in writing, software
 | 
			
		||||
   distributed under the License is distributed on an "AS IS" BASIS,
 | 
			
		||||
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
			
		||||
   See the License for the specific language governing permissions and
 | 
			
		||||
   limitations under the License.
 | 
			
		||||
@ -1,26 +0,0 @@
 | 
			
		||||
package apis
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"os"
 | 
			
		||||
	"path/filepath"
 | 
			
		||||
 | 
			
		||||
	"github.com/docker/docker/pkg/homedir"
 | 
			
		||||
	"k8s.io/client-go/tools/clientcmd"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// NewKubernetesConfig resolves the path to the desired Kubernetes configuration file based on
 | 
			
		||||
// the KUBECONFIG environment variable and command line flags.
 | 
			
		||||
func NewKubernetesConfig(configPath string) clientcmd.ClientConfig {
 | 
			
		||||
	kubeConfig := configPath
 | 
			
		||||
	if kubeConfig == "" {
 | 
			
		||||
		if config := os.Getenv("KUBECONFIG"); config != "" {
 | 
			
		||||
			kubeConfig = config
 | 
			
		||||
		} else {
 | 
			
		||||
			kubeConfig = filepath.Join(homedir.Get(), ".kube/config")
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
 | 
			
		||||
		&clientcmd.ClientConfigLoadingRules{ExplicitPath: kubeConfig},
 | 
			
		||||
		&clientcmd.ConfigOverrides{})
 | 
			
		||||
}
 | 
			
		||||
@ -1,4 +0,0 @@
 | 
			
		||||
//
 | 
			
		||||
// +domain=docker.com
 | 
			
		||||
 | 
			
		||||
package apis
 | 
			
		||||
					Loading…
					
					
				
		Reference in New Issue