Skip to content

H
helm3
Commit 9f9b3e87 authored by Steven E. Harris's avatar Steven E. Harris Committed by Adam Reese
Browse files
Options

Use versioned API types from the client-go library (#2524) 

* Use versioned API types from the client-go library

Wherever possible, use the k8s.io/client-go/kubernetes.Interface type
in favor of the client-related types from package

  k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset

The latter are still required by the kubectl "reaper" types used in
the "installer" and "kube" packages.

* Accept the default deployment replica count of one

Don't bother requesting a single replica explicitly.
parent 15c14194
Show whitespace changes
Inline Side-by-side
Showing with 224 additions and 143 deletions
cmd/helm/helm.go
View file @ 9f9b3e87
...@@ -27,6 +27,7 @@ import ( ...@@ -27,6 +27,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/grpclog" "google.golang.org/grpc/grpclog"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
...@@ -241,16 +242,39 @@ func prettyError(err error) error { ...@@ -241,16 +242,39 @@ func prettyError(err error) error {
return errors.New(grpc.ErrorDesc(err)) return errors.New(grpc.ErrorDesc(err))
} }
// getKubeClient is a convenience method for creating kubernetes config and client // configForContext creates a Kubernetes REST client configuration for a given kubeconfig context.
// for a given kubeconfig context func configForContext(context string) (*rest.Config, error) {
func getKubeClient(context string) (*rest.Config, *internalclientset.Clientset, error) {
config, err := kube.GetConfig(context).ClientConfig() config, err := kube.GetConfig(context).ClientConfig()
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("could not get kubernetes config for context '%s': %s", context, err) return nil, fmt.Errorf("could not get Kubernetes config for context %q: %s", context, err)
}
return config, nil
}
// getKubeClient creates a Kubernetes config and client for a given kubeconfig context.
func getKubeClient(context string) (*rest.Config, kubernetes.Interface, error) {
config, err := configForContext(context)
if err != nil {
return nil, nil, err
}
client, err := kubernetes.NewForConfig(config)
if err != nil {
return nil, nil, fmt.Errorf("could not get Kubernetes client: %s", err)
}
return config, client, nil
}
// getInternalKubeClient creates a Kubernetes config and an "internal" client for a given kubeconfig context.
//
// Prefer the similar getKubeClient if you don't need to use such an internal client.
func getInternalKubeClient(context string) (*rest.Config, internalclientset.Interface, error) {
config, err := configForContext(context)
if err != nil {
return nil, nil, err
} }
client, err := internalclientset.NewForConfig(config) client, err := internalclientset.NewForConfig(config)
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("could not get kubernetes client: %s", err) return nil, nil, fmt.Errorf("could not get Kubernetes client: %s", err)
} }
return config, client, nil return config, client, nil
} }
......
cmd/helm/init.go
View file @ 9f9b3e87
...@@ -24,7 +24,7 @@ import ( ...@@ -24,7 +24,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/client-go/kubernetes"
"k8s.io/helm/cmd/helm/installer" "k8s.io/helm/cmd/helm/installer"
"k8s.io/helm/pkg/getter" "k8s.io/helm/pkg/getter"
...@@ -77,7 +77,7 @@ type initCmd struct { ...@@ -77,7 +77,7 @@ type initCmd struct {
out io.Writer out io.Writer
home helmpath.Home home helmpath.Home
opts installer.Options opts installer.Options
kubeClient internalclientset.Interface kubeClient kubernetes.Interface
serviceAccount string serviceAccount string
} }
......
cmd/helm/init_test.go
View file @ 9f9b3e87
...@@ -30,10 +30,10 @@ import ( ...@@ -30,10 +30,10 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/pkg/apis/extensions/v1beta1"
testcore "k8s.io/client-go/testing" testcore "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
"k8s.io/helm/cmd/helm/installer" "k8s.io/helm/cmd/helm/installer"
"k8s.io/helm/pkg/helm/helmpath" "k8s.io/helm/pkg/helm/helmpath"
...@@ -52,7 +52,7 @@ func TestInitCmd(t *testing.T) { ...@@ -52,7 +52,7 @@ func TestInitCmd(t *testing.T) {
out: &buf, out: &buf,
home: helmpath.Home(home), home: helmpath.Home(home),
kubeClient: fc, kubeClient: fc,
namespace: api.NamespaceDefault, namespace: v1.NamespaceDefault,
} }
if err := cmd.run(); err != nil { if err := cmd.run(); err != nil {
t.Errorf("expected error: %v", err) t.Errorf("expected error: %v", err)
...@@ -81,20 +81,20 @@ func TestInitCmd_exists(t *testing.T) { ...@@ -81,20 +81,20 @@ func TestInitCmd_exists(t *testing.T) {
defer os.Remove(home) defer os.Remove(home)
var buf bytes.Buffer var buf bytes.Buffer
fc := fake.NewSimpleClientset(&extensions.Deployment{ fc := fake.NewSimpleClientset(&v1beta1.Deployment{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault, Namespace: v1.NamespaceDefault,
Name: "tiller-deploy", Name: "tiller-deploy",
}, },
}) })
fc.PrependReactor("*", "*", func(action testcore.Action) (bool, runtime.Object, error) { fc.PrependReactor("*", "*", func(action testcore.Action) (bool, runtime.Object, error) {
return true, nil, apierrors.NewAlreadyExists(api.Resource("deployments"), "1") return true, nil, apierrors.NewAlreadyExists(v1.Resource("deployments"), "1")
}) })
cmd := &initCmd{ cmd := &initCmd{
out: &buf, out: &buf,
home: helmpath.Home(home), home: helmpath.Home(home),
kubeClient: fc, kubeClient: fc,
namespace: api.NamespaceDefault, namespace: v1.NamespaceDefault,
} }
if err := cmd.run(); err != nil { if err := cmd.run(); err != nil {
t.Errorf("expected error: %v", err) t.Errorf("expected error: %v", err)
...@@ -120,7 +120,7 @@ func TestInitCmd_clientOnly(t *testing.T) { ...@@ -120,7 +120,7 @@ func TestInitCmd_clientOnly(t *testing.T) {
home: helmpath.Home(home), home: helmpath.Home(home),
kubeClient: fc, kubeClient: fc,
clientOnly: true, clientOnly: true,
namespace: api.NamespaceDefault, namespace: v1.NamespaceDefault,
} }
if err := cmd.run(); err != nil { if err := cmd.run(); err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
...@@ -155,7 +155,7 @@ func TestInitCmd_dryRun(t *testing.T) { ...@@ -155,7 +155,7 @@ func TestInitCmd_dryRun(t *testing.T) {
kubeClient: fc, kubeClient: fc,
clientOnly: true, clientOnly: true,
dryRun: true, dryRun: true,
namespace: api.NamespaceDefault, namespace: v1.NamespaceDefault,
} }
if err := cmd.run(); err != nil { if err := cmd.run(); err != nil {
t.Fatal(err) t.Fatal(err)
......
cmd/helm/installer/install.go
View file @ 9f9b3e87
...@@ -23,17 +23,17 @@ import ( ...@@ -23,17 +23,17 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/kubernetes/pkg/api" "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/pkg/apis/extensions" corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" extensionsclient "k8s.io/client-go/kubernetes/typed/extensions/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/client-go/pkg/api/v1"
extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" "k8s.io/client-go/pkg/apis/extensions/v1beta1"
) )
// Install uses kubernetes client to install tiller. // Install uses kubernetes client to install tiller.
// //
// Returns an error if the command failed. // Returns an error if the command failed.
func Install(client internalclientset.Interface, opts *Options) error { func Install(client kubernetes.Interface, opts *Options) error {
if err := createDeployment(client.Extensions(), opts); err != nil { if err := createDeployment(client.Extensions(), opts); err != nil {
return err return err
} }
...@@ -51,7 +51,7 @@ func Install(client internalclientset.Interface, opts *Options) error { ...@@ -51,7 +51,7 @@ func Install(client internalclientset.Interface, opts *Options) error {
// Upgrade uses kubernetes client to upgrade tiller to current version. // Upgrade uses kubernetes client to upgrade tiller to current version.
// //
// Returns an error if the command failed. // Returns an error if the command failed.
func Upgrade(client internalclientset.Interface, opts *Options) error { func Upgrade(client kubernetes.Interface, opts *Options) error {
obj, err := client.Extensions().Deployments(opts.Namespace).Get(deploymentName, metav1.GetOptions{}) obj, err := client.Extensions().Deployments(opts.Namespace).Get(deploymentName, metav1.GetOptions{})
if err != nil { if err != nil {
return err return err
...@@ -79,19 +79,19 @@ func createDeployment(client extensionsclient.DeploymentsGetter, opts *Options) ...@@ -79,19 +79,19 @@ func createDeployment(client extensionsclient.DeploymentsGetter, opts *Options)
} }
// deployment gets the deployment object that installs Tiller. // deployment gets the deployment object that installs Tiller.
func deployment(opts *Options) *extensions.Deployment { func deployment(opts *Options) *v1beta1.Deployment {
return generateDeployment(opts) return generateDeployment(opts)
} }
// createService creates the Tiller service resource // createService creates the Tiller service resource
func createService(client internalversion.ServicesGetter, namespace string) error { func createService(client corev1.ServicesGetter, namespace string) error {
obj := service(namespace) obj := service(namespace)
_, err := client.Services(obj.Namespace).Create(obj) _, err := client.Services(obj.Namespace).Create(obj)
return err return err
} }
// service gets the service object that installs Tiller. // service gets the service object that installs Tiller.
func service(namespace string) *api.Service { func service(namespace string) *v1.Service {
return generateService(namespace) return generateService(namespace)
} }
...@@ -117,36 +117,35 @@ func generateLabels(labels map[string]string) map[string]string { ...@@ -117,36 +117,35 @@ func generateLabels(labels map[string]string) map[string]string {
return labels return labels
} }
func generateDeployment(opts *Options) *extensions.Deployment { func generateDeployment(opts *Options) *v1beta1.Deployment {
labels := generateLabels(map[string]string{"name": "tiller"}) labels := generateLabels(map[string]string{"name": "tiller"})
d := &extensions.Deployment{ d := &v1beta1.Deployment{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Namespace: opts.Namespace, Namespace: opts.Namespace,
Name: deploymentName, Name: deploymentName,
Labels: labels, Labels: labels,
}, },
Spec: extensions.DeploymentSpec{ Spec: v1beta1.DeploymentSpec{
Replicas: 1, Template: v1.PodTemplateSpec{
Template: api.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Labels: labels, Labels: labels,
}, },
Spec: api.PodSpec{ Spec: v1.PodSpec{
ServiceAccountName: opts.ServiceAccount, ServiceAccountName: opts.ServiceAccount,
Containers: []api.Container{ Containers: []v1.Container{
{ {
Name: "tiller", Name: "tiller",
Image: opts.selectImage(), Image: opts.selectImage(),
ImagePullPolicy: opts.pullPolicy(), ImagePullPolicy: opts.pullPolicy(),
Ports: []api.ContainerPort{ Ports: []v1.ContainerPort{
{ContainerPort: 44134, Name: "tiller"}, {ContainerPort: 44134, Name: "tiller"},
}, },
Env: []api.EnvVar{ Env: []v1.EnvVar{
{Name: "TILLER_NAMESPACE", Value: opts.Namespace}, {Name: "TILLER_NAMESPACE", Value: opts.Namespace},
}, },
LivenessProbe: &api.Probe{ LivenessProbe: &v1.Probe{
Handler: api.Handler{ Handler: v1.Handler{
HTTPGet: &api.HTTPGetAction{ HTTPGet: &v1.HTTPGetAction{
Path: "/liveness", Path: "/liveness",
Port: intstr.FromInt(44135), Port: intstr.FromInt(44135),
}, },
...@@ -154,9 +153,9 @@ func generateDeployment(opts *Options) *extensions.Deployment { ...@@ -154,9 +153,9 @@ func generateDeployment(opts *Options) *extensions.Deployment {
InitialDelaySeconds: 1, InitialDelaySeconds: 1,
TimeoutSeconds: 1, TimeoutSeconds: 1,
}, },
ReadinessProbe: &api.Probe{ ReadinessProbe: &v1.Probe{
Handler: api.Handler{ Handler: v1.Handler{
HTTPGet: &api.HTTPGetAction{ HTTPGet: &v1.HTTPGetAction{
Path: "/readiness", Path: "/readiness",
Port: intstr.FromInt(44135), Port: intstr.FromInt(44135),
}, },
...@@ -166,12 +165,10 @@ func generateDeployment(opts *Options) *extensions.Deployment { ...@@ -166,12 +165,10 @@ func generateDeployment(opts *Options) *extensions.Deployment {
}, },
}, },
}, },
HostNetwork: opts.EnableHostNetwork,
NodeSelector: map[string]string{ NodeSelector: map[string]string{
"beta.kubernetes.io/os": "linux", "beta.kubernetes.io/os": "linux",
}, },
SecurityContext: &api.PodSecurityContext{
HostNetwork: opts.EnableHostNetwork,
},
}, },
}, },
}, },
...@@ -186,22 +183,22 @@ func generateDeployment(opts *Options) *extensions.Deployment { ...@@ -186,22 +183,22 @@ func generateDeployment(opts *Options) *extensions.Deployment {
} }
// Mount secret to "/etc/certs" // Mount secret to "/etc/certs"
d.Spec.Template.Spec.Containers[0].VolumeMounts = append(d.Spec.Template.Spec.Containers[0].VolumeMounts, api.VolumeMount{ d.Spec.Template.Spec.Containers[0].VolumeMounts = append(d.Spec.Template.Spec.Containers[0].VolumeMounts, v1.VolumeMount{
Name: "tiller-certs", Name: "tiller-certs",
ReadOnly: true, ReadOnly: true,
MountPath: certsDir, MountPath: certsDir,
}) })
// Add environment variable required for enabling TLS // Add environment variable required for enabling TLS
d.Spec.Template.Spec.Containers[0].Env = append(d.Spec.Template.Spec.Containers[0].Env, []api.EnvVar{ d.Spec.Template.Spec.Containers[0].Env = append(d.Spec.Template.Spec.Containers[0].Env, []v1.EnvVar{
{Name: "TILLER_TLS_VERIFY", Value: tlsVerify}, {Name: "TILLER_TLS_VERIFY", Value: tlsVerify},
{Name: "TILLER_TLS_ENABLE", Value: tlsEnable}, {Name: "TILLER_TLS_ENABLE", Value: tlsEnable},
{Name: "TILLER_TLS_CERTS", Value: certsDir}, {Name: "TILLER_TLS_CERTS", Value: certsDir},
}...) }...)
// Add secret volume to deployment // Add secret volume to deployment
d.Spec.Template.Spec.Volumes = append(d.Spec.Template.Spec.Volumes, api.Volume{ d.Spec.Template.Spec.Volumes = append(d.Spec.Template.Spec.Volumes, v1.Volume{
Name: "tiller-certs", Name: "tiller-certs",
VolumeSource: api.VolumeSource{ VolumeSource: v1.VolumeSource{
Secret: &api.SecretVolumeSource{ Secret: &v1.SecretVolumeSource{
SecretName: "tiller-secret", SecretName: "tiller-secret",
}, },
}, },
...@@ -210,17 +207,17 @@ func generateDeployment(opts *Options) *extensions.Deployment { ...@@ -210,17 +207,17 @@ func generateDeployment(opts *Options) *extensions.Deployment {
return d return d
} }
func generateService(namespace string) *api.Service { func generateService(namespace string) *v1.Service {
labels := generateLabels(map[string]string{"name": "tiller"}) labels := generateLabels(map[string]string{"name": "tiller"})
s := &api.Service{ s := &v1.Service{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Namespace: namespace, Namespace: namespace,
Name: serviceName, Name: serviceName,
Labels: labels, Labels: labels,
}, },
Spec: api.ServiceSpec{ Spec: v1.ServiceSpec{
Type: api.ServiceTypeClusterIP, Type: v1.ServiceTypeClusterIP,
Ports: []api.ServicePort{ Ports: []v1.ServicePort{
{ {
Name: "tiller", Name: "tiller",
Port: 44134, Port: 44134,
...@@ -244,7 +241,7 @@ func SecretManifest(opts *Options) (string, error) { ...@@ -244,7 +241,7 @@ func SecretManifest(opts *Options) (string, error) {
} }
// createSecret creates the Tiller secret resource. // createSecret creates the Tiller secret resource.
func createSecret(client internalversion.SecretsGetter, opts *Options) error { func createSecret(client corev1.SecretsGetter, opts *Options) error {
o, err := generateSecret(opts) o, err := generateSecret(opts)
if err != nil { if err != nil {
return err return err
...@@ -254,12 +251,12 @@ func createSecret(client internalversion.SecretsGetter, opts *Options) error { ...@@ -254,12 +251,12 @@ func createSecret(client internalversion.SecretsGetter, opts *Options) error {
} }
// generateSecret builds the secret object that hold Tiller secrets. // generateSecret builds the secret object that hold Tiller secrets.
func generateSecret(opts *Options) (*api.Secret, error) { func generateSecret(opts *Options) (*v1.Secret, error) {
const secretName = "tiller-secret" const secretName = "tiller-secret"
labels := generateLabels(map[string]string{"name": "tiller"}) labels := generateLabels(map[string]string{"name": "tiller"})
secret := &api.Secret{ secret := &v1.Secret{
Type: api.SecretTypeOpaque, Type: v1.SecretTypeOpaque,
Data: make(map[string][]byte), Data: make(map[string][]byte),
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: secretName, Name: secretName,
......
cmd/helm/installer/install_test.go
View file @ 9f9b3e87
...@@ -25,10 +25,10 @@ import ( ...@@ -25,10 +25,10 @@ import (
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/pkg/apis/extensions/v1beta1"
testcore "k8s.io/client-go/testing" testcore "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
"k8s.io/helm/pkg/version" "k8s.io/helm/pkg/version"
) )
...@@ -39,7 +39,7 @@ func TestDeploymentManifest(t *testing.T) { ...@@ -39,7 +39,7 @@ func TestDeploymentManifest(t *testing.T) {
image string image string
canary bool canary bool
expect string expect string
imagePullPolicy api.PullPolicy imagePullPolicy v1.PullPolicy
}{ }{
{"default", "", false, "gcr.io/kubernetes-helm/tiller:" + version.Version, "IfNotPresent"}, {"default", "", false, "gcr.io/kubernetes-helm/tiller:" + version.Version, "IfNotPresent"},
{"canary", "example.com/tiller", true, "gcr.io/kubernetes-helm/tiller:canary", "Always"}, {"canary", "example.com/tiller", true, "gcr.io/kubernetes-helm/tiller:canary", "Always"},
...@@ -47,11 +47,11 @@ func TestDeploymentManifest(t *testing.T) { ...@@ -47,11 +47,11 @@ func TestDeploymentManifest(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
o, err := DeploymentManifest(&Options{Namespace: api.NamespaceDefault, ImageSpec: tt.image, UseCanary: tt.canary}) o, err := DeploymentManifest(&Options{Namespace: v1.NamespaceDefault, ImageSpec: tt.image, UseCanary: tt.canary})
if err != nil { if err != nil {
t.Fatalf("%s: error %q", tt.name, err) t.Fatalf("%s: error %q", tt.name, err)
} }
var dep extensions.Deployment var dep v1beta1.Deployment
if err := yaml.Unmarshal([]byte(o), &dep); err != nil { if err := yaml.Unmarshal([]byte(o), &dep); err != nil {
t.Fatalf("%s: error %q", tt.name, err) t.Fatalf("%s: error %q", tt.name, err)
} }
...@@ -64,8 +64,8 @@ func TestDeploymentManifest(t *testing.T) { ...@@ -64,8 +64,8 @@ func TestDeploymentManifest(t *testing.T) {
t.Errorf("%s: expected imagePullPolicy %q, got %q", tt.name, tt.imagePullPolicy, got) t.Errorf("%s: expected imagePullPolicy %q, got %q", tt.name, tt.imagePullPolicy, got)
} }
if got := dep.Spec.Template.Spec.Containers[0].Env[0].Value; got != api.NamespaceDefault { if got := dep.Spec.Template.Spec.Containers[0].Env[0].Value; got != v1.NamespaceDefault {
t.Errorf("%s: expected namespace %q, got %q", tt.name, api.NamespaceDefault, got) t.Errorf("%s: expected namespace %q, got %q", tt.name, v1.NamespaceDefault, got)
} }
} }
} }
...@@ -76,19 +76,19 @@ func TestDeploymentManifestForServiceAccount(t *testing.T) { ...@@ -76,19 +76,19 @@ func TestDeploymentManifestForServiceAccount(t *testing.T) {
image string image string
canary bool canary bool
expect string expect string
imagePullPolicy api.PullPolicy imagePullPolicy v1.PullPolicy
serviceAccount string serviceAccount string
}{ }{
{"withSA", "", false, "gcr.io/kubernetes-helm/tiller:latest", "IfNotPresent", "service-account"}, {"withSA", "", false, "gcr.io/kubernetes-helm/tiller:latest", "IfNotPresent", "service-account"},
{"withoutSA", "", false, "gcr.io/kubernetes-helm/tiller:latest", "IfNotPresent", ""}, {"withoutSA", "", false, "gcr.io/kubernetes-helm/tiller:latest", "IfNotPresent", ""},
} }
for _, tt := range tests { for _, tt := range tests {
o, err := DeploymentManifest(&Options{Namespace: api.NamespaceDefault, ImageSpec: tt.image, UseCanary: tt.canary, ServiceAccount: tt.serviceAccount}) o, err := DeploymentManifest(&Options{Namespace: v1.NamespaceDefault, ImageSpec: tt.image, UseCanary: tt.canary, ServiceAccount: tt.serviceAccount})
if err != nil { if err != nil {
t.Fatalf("%s: error %q", tt.name, err) t.Fatalf("%s: error %q", tt.name, err)
} }
var d extensions.Deployment var d v1beta1.Deployment
if err := yaml.Unmarshal([]byte(o), &d); err != nil { if err := yaml.Unmarshal([]byte(o), &d); err != nil {
t.Fatalf("%s: error %q", tt.name, err) t.Fatalf("%s: error %q", tt.name, err)
} }
...@@ -106,19 +106,19 @@ func TestDeploymentManifest_WithTLS(t *testing.T) { ...@@ -106,19 +106,19 @@ func TestDeploymentManifest_WithTLS(t *testing.T) {
verify string verify string
}{ }{
{ {
Options{Namespace: api.NamespaceDefault, EnableTLS: true, VerifyTLS: true}, Options{Namespace: v1.NamespaceDefault, EnableTLS: true, VerifyTLS: true},
"tls enable (true), tls verify (true)", "tls enable (true), tls verify (true)",
"1", "1",
"1", "1",
}, },
{ {
Options{Namespace: api.NamespaceDefault, EnableTLS: true, VerifyTLS: false}, Options{Namespace: v1.NamespaceDefault, EnableTLS: true, VerifyTLS: false},
"tls enable (true), tls verify (false)", "tls enable (true), tls verify (false)",
"1", "1",
"", "",
}, },
{ {
Options{Namespace: api.NamespaceDefault, EnableTLS: false, VerifyTLS: true}, Options{Namespace: v1.NamespaceDefault, EnableTLS: false, VerifyTLS: true},
"tls enable (false), tls verify (true)", "tls enable (false), tls verify (true)",
"1", "1",
"1", "1",
...@@ -130,7 +130,7 @@ func TestDeploymentManifest_WithTLS(t *testing.T) { ...@@ -130,7 +130,7 @@ func TestDeploymentManifest_WithTLS(t *testing.T) {
t.Fatalf("%s: error %q", tt.name, err) t.Fatalf("%s: error %q", tt.name, err)
} }
var d extensions.Deployment var d v1beta1.Deployment
if err := yaml.Unmarshal([]byte(o), &d); err != nil { if err := yaml.Unmarshal([]byte(o), &d); err != nil {
t.Fatalf("%s: error %q", tt.name, err) t.Fatalf("%s: error %q", tt.name, err)
} }
...@@ -145,17 +145,17 @@ func TestDeploymentManifest_WithTLS(t *testing.T) { ...@@ -145,17 +145,17 @@ func TestDeploymentManifest_WithTLS(t *testing.T) {
} }
func TestServiceManifest(t *testing.T) { func TestServiceManifest(t *testing.T) {
o, err := ServiceManifest(api.NamespaceDefault) o, err := ServiceManifest(v1.NamespaceDefault)
if err != nil { if err != nil {
t.Fatalf("error %q", err) t.Fatalf("error %q", err)
} }
var svc api.Service var svc v1.Service
if err := yaml.Unmarshal([]byte(o), &svc); err != nil { if err := yaml.Unmarshal([]byte(o), &svc); err != nil {
t.Fatalf("error %q", err) t.Fatalf("error %q", err)
} }
if got := svc.ObjectMeta.Namespace; got != api.NamespaceDefault { if got := svc.ObjectMeta.Namespace; got != v1.NamespaceDefault {
t.Errorf("expected namespace %s, got %s", api.NamespaceDefault, got) t.Errorf("expected namespace %s, got %s", v1.NamespaceDefault, got)
} }
} }
...@@ -163,7 +163,7 @@ func TestSecretManifest(t *testing.T) { ...@@ -163,7 +163,7 @@ func TestSecretManifest(t *testing.T) {
o, err := SecretManifest(&Options{ o, err := SecretManifest(&Options{
VerifyTLS: true, VerifyTLS: true,
EnableTLS: true, EnableTLS: true,
Namespace: api.NamespaceDefault, Namespace: v1.NamespaceDefault,
TLSKeyFile: tlsTestFile(t, "key.pem"), TLSKeyFile: tlsTestFile(t, "key.pem"),
TLSCertFile: tlsTestFile(t, "crt.pem"), TLSCertFile: tlsTestFile(t, "crt.pem"),
TLSCaCertFile: tlsTestFile(t, "ca.pem"), TLSCaCertFile: tlsTestFile(t, "ca.pem"),
...@@ -173,13 +173,13 @@ func TestSecretManifest(t *testing.T) { ...@@ -173,13 +173,13 @@ func TestSecretManifest(t *testing.T) {
t.Fatalf("error %q", err) t.Fatalf("error %q", err)
} }
var obj api.Secret var obj v1.Secret
if err := yaml.Unmarshal([]byte(o), &obj); err != nil { if err := yaml.Unmarshal([]byte(o), &obj); err != nil {
t.Fatalf("error %q", err) t.Fatalf("error %q", err)
} }
if got := obj.ObjectMeta.Namespace; got != api.NamespaceDefault { if got := obj.ObjectMeta.Namespace; got != v1.NamespaceDefault {
t.Errorf("expected namespace %s, got %s", api.NamespaceDefault, got) t.Errorf("expected namespace %s, got %s", v1.NamespaceDefault, got)
} }
if _, ok := obj.Data["tls.key"]; !ok { if _, ok := obj.Data["tls.key"]; !ok {
t.Errorf("missing 'tls.key' in generated secret object") t.Errorf("missing 'tls.key' in generated secret object")
...@@ -197,7 +197,7 @@ func TestInstall(t *testing.T) { ...@@ -197,7 +197,7 @@ func TestInstall(t *testing.T) {
fc := &fake.Clientset{} fc := &fake.Clientset{}
fc.AddReactor("create", "deployments", func(action testcore.Action) (bool, runtime.Object, error) { fc.AddReactor("create", "deployments", func(action testcore.Action) (bool, runtime.Object, error) {
obj := action.(testcore.CreateAction).GetObject().(*extensions.Deployment) obj := action.(testcore.CreateAction).GetObject().(*v1beta1.Deployment)
l := obj.GetLabels() l := obj.GetLabels()
if reflect.DeepEqual(l, map[string]string{"app": "helm"}) { if reflect.DeepEqual(l, map[string]string{"app": "helm"}) {
t.Errorf("expected labels = '', got '%s'", l) t.Errorf("expected labels = '', got '%s'", l)
...@@ -209,19 +209,19 @@ func TestInstall(t *testing.T) { ...@@ -209,19 +209,19 @@ func TestInstall(t *testing.T) {
return true, obj, nil return true, obj, nil
}) })
fc.AddReactor("create", "services", func(action testcore.Action) (bool, runtime.Object, error) { fc.AddReactor("create", "services", func(action testcore.Action) (bool, runtime.Object, error) {
obj := action.(testcore.CreateAction).GetObject().(*api.Service) obj := action.(testcore.CreateAction).GetObject().(*v1.Service)
l := obj.GetLabels() l := obj.GetLabels()
if reflect.DeepEqual(l, map[string]string{"app": "helm"}) { if reflect.DeepEqual(l, map[string]string{"app": "helm"}) {
t.Errorf("expected labels = '', got '%s'", l) t.Errorf("expected labels = '', got '%s'", l)
} }
n := obj.ObjectMeta.Namespace n := obj.ObjectMeta.Namespace
if n != api.NamespaceDefault { if n != v1.NamespaceDefault {
t.Errorf("expected namespace = '%s', got '%s'", api.NamespaceDefault, n) t.Errorf("expected namespace = '%s', got '%s'", v1.NamespaceDefault, n)
} }
return true, obj, nil return true, obj, nil
}) })
opts := &Options{Namespace: api.NamespaceDefault, ImageSpec: image} opts := &Options{Namespace: v1.NamespaceDefault, ImageSpec: image}
if err := Install(fc, opts); err != nil { if err := Install(fc, opts); err != nil {
t.Errorf("unexpected error: %#+v", err) t.Errorf("unexpected error: %#+v", err)
} }
...@@ -237,7 +237,7 @@ func TestInstall_WithTLS(t *testing.T) { ...@@ -237,7 +237,7 @@ func TestInstall_WithTLS(t *testing.T) {
fc := &fake.Clientset{} fc := &fake.Clientset{}
fc.AddReactor("create", "deployments", func(action testcore.Action) (bool, runtime.Object, error) { fc.AddReactor("create", "deployments", func(action testcore.Action) (bool, runtime.Object, error) {
obj := action.(testcore.CreateAction).GetObject().(*extensions.Deployment) obj := action.(testcore.CreateAction).GetObject().(*v1beta1.Deployment)
l := obj.GetLabels() l := obj.GetLabels()
if reflect.DeepEqual(l, map[string]string{"app": "helm"}) { if reflect.DeepEqual(l, map[string]string{"app": "helm"}) {
t.Errorf("expected labels = '', got '%s'", l) t.Errorf("expected labels = '', got '%s'", l)
...@@ -249,24 +249,24 @@ func TestInstall_WithTLS(t *testing.T) { ...@@ -249,24 +249,24 @@ func TestInstall_WithTLS(t *testing.T) {
return true, obj, nil return true, obj, nil
}) })
fc.AddReactor("create", "services", func(action testcore.Action) (bool, runtime.Object, error) { fc.AddReactor("create", "services", func(action testcore.Action) (bool, runtime.Object, error) {
obj := action.(testcore.CreateAction).GetObject().(*api.Service) obj := action.(testcore.CreateAction).GetObject().(*v1.Service)
l := obj.GetLabels() l := obj.GetLabels()
if reflect.DeepEqual(l, map[string]string{"app": "helm"}) { if reflect.DeepEqual(l, map[string]string{"app": "helm"}) {
t.Errorf("expected labels = '', got '%s'", l) t.Errorf("expected labels = '', got '%s'", l)
} }
n := obj.ObjectMeta.Namespace n := obj.ObjectMeta.Namespace
if n != api.NamespaceDefault { if n != v1.NamespaceDefault {
t.Errorf("expected namespace = '%s', got '%s'", api.NamespaceDefault, n) t.Errorf("expected namespace = '%s', got '%s'", v1.NamespaceDefault, n)
} }
return true, obj, nil return true, obj, nil
}) })
fc.AddReactor("create", "secrets", func(action testcore.Action) (bool, runtime.Object, error) { fc.AddReactor("create", "secrets", func(action testcore.Action) (bool, runtime.Object, error) {
obj := action.(testcore.CreateAction).GetObject().(*api.Secret) obj := action.(testcore.CreateAction).GetObject().(*v1.Secret)
if l := obj.GetLabels(); reflect.DeepEqual(l, map[string]string{"app": "helm"}) { if l := obj.GetLabels(); reflect.DeepEqual(l, map[string]string{"app": "helm"}) {
t.Errorf("expected labels = '', got '%s'", l) t.Errorf("expected labels = '', got '%s'", l)
} }
if n := obj.ObjectMeta.Namespace; n != api.NamespaceDefault { if n := obj.ObjectMeta.Namespace; n != v1.NamespaceDefault {
t.Errorf("expected namespace = '%s', got '%s'", api.NamespaceDefault, n) t.Errorf("expected namespace = '%s', got '%s'", v1.NamespaceDefault, n)
} }
if s := obj.ObjectMeta.Name; s != name { if s := obj.ObjectMeta.Name; s != name {
t.Errorf("expected name = '%s', got '%s'", name, s) t.Errorf("expected name = '%s', got '%s'", name, s)
...@@ -284,7 +284,7 @@ func TestInstall_WithTLS(t *testing.T) { ...@@ -284,7 +284,7 @@ func TestInstall_WithTLS(t *testing.T) {
}) })
opts := &Options{ opts := &Options{
Namespace: api.NamespaceDefault, Namespace: v1.NamespaceDefault,
ImageSpec: image, ImageSpec: image,
EnableTLS: true, EnableTLS: true,
VerifyTLS: true, VerifyTLS: true,
...@@ -305,7 +305,7 @@ func TestInstall_WithTLS(t *testing.T) { ...@@ -305,7 +305,7 @@ func TestInstall_WithTLS(t *testing.T) {
func TestInstall_canary(t *testing.T) { func TestInstall_canary(t *testing.T) {
fc := &fake.Clientset{} fc := &fake.Clientset{}
fc.AddReactor("create", "deployments", func(action testcore.Action) (bool, runtime.Object, error) { fc.AddReactor("create", "deployments", func(action testcore.Action) (bool, runtime.Object, error) {
obj := action.(testcore.CreateAction).GetObject().(*extensions.Deployment) obj := action.(testcore.CreateAction).GetObject().(*v1beta1.Deployment)
i := obj.Spec.Template.Spec.Containers[0].Image i := obj.Spec.Template.Spec.Containers[0].Image
if i != "gcr.io/kubernetes-helm/tiller:canary" { if i != "gcr.io/kubernetes-helm/tiller:canary" {
t.Errorf("expected canary image, got '%s'", i) t.Errorf("expected canary image, got '%s'", i)
...@@ -313,11 +313,11 @@ func TestInstall_canary(t *testing.T) { ...@@ -313,11 +313,11 @@ func TestInstall_canary(t *testing.T) {
return true, obj, nil return true, obj, nil
}) })
fc.AddReactor("create", "services", func(action testcore.Action) (bool, runtime.Object, error) { fc.AddReactor("create", "services", func(action testcore.Action) (bool, runtime.Object, error) {
obj := action.(testcore.CreateAction).GetObject().(*api.Service) obj := action.(testcore.CreateAction).GetObject().(*v1.Service)
return true, obj, nil return true, obj, nil
}) })
opts := &Options{Namespace: api.NamespaceDefault, UseCanary: true} opts := &Options{Namespace: v1.NamespaceDefault, UseCanary: true}
if err := Install(fc, opts); err != nil { if err := Install(fc, opts); err != nil {
t.Errorf("unexpected error: %#+v", err) t.Errorf("unexpected error: %#+v", err)
} }
...@@ -331,19 +331,19 @@ func TestUpgrade(t *testing.T) { ...@@ -331,19 +331,19 @@ func TestUpgrade(t *testing.T) {
image := "gcr.io/kubernetes-helm/tiller:v2.0.0" image := "gcr.io/kubernetes-helm/tiller:v2.0.0"
serviceAccount := "newServiceAccount" serviceAccount := "newServiceAccount"
existingDeployment := deployment(&Options{ existingDeployment := deployment(&Options{
Namespace: api.NamespaceDefault, Namespace: v1.NamespaceDefault,
ImageSpec: "imageToReplace", ImageSpec: "imageToReplace",
ServiceAccount: "serviceAccountToReplace", ServiceAccount: "serviceAccountToReplace",
UseCanary: false, UseCanary: false,
}) })
existingService := service(api.NamespaceDefault) existingService := service(v1.NamespaceDefault)
fc := &fake.Clientset{} fc := &fake.Clientset{}
fc.AddReactor("get", "deployments", func(action testcore.Action) (bool, runtime.Object, error) { fc.AddReactor("get", "deployments", func(action testcore.Action) (bool, runtime.Object, error) {
return true, existingDeployment, nil return true, existingDeployment, nil
}) })
fc.AddReactor("update", "deployments", func(action testcore.Action) (bool, runtime.Object, error) { fc.AddReactor("update", "deployments", func(action testcore.Action) (bool, runtime.Object, error) {
obj := action.(testcore.UpdateAction).GetObject().(*extensions.Deployment) obj := action.(testcore.UpdateAction).GetObject().(*v1beta1.Deployment)
i := obj.Spec.Template.Spec.Containers[0].Image i := obj.Spec.Template.Spec.Containers[0].Image
if i != image { if i != image {
t.Errorf("expected image = '%s', got '%s'", image, i) t.Errorf("expected image = '%s', got '%s'", image, i)
...@@ -358,7 +358,7 @@ func TestUpgrade(t *testing.T) { ...@@ -358,7 +358,7 @@ func TestUpgrade(t *testing.T) {
return true, existingService, nil return true, existingService, nil
}) })
opts := &Options{Namespace: api.NamespaceDefault, ImageSpec: image, ServiceAccount: serviceAccount} opts := &Options{Namespace: v1.NamespaceDefault, ImageSpec: image, ServiceAccount: serviceAccount}
if err := Upgrade(fc, opts); err != nil { if err := Upgrade(fc, opts); err != nil {
t.Errorf("unexpected error: %#+v", err) t.Errorf("unexpected error: %#+v", err)
} }
...@@ -372,7 +372,7 @@ func TestUpgrade_serviceNotFound(t *testing.T) { ...@@ -372,7 +372,7 @@ func TestUpgrade_serviceNotFound(t *testing.T) {
image := "gcr.io/kubernetes-helm/tiller:v2.0.0" image := "gcr.io/kubernetes-helm/tiller:v2.0.0"
existingDeployment := deployment(&Options{ existingDeployment := deployment(&Options{
Namespace: api.NamespaceDefault, Namespace: v1.NamespaceDefault,
ImageSpec: "imageToReplace", ImageSpec: "imageToReplace",
UseCanary: false, UseCanary: false,
}) })
...@@ -382,7 +382,7 @@ func TestUpgrade_serviceNotFound(t *testing.T) { ...@@ -382,7 +382,7 @@ func TestUpgrade_serviceNotFound(t *testing.T) {
return true, existingDeployment, nil return true, existingDeployment, nil
}) })
fc.AddReactor("update", "deployments", func(action testcore.Action) (bool, runtime.Object, error) { fc.AddReactor("update", "deployments", func(action testcore.Action) (bool, runtime.Object, error) {
obj := action.(testcore.UpdateAction).GetObject().(*extensions.Deployment) obj := action.(testcore.UpdateAction).GetObject().(*v1beta1.Deployment)
i := obj.Spec.Template.Spec.Containers[0].Image i := obj.Spec.Template.Spec.Containers[0].Image
if i != image { if i != image {
t.Errorf("expected image = '%s', got '%s'", image, i) t.Errorf("expected image = '%s', got '%s'", image, i)
...@@ -390,18 +390,18 @@ func TestUpgrade_serviceNotFound(t *testing.T) { ...@@ -390,18 +390,18 @@ func TestUpgrade_serviceNotFound(t *testing.T) {
return true, obj, nil return true, obj, nil
}) })
fc.AddReactor("get", "services", func(action testcore.Action) (bool, runtime.Object, error) { fc.AddReactor("get", "services", func(action testcore.Action) (bool, runtime.Object, error) {
return true, nil, apierrors.NewNotFound(api.Resource("services"), "1") return true, nil, apierrors.NewNotFound(v1.Resource("services"), "1")
}) })
fc.AddReactor("create", "services", func(action testcore.Action) (bool, runtime.Object, error) { fc.AddReactor("create", "services", func(action testcore.Action) (bool, runtime.Object, error) {
obj := action.(testcore.CreateAction).GetObject().(*api.Service) obj := action.(testcore.CreateAction).GetObject().(*v1.Service)
n := obj.ObjectMeta.Namespace n := obj.ObjectMeta.Namespace
if n != api.NamespaceDefault { if n != v1.NamespaceDefault {
t.Errorf("expected namespace = '%s', got '%s'", api.NamespaceDefault, n) t.Errorf("expected namespace = '%s', got '%s'", v1.NamespaceDefault, n)
} }
return true, obj, nil return true, obj, nil
}) })
opts := &Options{Namespace: api.NamespaceDefault, ImageSpec: image} opts := &Options{Namespace: v1.NamespaceDefault, ImageSpec: image}
if err := Upgrade(fc, opts); err != nil { if err := Upgrade(fc, opts); err != nil {
t.Errorf("unexpected error: %#+v", err) t.Errorf("unexpected error: %#+v", err)
} }
......
cmd/helm/installer/options.go
View file @ 9f9b3e87
...@@ -19,8 +19,8 @@ package installer // import "k8s.io/helm/cmd/helm/installer" ...@@ -19,8 +19,8 @@ package installer // import "k8s.io/helm/cmd/helm/installer"
import ( import (
"fmt" "fmt"
"k8s.io/client-go/pkg/api/v1"
"k8s.io/helm/pkg/version" "k8s.io/helm/pkg/version"
"k8s.io/kubernetes/pkg/api"
) )
const defaultImage = "gcr.io/kubernetes-helm/tiller" const defaultImage = "gcr.io/kubernetes-helm/tiller"
...@@ -84,11 +84,11 @@ func (opts *Options) selectImage() string { ...@@ -84,11 +84,11 @@ func (opts *Options) selectImage() string {
} }
} }
func (opts *Options) pullPolicy() api.PullPolicy { func (opts *Options) pullPolicy() v1.PullPolicy {
if opts.UseCanary { if opts.UseCanary {
return api.PullAlways return v1.PullAlways
} }
return api.PullIfNotPresent return v1.PullIfNotPresent
} }
func (opts *Options) tls() bool { return opts.EnableTLS || opts.VerifyTLS } func (opts *Options) tls() bool { return opts.EnableTLS || opts.VerifyTLS }
cmd/helm/installer/uninstall.go
View file @ 9f9b3e87
...@@ -19,9 +19,9 @@ package installer // import "k8s.io/helm/cmd/helm/installer" ...@@ -19,9 +19,9 @@ package installer // import "k8s.io/helm/cmd/helm/installer"
import ( import (
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/client-go/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
"k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl"
) )
...@@ -39,7 +39,7 @@ func Uninstall(client internalclientset.Interface, opts *Options) error { ...@@ -39,7 +39,7 @@ func Uninstall(client internalclientset.Interface, opts *Options) error {
} }
// deleteService deletes the Tiller Service resource // deleteService deletes the Tiller Service resource
func deleteService(client internalversion.ServicesGetter, namespace string) error { func deleteService(client coreclient.ServicesGetter, namespace string) error {
err := client.Services(namespace).Delete(serviceName, &metav1.DeleteOptions{}) err := client.Services(namespace).Delete(serviceName, &metav1.DeleteOptions{})
return ingoreNotFound(err) return ingoreNotFound(err)
} }
......
cmd/helm/reset.go
View file @ 9f9b3e87
...@@ -86,7 +86,7 @@ func newResetCmd(client helm.Interface, out io.Writer) *cobra.Command { ...@@ -86,7 +86,7 @@ func newResetCmd(client helm.Interface, out io.Writer) *cobra.Command {
// runReset uninstalls tiller from Kubernetes Cluster and deletes local config // runReset uninstalls tiller from Kubernetes Cluster and deletes local config
func (d *resetCmd) run() error { func (d *resetCmd) run() error {
if d.kubeClient == nil { if d.kubeClient == nil {
_, c, err := getKubeClient(kubeContext) _, c, err := getInternalKubeClient(kubeContext)
if err != nil { if err != nil {
return fmt.Errorf("could not get kubernetes client: %s", err) return fmt.Errorf("could not get kubernetes client: %s", err)
} }
......
pkg/helm/portforwarder/pod.go 0 → 100644
View file @ 9f9b3e87
/*
Copyright 2016 The Kubernetes Authors All rights reserved.
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.
*/
package portforwarder
import (
"k8s.io/client-go/pkg/api/v1"
)
// These functions are adapted from the "kubernetes" repository's file
//
// kubernetes/pkg/api/v1/pod/util.go
//
// where they rely upon the API types specific to that repository. Here we recast them to operate
// upon the type from the "client-go" repository instead.
// isPodReady returns true if a pod is ready; false otherwise.
func isPodReady(pod *v1.Pod) bool {
return isPodReadyConditionTrue(pod.Status)
}
// isPodReady retruns true if a pod is ready; false otherwise.
func isPodReadyConditionTrue(status v1.PodStatus) bool {
condition := getPodReadyCondition(status)
return condition != nil && condition.Status == v1.ConditionTrue
}
// getPodReadyCondition extracts the pod ready condition from the given status and returns that.
// Returns nil if the condition is not present.
func getPodReadyCondition(status v1.PodStatus) *v1.PodCondition {
_, condition := getPodCondition(&status, v1.PodReady)
return condition
}
// getPodCondition extracts the provided condition from the given status and returns that.
// Returns nil and -1 if the condition is not present, and the index of the located condition.
func getPodCondition(status *v1.PodStatus, conditionType v1.PodConditionType) (int, *v1.PodCondition) {
if status == nil {
return -1, nil
}
for i := range status.Conditions {
if status.Conditions[i].Type == conditionType {
return i, &status.Conditions[i]
}
}
return -1, nil
}
pkg/helm/portforwarder/portforwarder.go
View file @ 9f9b3e87
...@@ -21,17 +21,17 @@ import ( ...@@ -21,17 +21,17 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/kubernetes"
corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
"k8s.io/helm/pkg/kube" "k8s.io/helm/pkg/kube"
) )
// New creates a new and initialized tunnel. // New creates a new and initialized tunnel.
func New(namespace string, client *internalclientset.Clientset, config *rest.Config) (*kube.Tunnel, error) { func New(namespace string, client kubernetes.Interface, config *rest.Config) (*kube.Tunnel, error) {
podName, err := getTillerPodName(client.Core(), namespace) podName, err := getTillerPodName(client.CoreV1(), namespace)
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -40,7 +40,7 @@ func New(namespace string, client *internalclientset.Clientset, config *rest.Con ...@@ -40,7 +40,7 @@ func New(namespace string, client *internalclientset.Clientset, config *rest.Con
return t, t.ForwardPort() return t, t.ForwardPort()
} }
func getTillerPodName(client internalversion.PodsGetter, namespace string) (string, error) { func getTillerPodName(client corev1.PodsGetter, namespace string) (string, error) {
// TODO use a const for labels // TODO use a const for labels
selector := labels.Set{"app": "helm", "name": "tiller"}.AsSelector() selector := labels.Set{"app": "helm", "name": "tiller"}.AsSelector()
pod, err := getFirstRunningPod(client, namespace, selector) pod, err := getFirstRunningPod(client, namespace, selector)
...@@ -50,7 +50,7 @@ func getTillerPodName(client internalversion.PodsGetter, namespace string) (stri ...@@ -50,7 +50,7 @@ func getTillerPodName(client internalversion.PodsGetter, namespace string) (stri
return pod.ObjectMeta.GetName(), nil return pod.ObjectMeta.GetName(), nil
} }
func getFirstRunningPod(client internalversion.PodsGetter, namespace string, selector labels.Selector) (*api.Pod, error) { func getFirstRunningPod(client corev1.PodsGetter, namespace string, selector labels.Selector) (*v1.Pod, error) {
options := metav1.ListOptions{LabelSelector: selector.String()} options := metav1.ListOptions{LabelSelector: selector.String()}
pods, err := client.Pods(namespace).List(options) pods, err := client.Pods(namespace).List(options)
if err != nil { if err != nil {
...@@ -60,7 +60,7 @@ func getFirstRunningPod(client internalversion.PodsGetter, namespace string, sel ...@@ -60,7 +60,7 @@ func getFirstRunningPod(client internalversion.PodsGetter, namespace string, sel
return nil, fmt.Errorf("could not find tiller") return nil, fmt.Errorf("could not find tiller")
} }
for _, p := range pods.Items { for _, p := range pods.Items {
if api.IsPodReady(&p) { if isPodReady(&p) {
return &p, nil return &p, nil
} }
} }
......
pkg/helm/portforwarder/portforwarder_test.go
View file @ 9f9b3e87
...@@ -20,63 +20,63 @@ import ( ...@@ -20,63 +20,63 @@ import (
"testing" "testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api" "k8s.io/client-go/kubernetes/fake"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" "k8s.io/client-go/pkg/api/v1"
) )
func mockTillerPod() api.Pod { func mockTillerPod() v1.Pod {
return api.Pod{ return v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "orca", Name: "orca",
Namespace: api.NamespaceDefault, Namespace: v1.NamespaceDefault,
Labels: map[string]string{"app": "helm", "name": "tiller"}, Labels: map[string]string{"app": "helm", "name": "tiller"},
}, },
Status: api.PodStatus{ Status: v1.PodStatus{
Phase: api.PodRunning, Phase: v1.PodRunning,
Conditions: []api.PodCondition{ Conditions: []v1.PodCondition{
{ {
Status: api.ConditionTrue, Status: v1.ConditionTrue,
Type: api.PodReady, Type: v1.PodReady,
}, },
}, },
}, },
} }
} }
func mockTillerPodPending() api.Pod { func mockTillerPodPending() v1.Pod {
p := mockTillerPod() p := mockTillerPod()
p.Name = "blue" p.Name = "blue"
p.Status.Conditions[0].Status = api.ConditionFalse p.Status.Conditions[0].Status = v1.ConditionFalse
return p return p
} }
func TestGetFirstPod(t *testing.T) { func TestGetFirstPod(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
pods []api.Pod pods []v1.Pod
expected string expected string
err bool err bool
}{ }{
{ {
name: "with a ready pod", name: "with a ready pod",
pods: []api.Pod{mockTillerPod()}, pods: []v1.Pod{mockTillerPod()},
expected: "orca", expected: "orca",
}, },
{ {
name: "without a ready pod", name: "without a ready pod",
pods: []api.Pod{mockTillerPodPending()}, pods: []v1.Pod{mockTillerPodPending()},
err: true, err: true,
}, },
{ {
name: "without a pod", name: "without a pod",
pods: []api.Pod{}, pods: []v1.Pod{},
err: true, err: true,
}, },
} }
for _, tt := range tests { for _, tt := range tests {
client := fake.NewSimpleClientset(&api.PodList{Items: tt.pods}) client := fake.NewSimpleClientset(&v1.PodList{Items: tt.pods})
name, err := getTillerPodName(client.Core(), api.NamespaceDefault) name, err := getTillerPodName(client.Core(), v1.NamespaceDefault)
if (err != nil) != tt.err { if (err != nil) != tt.err {
t.Errorf("%q. expected error: %v, got %v", tt.name, tt.err, err) t.Errorf("%q. expected error: %v, got %v", tt.name, tt.err, err)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment