Update k8s.io to 0.20.2 (#7)

spotify · Mar 19, 2021 · efaf970 · efaf970
1 parent 288370c
commit efaf970
Show file tree

Hide file tree

Showing 11 changed files with 471 additions and 133 deletions.
diff --git a/api/v1alpha1/flinkcluster_webhook.go b/api/v1alpha1/flinkcluster_webhook.go
@@ -20,7 +20,7 @@ package v1alpha1
 import (
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
 

diff --git a/api/v1beta1/flinkcluster_webhook.go b/api/v1beta1/flinkcluster_webhook.go
@@ -20,7 +20,7 @@ package v1beta1
 import (
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
 

diff --git a/api/v1beta1/suite_test.go b/api/v1beta1/suite_test.go
@@ -48,7 +48,7 @@ func TestAPIs(t *testing.T) {
 }
 
 var _ = BeforeSuite(func(done Done) {
-	logf.SetLogger(zap.LoggerTo(GinkgoWriter, true))
+	logf.SetLogger(zap.New(zap.UseDevMode(true), zap.WriteTo(GinkgoWriter)))
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{

diff --git a/controllers/flinkcluster_controller.go b/controllers/flinkcluster_controller.go
@@ -18,9 +18,10 @@ package controllers
 
 import (
 	"context"
-	"github.com/spotify/flink-on-k8s-operator/controllers/history"
 	"time"
 
+	"github.com/spotify/flink-on-k8s-operator/controllers/history"
+
 	"github.com/go-logr/logr"
 	v1beta1 "github.com/spotify/flink-on-k8s-operator/api/v1beta1"
 	"github.com/spotify/flink-on-k8s-operator/controllers/flinkclient"
@@ -63,7 +64,7 @@ type FlinkClusterReconciler struct {
 // +kubebuilder:rbac:groups=extensions,resources=ingresses/status,verbs=get
 
 // Reconcile the observed state towards the desired state for a FlinkCluster custom resource.
-func (reconciler *FlinkClusterReconciler) Reconcile(
+func (reconciler *FlinkClusterReconciler) Reconcile(ctx context.Context,
 	request ctrl.Request) (ctrl.Result, error) {
 	var log = reconciler.Log.WithValues(
 		"cluster", request.NamespacedName)
@@ -79,7 +80,7 @@ func (reconciler *FlinkClusterReconciler) Reconcile(
 		recorder: reconciler.Mgr.GetEventRecorderFor("FlinkOperator"),
 		observed: ObservedClusterState{},
 	}
-	return handler.reconcile(request)
+	return handler.reconcile(ctx, request)
 }
 
 // SetupWithManager registers this reconciler with the controller manager and
@@ -110,7 +111,7 @@ type FlinkClusterHandler struct {
 	desired           model.DesiredClusterState
 }
 
-func (handler *FlinkClusterHandler) reconcile(
+func (handler *FlinkClusterHandler) reconcile(ctx context.Context,
 	request ctrl.Request) (ctrl.Result, error) {
 	var k8sClient = handler.k8sClient
 	var flinkClient = handler.flinkClient

diff --git a/controllers/flinkcluster_reconciler.go b/controllers/flinkcluster_reconciler.go
@@ -19,13 +19,14 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"reflect"
+	"time"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/retry"
-	"reflect"
-	"time"
 
 	"github.com/go-logr/logr"
 	v1beta1 "github.com/spotify/flink-on-k8s-operator/api/v1beta1"
@@ -178,7 +179,7 @@ func (reconciler *ClusterReconciler) createStatefulSet(
 	return err
 }
 
-func (reconciler *ClusterReconciler) deleteOldComponent(desired runtime.Object, observed runtime.Object, component string) error {
+func (reconciler *ClusterReconciler) deleteOldComponent(desired client.Object, observed runtime.Object, component string) error {
 	var log = reconciler.log.WithValues("component", component)
 	if isComponentUpdated(observed, *reconciler.observed.cluster) {
 		reconciler.log.Info(fmt.Sprintf("%v is already updated, no action", component))
@@ -197,7 +198,7 @@ func (reconciler *ClusterReconciler) deleteOldComponent(desired runtime.Object,
 	return nil
 }
 
-func (reconciler *ClusterReconciler) updateComponent(desired runtime.Object, component string) error {
+func (reconciler *ClusterReconciler) updateComponent(desired client.Object, component string) error {
 	var log = reconciler.log.WithValues("component", component)
 	var context = reconciler.context
 	var k8sClient = reconciler.k8sClient

diff --git a/controllers/flinkcluster_updater.go b/controllers/flinkcluster_updater.go
@@ -24,10 +24,11 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"k8s.io/apimachinery/pkg/types"
 	"reflect"
 	"time"
 
+	"k8s.io/apimachinery/pkg/types"
+
 	"github.com/go-logr/logr"
 	v1beta1 "github.com/spotify/flink-on-k8s-operator/api/v1beta1"
 	appsv1 "k8s.io/api/apps/v1"
@@ -933,7 +934,7 @@ func (updater *ClusterStatusUpdater) clearControlAnnotation(newControlStatus *v1
 		if err != nil {
 			return err
 		}
-		return updater.k8sClient.Patch(updater.context, updater.observed.cluster, client.ConstantPatch(types.MergePatchType, patchBytes))
+		return updater.k8sClient.Patch(updater.context, updater.observed.cluster, client.RawPatch(types.MergePatchType, patchBytes))
 	}
 
 	return nil

diff --git a/controllers/history/controller_history.go b/controllers/history/controller_history.go
@@ -21,13 +21,14 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/davecgh/go-spew/spew"
 	"hash"
 	"hash/fnv"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sort"
 	"strconv"
 
+	"github.com/davecgh/go-spew/spew"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	apps "k8s.io/api/apps/v1"
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -320,14 +321,14 @@ func (rh *realHistory) AdoptControllerRevision(parent metav1.Object, parentKind
 		return nil, err
 	}
 	// Use strategic merge patch to add an owner reference indicating a controller ref
-	err = rh.Patch(rh.context, revision, client.ConstantPatch(types.StrategicMergePatchType, patchBytes))
+	err = rh.Patch(rh.context, revision, client.RawPatch(types.StrategicMergePatchType, patchBytes))
 
 	return revision, err
 }
 
 func (rh *realHistory) ReleaseControllerRevision(parent metav1.Object, revision *apps.ControllerRevision) (*apps.ControllerRevision, error) {
 	// Use strategic merge patch to add an owner reference indicating a controller ref
-	err := rh.Patch(rh.context, revision, client.ConstantPatch(types.StrategicMergePatchType, []byte(fmt.Sprintf(`{"metadata":{"ownerReferences":[{"$patch":"delete","uid":"%s"}],"uid":"%s"}}`, parent.GetUID(), revision.UID))))
+	err := rh.Patch(rh.context, revision, client.RawPatch(types.StrategicMergePatchType, []byte(fmt.Sprintf(`{"metadata":{"ownerReferences":[{"$patch":"delete","uid":"%s"}],"uid":"%s"}}`, parent.GetUID(), revision.UID))))
 
 	if err != nil {
 		if errors.IsNotFound(err) {

diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -50,7 +50,7 @@ func TestAPIs(t *testing.T) {
 }
 
 var _ = BeforeSuite(func(done Done) {
-	logf.SetLogger(zap.LoggerTo(GinkgoWriter, true))
+	logf.SetLogger(zap.New(zap.UseDevMode(true), zap.WriteTo(GinkgoWriter)))
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{

diff --git a/go.mod b/go.mod
@@ -4,45 +4,45 @@ go 1.14
 
 require (
 	github.com/davecgh/go-spew v1.1.1
-	github.com/go-logr/logr v0.1.0
-	github.com/google/go-cmp v0.3.1
-	github.com/onsi/ginkgo v1.11.0
-	github.com/onsi/gomega v1.8.1
-	golang.org/x/net v0.0.0-20191004110552-13f9640d40b9
-	gopkg.in/yaml.v2 v2.2.8
+	github.com/go-logr/logr v0.3.0
+	github.com/google/go-cmp v0.5.2
+	github.com/onsi/ginkgo v1.14.1
+	github.com/onsi/gomega v1.10.2
+	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
+	gopkg.in/yaml.v2 v2.3.0
 	gotest.tools v2.2.0+incompatible
-	k8s.io/api v0.18.3
-	k8s.io/apiextensions-apiserver v0.18.3 // indirect
-	k8s.io/apimachinery v0.18.3
-	k8s.io/client-go v0.18.3
+	k8s.io/api v0.20.2
+	k8s.io/apiextensions-apiserver v0.20.2 // indirect
+	k8s.io/apimachinery v0.20.2
+	k8s.io/client-go v0.20.2
 	k8s.io/klog v1.0.0
-	sigs.k8s.io/controller-runtime v0.6.0
-	volcano.sh/volcano v0.0.0-20200615125001-3c3aaf766110
+	sigs.k8s.io/controller-runtime v0.8.2
+	volcano.sh/volcano v1.2.0
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.18.3
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.3
-	k8s.io/apimachinery => k8s.io/apimachinery v0.18.3
-	k8s.io/apiserver => k8s.io/apiserver v0.18.3
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.3
-	k8s.io/client-go => k8s.io/client-go v0.18.3
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.3
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.3
+	k8s.io/api => k8s.io/api v0.20.2
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.2
+	k8s.io/apimachinery => k8s.io/apimachinery v0.20.2
+	k8s.io/apiserver => k8s.io/apiserver v0.20.2
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.2
+	k8s.io/client-go => k8s.io/client-go v0.20.2
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.2
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.2
 	k8s.io/code-generator => k8s.io/code-generator v0.16.10-beta.0
-	k8s.io/component-base => k8s.io/component-base v0.18.3
-	k8s.io/cri-api => k8s.io/cri-api v0.18.3
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.3
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.3
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.3
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.3
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.3
-	k8s.io/kubectl => k8s.io/kubectl v0.18.3
-	k8s.io/kubelet => k8s.io/kubelet v0.18.3
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.3
-	k8s.io/metrics => k8s.io/metrics v0.18.3
-	k8s.io/node-api => k8s.io/node-api v0.18.3
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.3
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.18.3
-	k8s.io/sample-controller => k8s.io/sample-controller v0.18.3
+	k8s.io/component-base => k8s.io/component-base v0.20.2
+	k8s.io/cri-api => k8s.io/cri-api v0.20.2
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.2
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.2
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.2
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.2
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.2
+	k8s.io/kubectl => k8s.io/kubectl v0.20.2
+	k8s.io/kubelet => k8s.io/kubelet v0.20.2
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.2
+	k8s.io/metrics => k8s.io/metrics v0.20.2
+	k8s.io/node-api => k8s.io/node-api v0.20.2
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.2
+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.20.2
+	k8s.io/sample-controller => k8s.io/sample-controller v0.20.2
 )