Bump k8s.io/api & friends to 0.27

Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/redhat-developer/go-toolset:builder-golang-1.18 as builder
+FROM quay.io/redhat-developer/go-toolset:builder-golang-1.20 as builder
 
 WORKDIR /workspace
 COPY / /workspace/

apis/binding/v1alpha1/servicebinding_webhook.go

@@ -21,6 +21,7 @@
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // log is for logging in this package.
@@ -46,25 +47,25 @@
 }
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *ServiceBinding) ValidateCreate() error {
-	return checkNameAndSelector(r)
+func (r *ServiceBinding) ValidateCreate() (admission.Warnings, error) {
+	return nil, checkNameAndSelector(r)
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (r *ServiceBinding) ValidateUpdate(old runtime.Object) error {
+func (r *ServiceBinding) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 	oldSb, ok := old.(*ServiceBinding)
 	if !ok {
-		return errors.New("Old object is not service binding")
+		return nil, errors.New("Old object is not service binding")
 	}
 	err := apis.CanUpdateBinding(r, oldSb)
 	if err != nil {
 		log.Error(err, "Update failed")
-		return err
+		return nil, err
 	}
-	return checkNameAndSelector(r)
+	return nil, checkNameAndSelector(r)
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *ServiceBinding) ValidateDelete() error {
-	return nil
+func (r *ServiceBinding) ValidateDelete() (admission.Warnings, error) {
+	return nil, nil
 }

apis/binding/v1alpha1/servicebinding_webhook_test.go

@@ -17,7 +17,8 @@ var _ = Describe("Validation Webhook", func() {
 				Conditions: []v1.Condition{*apis.Conditions().NotBindingReady().Build()},
 			},
 		}
-		Expect(sb.ValidateUpdate(sb)).ShouldNot(HaveOccurred())
+		_, err := sb.ValidateUpdate(sb)
+		Expect(err).ToNot(HaveOccurred())
 	})
 
 	It("should not allow spec updates on ready bindings", func() {
@@ -29,7 +30,8 @@ var _ = Describe("Validation Webhook", func() {
 		}
 		sb := old.DeepCopy()
 		sb.Spec.BindAsFiles = true
-		Expect(sb.ValidateUpdate(old)).Should(HaveOccurred())
+		_, err := sb.ValidateUpdate(old)
+		Expect(err).To(HaveOccurred())
 	})
 
 	It("should allow metadata updates on ready bindings", func() {
@@ -43,7 +45,8 @@ var _ = Describe("Validation Webhook", func() {
 		sb.Annotations = map[string]string{
 			"foo": "bar",
 		}
-		Expect(sb.ValidateUpdate(old)).ShouldNot(HaveOccurred())
+		_, err := sb.ValidateUpdate(old)
+		Expect(err).ToNot(HaveOccurred())
 	})
 
 	It("should return error if both application name and selecter is specified during creation", func() {
@@ -71,7 +74,8 @@ var _ = Describe("Validation Webhook", func() {
 				Application: ref,
 			},
 		}
-		Expect(sb.ValidateCreate()).Should(HaveOccurred())
+		_, err := sb.ValidateCreate()
+		Expect(err).To(HaveOccurred())
 
 	})
 
@@ -100,7 +104,8 @@ var _ = Describe("Validation Webhook", func() {
 				Application: ref,
 			},
 		}
-		Expect(sb.ValidateUpdate(sb)).Should(HaveOccurred())
+		_, err := sb.ValidateUpdate(sb)
+		Expect(err).To(HaveOccurred())
 
 	})
 

apis/spec/v1beta1/clusterworkloadresourcemapping_webhook.go

@@ -25,6 +25,7 @@
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/client-go/util/jsonpath"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
@@ -35,19 +36,19 @@
 var _ webhook.Validator = &ClusterWorkloadResourceMapping{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (m *ClusterWorkloadResourceMapping) ValidateCreate() error {
-	return m.validate()
+func (m *ClusterWorkloadResourceMapping) ValidateCreate() (admission.Warnings, error) {
+	return nil, m.validate()
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (m *ClusterWorkloadResourceMapping) ValidateUpdate(old runtime.Object) error {
-	return m.validate()
+func (m *ClusterWorkloadResourceMapping) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
+	return nil, m.validate()
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (m *ClusterWorkloadResourceMapping) ValidateDelete() error {
+func (m *ClusterWorkloadResourceMapping) ValidateDelete() (admission.Warnings, error) {
 	// don't currently need validation of resource removal
-	return nil
+	return nil, nil
 }
 
 func (m *ClusterWorkloadResourceMapping) validate() error {

apis/spec/v1beta1/servicebinding_webhook.go

@@ -24,6 +24,7 @@
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // log is for logging in this package.
@@ -52,28 +53,28 @@
 }
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *ServiceBinding) ValidateCreate() error {
-	return checkNameAndSelector(r)
+func (r *ServiceBinding) ValidateCreate() (admission.Warnings, error) {
+	return nil, checkNameAndSelector(r)
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (sb *ServiceBinding) ValidateUpdate(old runtime.Object) error {
+func (sb *ServiceBinding) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 	oldSb, ok := old.(*ServiceBinding)
 	if !ok {
-		return errors.New("Old object is not service binding")
+		return nil, errors.New("Old object is not service binding")
 	}
 	err := apis.CanUpdateBinding(sb, oldSb)
 	if err != nil {
 		log.Error(err, "Update failed")
-		return err
+		return nil, err
 	}
-	return checkNameAndSelector(sb)
+	return nil, checkNameAndSelector(sb)
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *ServiceBinding) ValidateDelete() error {
+func (r *ServiceBinding) ValidateDelete() (admission.Warnings, error) {
 	log.Info("validate delete", "name", r.Name)
 
 	// TODO(user): fill in your validation logic upon object deletion.
-	return nil
+	return nil, nil
 }

apis/spec/v1beta1/servicebinding_webhook_test.go

@@ -17,7 +17,8 @@ var _ = Describe("Validation Webhook", func() {
 				Conditions: []v1.Condition{*apis.Conditions().NotBindingReady().Build()},
 			},
 		}
-		Expect(sb.ValidateUpdate(sb)).ShouldNot(HaveOccurred())
+		_, err := sb.ValidateUpdate(sb)
+		Expect(err).ToNot(HaveOccurred())
 	})
 
 	It("should not allow spec updates on ready bindings", func() {
@@ -29,7 +30,8 @@ var _ = Describe("Validation Webhook", func() {
 		}
 		sb := old.DeepCopy()
 		sb.Spec.Name = "foo"
-		Expect(sb.ValidateUpdate(old)).Should(HaveOccurred())
+		_, err := sb.ValidateUpdate(old)
+		Expect(err).To(HaveOccurred())
 	})
 
 	It("should allow metadata updates on ready bindings", func() {
@@ -43,7 +45,8 @@ var _ = Describe("Validation Webhook", func() {
 		sb.Annotations = map[string]string{
 			"foo": "bar",
 		}
-		Expect(sb.ValidateUpdate(old)).ShouldNot(HaveOccurred())
+		_, err := sb.ValidateUpdate(old)
+		Expect(err).ToNot(HaveOccurred())
 	})
 
 	It("should return error if both application name and selecter is specified during creation", func() {
@@ -68,7 +71,8 @@ var _ = Describe("Validation Webhook", func() {
 				Workload: ref,
 			},
 		}
-		Expect(sb.ValidateCreate()).Should(HaveOccurred())
+		_, err := sb.ValidateCreate()
+		Expect(err).To(HaveOccurred())
 
 	})
 
@@ -94,7 +98,8 @@ var _ = Describe("Validation Webhook", func() {
 				Workload: ref,
 			},
 		}
-		Expect(sb.ValidateUpdate(sb)).Should(HaveOccurred())
+		_, err := sb.ValidateUpdate(sb)
+		Expect(err).To(HaveOccurred())
 
 	})
 

apis/webhooks/admission.go

@@ -14,7 +14,10 @@
 
 func SetupWithManager(mgr ctrl.Manager, serviceAccountName string) {
 	mgr.GetWebhookServer().Register("/mutate-servicebinding", &webhook.Admission{
-		Handler: &admissionHandler{serviceAccountName: serviceAccountName},
+		Handler: &admissionHandler{
+			serviceAccountName: serviceAccountName,
+			decoder:            admission.NewDecoder(mgr.GetScheme()),
+		},
 	})
 }
 

apis/webhooks/validator.go

@@ -17,6 +17,7 @@
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 type MappingValidator struct {
@@ -49,32 +50,32 @@
 
 var _ webhook.CustomValidator = &MappingValidator{}
 
-func (validator *MappingValidator) ValidateCreate(ctx context.Context, obj runtime.Object) error {
+func (validator *MappingValidator) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
 	mapping := obj.(*v1beta1.ClusterWorkloadResourceMapping)
-	err := mapping.ValidateCreate()
+	_, err := mapping.ValidateCreate()
 	if err != nil {
 		log.Error(err, "Error validating mapping (create)", "mapping", mapping.Name)
 	}
-	return err
+	return nil, err
 }
 
-func (validator *MappingValidator) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) error {
+func (validator *MappingValidator) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
 	mapping := newObj.(*v1beta1.ClusterWorkloadResourceMapping)
-	if err := mapping.ValidateCreate(); err != nil {
+	if _, err := mapping.ValidateCreate(); err != nil {
 		log.Error(err, "Error validating mapping (update)", "mapping", mapping.Name)
-		return err
+		return nil, err
 	}
 	oldMapping := oldObj.(*v1beta1.ClusterWorkloadResourceMapping)
 	err := Serialize(ctx, oldMapping, validator.client, validator.lookup)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
-	return nil
+	return nil, nil
 }
 
-func (validator *MappingValidator) ValidateDelete(ctx context.Context, obj runtime.Object) error {
-	return nil
+func (validator *MappingValidator) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
+	return nil, nil
 }
 
 func Serialize(ctx context.Context, mapping *v1beta1.ClusterWorkloadResourceMapping, client dynamic.Interface, lookup kubernetes.K8STypeLookup) error {

apis/webhooks/validator_test.go

@@ -49,31 +49,35 @@ var _ = Describe("Validate", func() {
 
 	var _ = Describe("Create", func() {
 		It("should accept a valid mapping", func() {
-			err := validator.ValidateCreate(ctx, &mapping)
+			msg, err := validator.ValidateCreate(ctx, &mapping)
 			Expect(err).NotTo(HaveOccurred())
+			Expect(msg).To(BeEmpty())
 		})
 
 		It("should reject an invalid mapping", func() {
 			mapping.Spec.Versions[0].Volumes = "foo.bar"
-			err := validator.ValidateCreate(ctx, &mapping)
+			msg, err := validator.ValidateCreate(ctx, &mapping)
 			Expect(err).To(HaveOccurred())
+			Expect(msg).To(BeEmpty())
 		})
 	})
 
 	var _ = Describe("Update", func() {
 		It("should reject an invalid mapping", func() {
 			oldMapping := mapping.DeepCopy()
 			mapping.Spec.Versions[0].Volumes = "foo.bar"
-			err := validator.ValidateUpdate(ctx, oldMapping, &mapping)
+			msg, err := validator.ValidateUpdate(ctx, oldMapping, &mapping)
 			Expect(err).To(HaveOccurred())
+			Expect(msg).To(BeEmpty())
 		})
 
 		It("should accept a valid mapping", func() {
 			oldMapping := mapping.DeepCopy()
 			mapping.Spec.Versions[0].Volumes = ".spec.volumes"
 			validator.client = fake.NewSimpleDynamicClient(scheme)
-			err := validator.ValidateUpdate(ctx, oldMapping, &mapping)
+			msg, err := validator.ValidateUpdate(ctx, oldMapping, &mapping)
 			Expect(err).NotTo(HaveOccurred())
+			Expect(msg).To(BeEmpty())
 		})
 
 		It("should serialize old mappings into relevant service bindings", func() {
@@ -112,8 +116,9 @@ var _ = Describe("Validate", func() {
 			fooGVR := schema.GroupVersionResource{Group: "bar", Version: "v1", Resource: "foos"}
 			lookup.EXPECT().ResourceForKind(fooGVK).Return(&fooGVR, nil).Times(2)
 
-			err := validator.ValidateUpdate(ctx, oldMapping, &mapping)
+			msg, err := validator.ValidateUpdate(ctx, oldMapping, &mapping)
 			Expect(err).NotTo(HaveOccurred())
+			Expect(msg).To(BeEmpty())
 
 			oldData, err := json.Marshal(oldMapping)
 			Expect(err).NotTo(HaveOccurred())
@@ -132,8 +137,9 @@ var _ = Describe("Validate", func() {
 
 	var _ = Describe("Delete", func() {
 		It("should not need to validate deletes", func() {
-			err := validator.ValidateDelete(ctx, &mapping)
+			msg, err := validator.ValidateDelete(ctx, &mapping)
 			Expect(err).NotTo(HaveOccurred())
+			Expect(msg).To(BeEmpty())
 		})
 	})
 })

config/crd/bases/binding.operators.coreos.com_servicebindings.yaml

@@ -229,13 +229,14 @@ spec:
                   description: "Condition contains details for one aspect of the current
                     state of this API Resource. --- This struct is intended for direct
                     use as an array at the field path .status.conditions.  For example,
-                    type FooStatus struct{     // Represents the observations of a
-                    foo's current state.     // Known .status.conditions.type are:
-                    \"Available\", \"Progressing\", and \"Degraded\"     // +patchMergeKey=type
-                    \    // +patchStrategy=merge     // +listType=map     // +listMapKey=type
-                    \    Conditions []metav1.Condition `json:\"conditions,omitempty\"
-                    patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
-                    \n     // other fields }"
+                    \n \ttype FooStatus struct{ \t    // Represents the observations
+                    of a foo's current state. \t    // Known .status.conditions.type
+                    are: \"Available\", \"Progressing\", and \"Degraded\" \t    //
+                    +patchMergeKey=type \t    // +patchStrategy=merge \t    // +listType=map
+                    \t    // +listMapKey=type \t    Conditions []metav1.Condition
+                    `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
+                    protobuf:\"bytes,1,rep,name=conditions\"` \n \t    // other fields
+                    \t}"
                   properties:
                     lastTransitionTime:
                       description: lastTransitionTime is the last time the condition