Merge pull request #174 from rebuy-de/fix-1.16-replicasets

Move from extensions to apps API

Author: der-eismann

go.mod

@@ -3,7 +3,7 @@ module github.com/rebuy-de/kubernetes-deployment
 go 1.13
 
 require (
-	github.com/aws/aws-sdk-go v1.25.0
+	github.com/aws/aws-sdk-go v1.25.32
 	github.com/benbjohnson/clock v0.0.0-20161215174838-7dc76406b6d3
 	github.com/fatih/structs v1.1.0
 	github.com/ghodss/yaml v1.0.0
@@ -20,8 +20,8 @@ require (
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
 	gopkg.in/alexcesaro/statsd.v2 v2.0.0
 	gopkg.in/gemnasium/logrus-graylog-hook.v2 v2.0.7
-	gopkg.in/yaml.v2 v2.2.2
-	k8s.io/api v0.0.0-20190620084959-7cf5895f2711
-	k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
-	k8s.io/client-go v0.0.0-20190620085101-78d2af792bab
+	gopkg.in/yaml.v2 v2.2.4
+	k8s.io/api v0.0.0-20191016110408-35e52d86657a
+	k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
+	k8s.io/client-go v0.0.0-20191016111102-bec269661e48
 )

go.sum

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 
 metadata:

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

@@ -1,7 +1,7 @@
 [
     {
         "kind": "Deployment",
-        "apiVersion": "extensions/v1beta1",
+        "apiVersion": "apps/v1",
         "metadata": {
             "name": "maintenance",
             "namespace": "kube-system",
@@ -14,6 +14,7 @@
         },
         "spec": {
             "replicas": 1,
+            "selector": null,
             "template": {
                 "metadata": {
                     "name": "maintenance",

pkg/api/test-fixtures/render-golden-multi-yaml.json

@@ -20,7 +20,7 @@ func TestInterceptor_PostManifestRender(t *testing.T) {
 
 	deployment := &v1apps.Deployment{
 		TypeMeta: meta.TypeMeta{
-			APIVersion: "extensions/v1beta1",
+			APIVersion: "apps/v1",
 			Kind:       "Deployment",
 		},
 		ObjectMeta: meta.ObjectMeta{

pkg/interceptors/injector/interceptor_test.go

@@ -1,6 +1,6 @@
 {
     "kind": "Deployment",
-    "apiVersion": "extensions/v1beta1",
+    "apiVersion": "apps/v1",
     "metadata": {
         "name": "linkerd-test",
         "creationTimestamp": null,
@@ -9,6 +9,7 @@
         }
     },
     "spec": {
+        "selector": null,
         "template": {
             "metadata": {
                 "creationTimestamp": null,

pkg/interceptors/injector/test-fixtures/deployment-golden.json

@@ -8,7 +8,7 @@ import (
 
 	"github.com/rebuy-de/kubernetes-deployment/pkg/kubeutil"
 	log "github.com/sirupsen/logrus"
-	"k8s.io/api/extensions/v1beta1"
+	apps "k8s.io/api/apps/v1"
 	v1meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -83,7 +83,7 @@ func (dwi *DeploymentWaitInterceptor) run(namespace, name string) {
 	// number and then update the deployment to see the current revision.
 	time.Sleep(1 * time.Second)
 	deployment, err := dwi.client.
-		ExtensionsV1beta1().
+		AppsV1().
 		Deployments(namespace).
 		Get(name, v1meta.GetOptions{})
 
@@ -117,7 +117,7 @@ func (dwi *DeploymentWaitInterceptor) run(namespace, name string) {
 	}).Debugf("deployment succeeded")
 }
 
-func (dwi *DeploymentWaitInterceptor) podNotifier(ctx context.Context, rs *v1beta1.ReplicaSet) {
+func (dwi *DeploymentWaitInterceptor) podNotifier(ctx context.Context, rs *apps.ReplicaSet) {
 	defer dwi.waitgroup.Done()
 
 	for pod := range kubeutil.WatchPods(ctx, dwi.client, fields.Everything()) {

pkg/interceptors/waiter/interceptor.go

@@ -3,12 +3,12 @@ package kubeutil
 import (
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
-	"k8s.io/api/extensions/v1beta1"
+	apps "k8s.io/api/apps/v1"
 	v1meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 )
 
-func DeploymentRolloutComplete(deployment *v1beta1.Deployment) bool {
+func DeploymentRolloutComplete(deployment *apps.Deployment) bool {
 	logger := log.WithFields(log.Fields{
 		"Namespace":          deployment.ObjectMeta.Namespace,
 		"Name":               deployment.ObjectMeta.Name,
@@ -31,9 +31,9 @@ func DeploymentRolloutComplete(deployment *v1beta1.Deployment) bool {
 	return false
 }
 
-func GetReplicaSetForDeployment(client kubernetes.Interface, deployment *v1beta1.Deployment) (*v1beta1.ReplicaSet, error) {
+func GetReplicaSetForDeployment(client kubernetes.Interface, deployment *apps.Deployment) (*apps.ReplicaSet, error) {
 	replicaSets, err := client.
-		ExtensionsV1beta1().
+		AppsV1().
 		ReplicaSets(deployment.ObjectMeta.Namespace).
 		List(v1meta.ListOptions{})
 	if err != nil {

pkg/kubeutil/deployments.go

@@ -4,41 +4,41 @@ import (
 	"context"
 	"time"
 
-	"k8s.io/api/core/v1"
-	"k8s.io/api/extensions/v1beta1"
+	apps "k8s.io/api/apps/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/cache"
 )
 
-func WatchDeployments(ctx context.Context, client kubernetes.Interface, selector fields.Selector) chan *v1beta1.Deployment {
+func WatchDeployments(ctx context.Context, client kubernetes.Interface, selector fields.Selector) chan *apps.Deployment {
 	lw := cache.NewListWatchFromClient(
-		client.ExtensionsV1beta1().RESTClient(),
+		client.AppsV1().RESTClient(),
 		"deployments",
 		v1.NamespaceAll,
 		selector)
 
 	stop := make(chan struct{}, 1)
-	results := make(chan *v1beta1.Deployment)
+	results := make(chan *apps.Deployment)
 
 	store, controller := cache.NewInformer(
 		lw,
-		&v1beta1.Deployment{},
+		&apps.Deployment{},
 		60*time.Second,
 		cache.ResourceEventHandlerFuncs{
 			AddFunc: func(obj interface{}) {
-				results <- obj.(*v1beta1.Deployment)
+				results <- obj.(*apps.Deployment)
 			},
 			UpdateFunc: func(old, obj interface{}) {
-				results <- obj.(*v1beta1.Deployment)
+				results <- obj.(*apps.Deployment)
 			},
 			DeleteFunc: func(obj interface{}) {
-				results <- obj.(*v1beta1.Deployment)
+				results <- obj.(*apps.Deployment)
 			},
 		})
 
 	for _, obj := range store.List() {
-		results <- obj.(*v1beta1.Deployment)
+		results <- obj.(*apps.Deployment)
 	}
 
 	go controller.Run(stop)