Update operator-sdk to version 0.18.2 (#57)

lightbend · Jun 23, 2021 · e34c320 · e34c320
1 parent fa6ab8d
commit e34c320
Show file tree

Hide file tree

Showing 8 changed files with 11,713 additions and 11,387 deletions.
diff --git a/.github/action/operator-sdk/Dockerfile b/.github/action/operator-sdk/Dockerfile
@@ -7,7 +7,7 @@ LABEL "com.github.actions.icon"="layers"
 LABEL "com.github.actions.color"="red"
 
 # add operator-sdk release binary
-ARG operator_sdk_version=v0.17.2
+ARG operator_sdk_version=v0.18.2
 ARG operator_sdk_base=https://github.com/operator-framework/operator-sdk/releases/download/
 ARG sdk_cli=/usr/bin/operator-sdk
 

diff --git a/deploy/crds/app_v1alpha1_akkacluster_crd.yaml b/deploy/crds/app_v1alpha1_akkacluster_crd.yaml
diff --git a/deploy/olm-catalog/akka-cluster-operator/1.0.3/app_v1alpha1_akkacluster_crd.yaml b/deploy/olm-catalog/akka-cluster-operator/1.0.3/app_v1alpha1_akkacluster_crd.yaml
diff --git a/go.mod b/go.mod
@@ -3,18 +3,18 @@ module github.com/lightbend/akka-cluster-operator
 go 1.13
 
 require (
-	github.com/go-openapi/spec v0.19.4
+	github.com/go-openapi/spec v0.19.3
 	github.com/google/go-cmp v0.4.0
-	github.com/operator-framework/operator-sdk v0.17.2
+	github.com/operator-framework/operator-sdk v0.18.2
 	github.com/spf13/pflag v1.0.5
-	k8s.io/api v0.17.4
-	k8s.io/apimachinery v0.17.4
+	k8s.io/api v0.18.2
+	k8s.io/apimachinery v0.18.2
 	k8s.io/client-go v12.0.0+incompatible
-	k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
-	sigs.k8s.io/controller-runtime v0.5.2
+	k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c
+	sigs.k8s.io/controller-runtime v0.6.0
 )
 
 replace (
 	github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible // Required by OLM
-	k8s.io/client-go => k8s.io/client-go v0.17.4 // Required by prometheus-operator
+	k8s.io/client-go => k8s.io/client-go v0.18.2 // Required by prometheus-operator
 )
diff --git a/go.sum b/go.sum
diff --git a/pkg/apis/app/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/app/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/controller/akkacluster/akkacluster_controller.go b/pkg/controller/akkacluster/akkacluster_controller.go
@@ -13,9 +13,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	appv1alpha1 "github.com/lightbend/akka-cluster-operator/pkg/apis/app/v1alpha1"
@@ -139,12 +139,13 @@ func (r *ReconcileAkkaCluster) Reconcile(request reconcile.Request) (reconcile.R
 			reqLogger.Info("Creating resource", "kind", kind)
 			return reconcile.Result{Requeue: true}, nil
 		}
-		// Update cluster resource to wanted resource, if needed.
+		// Patch cluster resource to wanted resource, if needed.
 		if !SubsetEqual(wantedResource, clusterResource) {
 			reqLogger.Info("applying update", "kind", kind, "match")
 
-			if err := r.client.Update(context.TODO(), wantedResource); err != nil {
-				reqLogger.Info("Tried to update resource", "kind", kind, "error", err)
+			// patch.Merge uses the raw object as a merge patch, without modifications.
+			if err := r.client.Patch(context.TODO(), wantedResource, client.Merge); err != nil {
+				reqLogger.Info("Tried to patch resource", "kind", kind, "error", err)
 				return reconcile.Result{}, err
 			}
 			return reconcile.Result{Requeue: true}, nil

diff --git a/pkg/controller/akkacluster/akkacluster_controller_test.go b/pkg/controller/akkacluster/akkacluster_controller_test.go
@@ -48,7 +48,7 @@ func TestAkkaController(t *testing.T) {
 	// mock context for reconciler
 	scheme := scheme.Scheme
 	scheme.AddKnownTypes(appv1alpha1.SchemeGroupVersion, akkaCluster)
-	client := fake.NewFakeClient(akkaCluster)
+	client := fake.NewFakeClientWithScheme(scheme, akkaCluster)
 	r := &ReconcileAkkaCluster{client: client, scheme: scheme}
 
 	// mock event loop