Fixup goclient upgrade

pkg/api/render.go

@@ -8,7 +8,7 @@ import (
 	"github.com/rebuy-de/kubernetes-deployment/pkg/templates"
 	log "github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/client-go/pkg/api"
+	"k8s.io/client-go/kubernetes/scheme"
 )
 
 func (app *App) Render(fetched *FetchResult) ([]runtime.Object, error) {
@@ -28,9 +28,12 @@ func (app *App) Render(fetched *FetchResult) ([]runtime.Object, error) {
 		return nil, errors.WithStack(err)
 	}
 
-	decode := api.Codecs.UniversalDeserializer().Decode
+	return app.decode(rendered)
+}
 
-	objects := []runtime.Object{}
+func (app *App) decode(rendered map[string]string) ([]runtime.Object, error) {
+	var objects []runtime.Object
+	decode := scheme.Codecs.UniversalDeserializer().Decode
 
 	for name, data := range rendered {
 		if !strings.HasSuffix(name, ".yaml") && !strings.HasSuffix(name, ".yml") {

pkg/api/render_test.go

@@ -0,0 +1,39 @@
+package api
+
+import (
+	"github.com/rebuy-de/kubernetes-deployment/pkg/interceptors"
+	"github.com/rebuy-de/kubernetes-deployment/pkg/testutil"
+	"testing"
+	"io/ioutil"
+	"path"
+)
+
+func readFile(t *testing.T, path string) string {
+	dat, err := ioutil.ReadFile(path)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return string(dat)
+}
+
+func TestDecode(t *testing.T) {
+	dir := "test-fixtures"
+	tcs := map[string]string{
+		"manifest-deployment.yaml": "",
+		"manifest-podpreset.yaml": "",
+	}
+	golden := "decoded-golden.yaml"
+
+	for fname := range tcs {
+		p := path.Join(dir, fname)
+		tcs[fname] = readFile(t, p)
+	}
+
+	app := App{Interceptors: &interceptors.Multi{}}
+	objects, err := app.decode(tcs)
+	if err != nil {
+		t.Fatal(err)
+	}
+	g := path.Join(dir, golden)
+	testutil.AssertGoldenJSON(t, g, objects)
+}

pkg/api/test-fixtures/decoded-golden.yaml

@@ -0,0 +1,73 @@
+[
+    {
+        "kind": "Deployment",
+        "apiVersion": "extensions/v1beta1",
+        "metadata": {
+            "name": "maintenance",
+            "namespace": "kube-system",
+            "creationTimestamp": null,
+            "labels": {
+                "app": "maintenance",
+                "team": "platform",
+                "tier": "maintenance"
+            }
+        },
+        "spec": {
+            "replicas": 1,
+            "template": {
+                "metadata": {
+                    "name": "maintenance",
+                    "namespace": "kube-system",
+                    "creationTimestamp": null,
+                    "labels": {
+                        "app": "maintenance",
+                        "team": "platform",
+                        "tier": "maintenance"
+                    }
+                },
+                "spec": {
+                    "containers": [
+                        {
+                            "name": "maintenance",
+                            "image": "074509403805.dkr.ecr.eu-west-1.amazonaws.com/maintenance:master",
+                            "resources": {},
+                            "imagePullPolicy": "Always"
+                        }
+                    ]
+                }
+            },
+            "strategy": {
+                "rollingUpdate": {
+                    "maxSurge": 0
+                }
+            },
+            "revisionHistoryLimit": 1
+        },
+        "status": {}
+    },
+    {
+        "kind": "PodPreset",
+        "apiVersion": "settings.k8s.io/v1alpha1",
+        "metadata": {
+            "name": "cluster-profile",
+            "namespace": "default",
+            "creationTimestamp": null,
+            "labels": {
+                "team": "platform"
+            }
+        },
+        "spec": {
+            "selector": {
+                "matchExpressions": [
+                    {
+                        "key": "role",
+                        "operator": "In",
+                        "values": [
+                            "silo"
+                        ]
+                    }
+                ]
+            }
+        }
+    }
+]

pkg/api/test-fixtures/manifest-deployment.yaml

@@ -0,0 +1,32 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+
+metadata:
+  name: maintenance
+  namespace: kube-system
+  labels:
+    team: platform
+    tier: maintenance
+    app: maintenance
+
+spec:
+  revisionHistoryLimit: 1
+  replicas: 1
+  strategy:
+    rollingUpdate:
+      maxSurge: 0
+
+  template:
+    metadata:
+      name: maintenance
+      namespace: kube-system
+      labels:
+        team: platform
+        tier: maintenance
+        app: maintenance
+
+    spec:
+      containers:
+      - name: maintenance
+        image: 074509403805.dkr.ecr.eu-west-1.amazonaws.com/maintenance:master
+        imagePullPolicy: Always

pkg/api/test-fixtures/manifest-podpreset.yaml

@@ -0,0 +1,13 @@
+apiVersion: settings.k8s.io/v1alpha1
+kind: PodPreset
+
+metadata:
+  name: cluster-profile
+  namespace: default
+  labels:
+    team: platform
+
+spec:
+  selector:
+    matchExpressions:
+    - {key: role, operator: In, values: [silo]}

pkg/kubectl/kubectl.go

@@ -7,8 +7,8 @@ import (
 	"os/exec"
 	"strings"
 
+	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/client-go/pkg/api"
 
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
@@ -69,6 +69,6 @@ func (k *Kubectl) Apply(obj runtime.Object) (runtime.Object, error) {
 		return nil, errors.WithStack(err)
 	}
 
-	newObj, _, err := api.Codecs.UniversalDeserializer().Decode(stdout.Bytes(), nil, nil)
+	newObj, _, err := scheme.Codecs.UniversalDeserializer().Decode(stdout.Bytes(), nil, nil)
 	return newObj, errors.Wrapf(err, "failed to decode result json")
 }