From db3663978ea488ab37f5768152523f14dc85eeb6 Mon Sep 17 00:00:00 2001 From: Michael Schmidt Date: Fri, 12 Jan 2018 13:41:48 +0100 Subject: [PATCH] fixes manifest/api-group foo --- pkg/controller/ground/bootstrap/dns/dns.go | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkg/controller/ground/bootstrap/dns/dns.go b/pkg/controller/ground/bootstrap/dns/dns.go index 8bf72c06828..ce4c48d669d 100644 --- a/pkg/controller/ground/bootstrap/dns/dns.go +++ b/pkg/controller/ground/bootstrap/dns/dns.go @@ -6,8 +6,8 @@ import ( "fmt" "html/template" - apps "k8s.io/api/apps/v1beta1" "k8s.io/api/core/v1" + extensions "k8s.io/api/extensions/v1beta1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/serializer" @@ -135,38 +135,36 @@ func createKubeDNSService(client clientset.Interface, clusterIP string) error { return nil } -func getKubeDNSDeployment(options *DeploymentOptions) (*apps.Deployment, error) { +func getKubeDNSDeployment(options *DeploymentOptions) (*extensions.Deployment, error) { manifest := KubeDNSDeployment_v20171016 - deployment := &apps.Deployment{} template, err := RenderManifest(manifest, options) if err != nil { return nil, err } - _, _, err = serializer.NewCodecFactory(clientsetscheme.Scheme).UniversalDeserializer().Decode(template, nil, deployment) + deployment, _, err := serializer.NewCodecFactory(clientsetscheme.Scheme).UniversalDeserializer().Decode(template, nil, &extensions.Deployment{}) if err != nil { return nil, err } - return deployment, nil + return deployment.(*extensions.Deployment), nil } func getKubeDNSService(options *ServiceOptions) (*v1.Service, error) { manifest := KubeDNSService_v20171016 - service := &v1.Service{} template, err := RenderManifest(manifest, options) if err != nil { return nil, err } - _, _, err = serializer.NewCodecFactory(clientsetscheme.Scheme).UniversalDeserializer().Decode(template, nil, service) + service, _, err := serializer.NewCodecFactory(clientsetscheme.Scheme).UniversalDeserializer().Decode(template, nil, &v1.Service{}) if err != nil { return nil, err } - return service, nil + return service.(*v1.Service), nil } func CreateOrUpdateServiceAccount(client clientset.Interface, sa *v1.ServiceAccount) error { @@ -178,13 +176,13 @@ func CreateOrUpdateServiceAccount(client clientset.Interface, sa *v1.ServiceAcco return nil } -func CreateOrUpdateDeployment(client clientset.Interface, deploy *apps.Deployment) error { - if _, err := client.AppsV1beta1().Deployments(deploy.ObjectMeta.Namespace).Create(deploy); err != nil { +func CreateOrUpdateDeployment(client clientset.Interface, deploy *extensions.Deployment) error { + if _, err := client.ExtensionsV1beta1().Deployments(deploy.ObjectMeta.Namespace).Create(deploy); err != nil { if !apierrors.IsAlreadyExists(err) { return fmt.Errorf("unable to create deployment: %v", err) } - if _, err := client.AppsV1beta1().Deployments(deploy.ObjectMeta.Namespace).Update(deploy); err != nil { + if _, err := client.ExtensionsV1beta1().Deployments(deploy.ObjectMeta.Namespace).Update(deploy); err != nil { return fmt.Errorf("unable to update deployment: %v", err) } }