Upgrade to Operator SDK 1.9.0 and Go 1.16

.github/workflows/build.yaml

@@ -79,7 +79,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.15.x
+        go-version: 1.16.x
 
     - name: Start KinD Cluster
 #     Start a KinD K8s cluster with single worker node

.github/workflows/coherence-matrix.yaml

@@ -115,7 +115,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.15.x
+        go-version: 1.16.x
 
     - name: Start KinD Cluster
       shell: bash

.github/workflows/compatibility-tests.yaml

@@ -86,7 +86,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.15.x
+        go-version: 1.16.x
 
     - name: Start KinD Cluster
 #     Start a KinD K8s cluster with single worker node

.github/workflows/k8s-matrix.yaml

@@ -91,7 +91,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.15.x
+        go-version: 1.16.x
 
     - name: Start KinD Cluster
       shell: bash

.github/workflows/release.yml

@@ -43,7 +43,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.15.x
+        go-version: 1.16.x
 
     - name: Start KinD Cluster
       shell: bash

.gitignore

@@ -40,7 +40,7 @@ test/**/test-report.xml
 /hack/sdk/*
 
 # Generated file created by the build
-/pkg/data/zz_generated_assets.go
+bundle.Dockerfile
 /__debug_bin
 /istio-1.9.2/
 /java/certs/

api/v1/coherenceresource_types.go

@@ -408,7 +408,7 @@ func ensureV1CRDs(logger logr.Logger, scheme *runtime.Scheme, cl client.Client,
 
 // ensureV1CRD ensures that the specified V1 CRD is loaded using the specified embedded CRD file
 func ensureV1CRD(logger logr.Logger, cl client.Client, fileName string) error {
-	f, err := data.Assets.Open(fileName)
+	f, err := data.Assets.Open("assets/" + fileName)
 	if err != nil {
 		return errors.Wrap(err, "opening embedded CRD asset "+fileName)
 	}

config/default/kustomization.yaml

@@ -27,3 +27,8 @@ vars:
       kind: Service
       version: v1
       name: webhook
+  - name: WEBHOOK_SECRET_NAME
+    objref:
+      kind: Secret
+      version: v1
+      name: coherence-webhook-server-cert

config/manager/kustomization.yaml

@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+- webhook-secret.yaml
 - manager.yaml
 - service.yaml
 

config/manager/manager.yaml

@@ -65,7 +65,7 @@ spec:
           - name: WEBHOOK_SERVICE
             value: $(WEBHOOK_SERVICE_NAME)
           - name: WEBHOOK_SECRET
-            value: coherence-webhook-server-cert
+            value: $(WEBHOOK_SECRET_NAME)
           - name: SERVICE_NAME
             value: $(REST_SERVICE_NAME)
         volumeMounts:

config/manager/webhook-secret.yaml

@@ -0,0 +1,9 @@
+#  Copyright (c) 2021, Oracle and/or its affiliates.
+#  Licensed under the Universal Permissive License v 1.0 as shown at
+#  http://oss.oracle.com/licenses/upl.
+#
+apiVersion: v1
+kind: Secret
+metadata:
+  name: coherence-webhook-server-cert
+  namespace: coherence

config/manifests/bases/coherence-operator.clusterserviceversion.yaml

@@ -2,30 +2,43 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: ClusterServiceVersion
 metadata:
   annotations:
-    alm-examples: '[]'
-    capabilities: Basic Install
+    alm-examples: '[ { "apiVersion": "coherence.oracle.com/v1", "kind": "Coherence",
+      "metadata": { "name": "coherence-example" }, "spec": { "replicas": 3 } }]'
+    capabilities: Full Lifecycle
+    categories: Database
+    certified: 'false'
+    createdAt: ''
+    description: >-
+      Coherence Operator implements features to assist with deploying and
+      managing Coherence clusters in a Kubernetes environment.
+    containerImage: 'ghcr.io/oracle/coherence-operator:3.2.0'
+    support: ''
+    repository: 'https://github.com/oracle/coherence-operator'
     operators.operatorframework.io/builder: operator-sdk-v1.0.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
-  name: coherence-operator.v3.1.3
+  name: coherence-operator.v3.2.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
     owned:
-    - description: Coherence is the Schema for the coherence API
-      kind: Coherence
-      name: coherence.coherence.oracle.com
-      version: v1
-    - description: Coherence is the Schema for the Coherence API.
+    - description: Coherence is the Schema for the Coherence Operator API.
       displayName: Coherence
       kind: Coherence
       name: coherence.coherence.oracle.com.oracle.com
       version: v1
-  description: Oracle Coherence Operator
+  description: |
+    The Coherence Operator implements features to assist with deploying and
+    managing Coherence clusters in a Kubernetes environment.
+
+    ### Installation Guide & Configuration
+
+    For the complete installation guide and all configuration options please refer to
+    [Coherence Operator Documentation](https://oracle.github.io/coherence-operator/docs/latest/#/about/01_overview).
   displayName: Coherence
   icon:
-  - base64data: ""
-    mediatype: ""
+  - base64data: iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAAAXNSR0IArs4c6QAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAIK2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyIKICAgICAgICAgICAgeG1sbnM6ZXhpZj0iaHR0cDovL25zLmFkb2JlLmNvbS9leGlmLzEuMC8iCiAgICAgICAgICAgIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIKICAgICAgICAgICAgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iCiAgICAgICAgICAgIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiCiAgICAgICAgICAgIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIKICAgICAgICAgICAgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIj4KICAgICAgICAgPHRpZmY6UmVzb2x1dGlvblVuaXQ+MjwvdGlmZjpSZXNvbHV0aW9uVW5pdD4KICAgICAgICAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICAgICAgICAgPGV4aWY6UGl4ZWxYRGltZW5zaW9uPjYwMDwvZXhpZjpQaXhlbFhEaW1lbnNpb24+CiAgICAgICAgIDxleGlmOkNvbG9yU3BhY2U+NjU1MzU8L2V4aWY6Q29sb3JTcGFjZT4KICAgICAgICAgPGV4aWY6UGl4ZWxZRGltZW5zaW9uPjExMjwvZXhpZjpQaXhlbFlEaW1lbnNpb24+CiAgICAgICAgIDxkYzpmb3JtYXQ+aW1hZ2UvcG5nPC9kYzpmb3JtYXQ+CiAgICAgICAgIDx4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ+eG1wLmRpZDpkNDMwYzI2Yi05YTNhLTQzN2ItYWZlMy02NWRjYjgyZTY1NTc8L3htcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD4KICAgICAgICAgPHhtcE1NOkhpc3Rvcnk+CiAgICAgICAgICAgIDxyZGY6U2VxPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnNvZnR3YXJlQWdlbnQ+QWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKE1hY2ludG9zaCk8L3N0RXZ0OnNvZnR3YXJlQWdlbnQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDp3aGVuPjIwMjAtMDUtMjlUMDc6NTI6MjUtMDQ6MDA8L3N0RXZ0OndoZW4+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDppbnN0YW5jZUlEPnhtcC5paWQ6ZDQzMGMyNmItOWEzYS00MzdiLWFmZTMtNjVkY2I4MmU2NTU3PC9zdEV2dDppbnN0YW5jZUlEPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6YWN0aW9uPmNyZWF0ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgIDwvcmRmOlNlcT4KICAgICAgICAgPC94bXBNTTpIaXN0b3J5PgogICAgICAgICA8eG1wTU06SW5zdGFuY2VJRD54bXAuaWlkOmQ0MzBjMjZiLTlhM2EtNDM3Yi1hZmUzLTY1ZGNiODJlNjU1NzwveG1wTU06SW5zdGFuY2VJRD4KICAgICAgICAgPHhtcE1NOkRvY3VtZW50SUQ+eG1wLmRpZDpkNDMwYzI2Yi05YTNhLTQzN2ItYWZlMy02NWRjYjgyZTY1NTc8L3ht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
+    mediatype: image/png
   install:
     spec:
       deployments: null
@@ -45,6 +58,10 @@ spec:
   - name: Coherence Operator
     url: https://oracle.github.io/coherence-operator/docs/latest
   maturity: alpha
+  minKubeVersion: "1.16"
+  maintainers:
+    - name: Jonathan Knight
+      email: jonathan.knight@oracle.com
   provider:
     name: Oracle
     url: https://oracle.github.io/coherence-operator/docs/latest

config/manifests/kustomization.yaml

@@ -1,3 +1,7 @@
-resources:
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+bases:
 - ../default
 - ../samples
+- ../scorecard

config/namespace/namespace.yaml

@@ -7,9 +7,3 @@ kind: Namespace
 metadata:
   name: coherence
 ---
-apiVersion: v1
-kind: Secret
-metadata:
-  name: coherence-webhook-server-cert
-  namespace: coherence
----

config/scorecard/kustomization.yaml

@@ -13,4 +13,4 @@ patchesJson6902:
     version: v1alpha3
     kind: Configuration
     name: config
-# +kubebuilder:scaffold:patchesJson6902
+#+kubebuilder:scaffold:patchesJson6902

controllers/coherence_controller.go

@@ -103,7 +103,7 @@ func (in *CoherenceReconciler) Reconcile(ctx context.Context, request ctrl.Reque
 			// Remove the finalizer. Once all finalizers have been
 			// removed, the object will be deleted.
 			controllerutil.RemoveFinalizer(deployment, coh.Finalizer)
-			err := in.GetClient().Update(context.TODO(), deployment)
+			err := in.GetClient().Update(ctx, deployment)
 			if err != nil {
 				return ctrl.Result{}, err
 			}
@@ -116,7 +116,7 @@ func (in *CoherenceReconciler) Reconcile(ctx context.Context, request ctrl.Reque
 	// Add finalizer for this CR if required
 	if utils.StringArrayDoesNotContain(deployment.GetFinalizers(), coh.Finalizer) {
 		// Adding the finalizer causes an update so the request will come around again
-		if err := in.addFinalizer(deployment); err != nil {
+		if err := in.addFinalizer(ctx, deployment); err != nil {
 			return ctrl.Result{}, err
 		}
 	}
@@ -280,12 +280,12 @@ func (in *CoherenceReconciler) watchSecondaryResource(s reconciler.SecondaryReso
 
 func (in *CoherenceReconciler) GetReconciler() reconcile.Reconciler { return in }
 
-func (in *CoherenceReconciler) addFinalizer(c *coh.Coherence) error {
+func (in *CoherenceReconciler) addFinalizer(ctx context.Context, c *coh.Coherence) error {
 	in.Log.Info("Adding Finalizer to Coherence resource", "Namespace", c.Namespace, "Name", c.Name)
 	controllerutil.AddFinalizer(c, coh.Finalizer)
 
 	// Update CR
-	err := in.GetClient().Update(context.TODO(), c)
+	err := in.GetClient().Update(ctx, c)
 	if err != nil {
 		in.Log.Error(err, "Failed to update Coherence resource with finalizer",
 			"Namespace", c.Namespace, "Name", c.Name)
@@ -327,7 +327,7 @@ func (in *CoherenceReconciler) finalizeDeployment(ctx context.Context, c *coh.Co
 				Client: in.GetClient(),
 				Config: in.GetManager().GetConfig(),
 			}
-			if probe.SuspendServices(c, sts) == statefulset.ServiceSuspendFailed {
+			if probe.SuspendServices(ctx, c, sts) == statefulset.ServiceSuspendFailed {
 				return fmt.Errorf("failed to suspend services")
 			}
 		}

controllers/servicemonitor/servicemonitor_controller.go

@@ -88,7 +88,7 @@ func (in *ReconcileServiceMonitor) ReconcileResources(ctx context.Context, req r
 	diff := store.GetLatest().DiffForKind(in.Kind, store.GetPrevious())
 	for _, res := range diff {
 		if res.IsDelete() {
-			if err = in.monClient.ServiceMonitors(req.Namespace).Delete(context.TODO(), res.Name, metav1.DeleteOptions{}); err != nil {
+			if err = in.monClient.ServiceMonitors(req.Namespace).Delete(ctx, res.Name, metav1.DeleteOptions{}); err != nil {
 				logger.Info(fmt.Sprintf("Finished reconciling all %s for d with error: %s", in.Kind, err.Error()))
 				return reconcile.Result{}, err
 			}
@@ -113,7 +113,7 @@ func (in *ReconcileServiceMonitor) ReconcileResource(ctx context.Context, namesp
 
 	// Fetch the sm's current state
 	var exists bool
-	sm, err := in.monClient.ServiceMonitors(namespace).Get(context.TODO(), name, metav1.GetOptions{})
+	sm, err := in.monClient.ServiceMonitors(namespace).Get(ctx, name, metav1.GetOptions{})
 	switch {
 	case err != nil && apierrors.IsNotFound(err):
 		// we can ignore not found errors
@@ -141,11 +141,11 @@ func (in *ReconcileServiceMonitor) ReconcileResource(ctx context.Context, namesp
 			// ensure that the sm is deleted.
 			// This should not actually be required as everything is owned by the deployment
 			// and there should be a cascaded delete by k8s so it's belt and braces.
-			err = in.monClient.ServiceMonitors(namespace).Delete(context.TODO(), name, metav1.DeleteOptions{})
+			err = in.monClient.ServiceMonitors(namespace).Delete(ctx, name, metav1.DeleteOptions{})
 		}
 	case !exists:
 		// ServiceMonitor does not exist but deployment does so create it
-		err = in.CreateServiceMonitor(namespace, name, storage, logger)
+		err = in.CreateServiceMonitor(ctx, namespace, name, storage, logger)
 		if err != nil {
 			err = errors.Wrapf(err, "Failed to create ServiceMonitor %s/%s", namespace, name)
 		}
@@ -157,7 +157,7 @@ func (in *ReconcileServiceMonitor) ReconcileResource(ctx context.Context, namesp
 }
 
 // CreateServiceMonitor creates a ServiceMonitor spec.
-func (in *ReconcileServiceMonitor) CreateServiceMonitor(namespace, name string, storage utils.Storage, logger logr.Logger) error {
+func (in *ReconcileServiceMonitor) CreateServiceMonitor(ctx context.Context, namespace, name string, storage utils.Storage, logger logr.Logger) error {
 	logger.Info(fmt.Sprintf("Creating ServiceMonitor/%s for deployment", name))
 	// Get the ServiceMonitor desired state
 	resource, found := storage.GetLatest().GetResource(in.Kind, name)
@@ -166,7 +166,7 @@ func (in *ReconcileServiceMonitor) CreateServiceMonitor(namespace, name string,
 	}
 	// create the ServiceMonitor
 	sm := resource.Spec.(*monitoringv1.ServiceMonitor)
-	_, err := in.monClient.ServiceMonitors(namespace).Create(context.TODO(), sm, metav1.CreateOptions{})
+	_, err := in.monClient.ServiceMonitors(namespace).Create(ctx, sm, metav1.CreateOptions{})
 	if err != nil {
 		logger.Info(fmt.Sprintf("Failed creating ServiceMonitor %s/%s - %s", namespace, name, err.Error()))
 		return errors.Wrapf(err, "failed to create ServiceMonitor %s/%s", namespace, name)
@@ -175,7 +175,7 @@ func (in *ReconcileServiceMonitor) CreateServiceMonitor(namespace, name string,
 }
 
 // UpdateServiceMonitor possibly updates the ServiceMonitor if the current state differs from the desired state.
-func (in *ReconcileServiceMonitor) UpdateServiceMonitor(namespace, name string, current runtime.Object, storage utils.Storage) error {
+func (in *ReconcileServiceMonitor) UpdateServiceMonitor(ctx context.Context, namespace, name string, current runtime.Object, storage utils.Storage) error {
 	original, _ := storage.GetPrevious().GetResource(in.Kind, name)
 	desired, found := storage.GetLatest().GetResource(in.Kind, name)
 	if !found {
@@ -197,7 +197,7 @@ func (in *ReconcileServiceMonitor) UpdateServiceMonitor(namespace, name string,
 	}
 
 	in.GetLog().WithValues().Info(fmt.Sprintf("Patching ServiceMonitor %s/%s", namespace, name))
-	_, err = in.monClient.ServiceMonitors(namespace).Patch(context.TODO(), name, in.GetPatchType(), data, metav1.PatchOptions{})
+	_, err = in.monClient.ServiceMonitors(namespace).Patch(ctx, name, in.GetPatchType(), data, metav1.PatchOptions{})
 	if err != nil {
 		return errors.Wrapf(err, "cannot patch ServiceMonitor %s/%s", namespace, name)
 	}