Merge pull request #4 from SAP/renovate/minor-deps-golang

chore(go.mod/go.sum): update minor dependencies (golang)

api/v1alpha1/clusterspace_webhook.go

@@ -12,6 +12,7 @@ import (
 	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.
@@ -41,7 +42,7 @@ func (r *ClusterSpace) Default() {
 var _ webhook.Validator = &ClusterSpace{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *ClusterSpace) ValidateCreate() error {
+func (r *ClusterSpace) ValidateCreate() (admission.Warnings, error) {
 	clusterspacelog.Info("validate create", "name", r.Name)
 	// Call the defaulting logic again (because defaulting might be incomplete in case of generateName usage)
 	if r.Name == "" && r.GenerateName != "" {
@@ -51,39 +52,39 @@ func (r *ClusterSpace) ValidateCreate() error {
 
 	if !(r.Spec.Guid != "" && r.Spec.Name == "" && r.Spec.OrganizationName == "" ||
 		r.Spec.Guid == "" && r.Spec.Name != "" && r.Spec.OrganizationName != "") {
-		return fmt.Errorf("exactly one of spec.guid or spec.name plus spec.organizationName must be specified")
+		return nil, fmt.Errorf("exactly one of spec.guid or spec.name plus spec.organizationName must be specified")
 	}
 
-	return nil
+	return nil, nil
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (r *ClusterSpace) ValidateUpdate(old runtime.Object) error {
+func (r *ClusterSpace) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 	clusterspacelog.Info("validate update", "name", r.Name)
 	s := old.(*ClusterSpace)
 	// Call the defaulting webhook logic for the old object (because defaulting through the webhook might be incomplete in case of generateName usage)
 	s.Name = r.Name
 	s.Default()
 
 	if r.Spec.Guid != s.Spec.Guid {
-		return fmt.Errorf("spec.guid is immutable")
+		return nil, fmt.Errorf("spec.guid is immutable")
 	}
 
 	// TODO: why not to allow name updates ?
 	if r.Spec.Name != s.Spec.Name {
-		return fmt.Errorf("spec.name is immutable")
+		return nil, fmt.Errorf("spec.name is immutable")
 	}
 
 	if r.Spec.OrganizationName != s.Spec.OrganizationName {
-		return fmt.Errorf("spec.organizationName is immutable")
+		return nil, fmt.Errorf("spec.organizationName is immutable")
 	}
 
-	return nil
+	return nil, nil
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *ClusterSpace) ValidateDelete() error {
+func (r *ClusterSpace) ValidateDelete() (admission.Warnings, error) {
 	clusterspacelog.Info("validate delete", "name", r.Name)
 
-	return nil
+	return nil, nil
 }

api/v1alpha1/servicebinding_webhook.go

@@ -12,6 +12,7 @@ import (
 	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.
@@ -49,14 +50,14 @@ func (r *ServiceBinding) Default() {
 var _ webhook.Validator = &ServiceBinding{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *ServiceBinding) ValidateCreate() error {
+func (r *ServiceBinding) ValidateCreate() (admission.Warnings, error) {
 	servicebindinglog.Info("validate create", "name", r.Name)
 
-	return nil
+	return nil, nil
 }
 
 // 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) {
 	servicebindinglog.Info("validate update", "name", r.Name)
 	s := old.(*ServiceBinding)
 	// Call the defaulting webhook logic for the old object (because defaulting through the webhook might be incomplete in case of generateName usage)
@@ -65,19 +66,19 @@ func (r *ServiceBinding) ValidateUpdate(old runtime.Object) error {
 
 	// TODO: why not to allow name updates ?
 	if r.Spec.Name != s.Spec.Name {
-		return fmt.Errorf("spec.name is immutable")
+		return nil, fmt.Errorf("spec.name is immutable")
 	}
 
 	if r.Spec.ServiceInstanceName != s.Spec.ServiceInstanceName {
-		return fmt.Errorf("spec.serviceInstanceName is immutable")
+		return nil, fmt.Errorf("spec.serviceInstanceName is immutable")
 	}
 
-	return nil
+	return nil, nil
 }
 
 // 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) {
 	servicebindinglog.Info("validate delete", "name", r.Name)
 
-	return nil
+	return nil, nil
 }

api/v1alpha1/serviceinstance_webhook.go

@@ -12,6 +12,7 @@ import (
 	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.
@@ -51,24 +52,24 @@ func (r *ServiceInstance) Default() {
 var _ webhook.Validator = &ServiceInstance{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *ServiceInstance) ValidateCreate() error {
+func (r *ServiceInstance) ValidateCreate() (admission.Warnings, error) {
 	serviceinstancelog.Info("validate create", "name", r.Name)
 
 	if !(r.Spec.SpaceName != "" && r.Spec.ClusterSpaceName == "" ||
 		r.Spec.SpaceName == "" && r.Spec.ClusterSpaceName != "") {
-		return fmt.Errorf("exactly one of spec.spaceName or spec.clusterSpaceName must be specified")
+		return nil, fmt.Errorf("exactly one of spec.spaceName or spec.clusterSpaceName must be specified")
 	}
 
 	if !(r.Spec.ServiceOfferingName != "" && r.Spec.ServicePlanName != "" && r.Spec.ServicePlanGuid == "" ||
 		r.Spec.ServiceOfferingName == "" && r.Spec.ServicePlanName == "" && r.Spec.ServicePlanGuid != "") {
-		return fmt.Errorf("exactly one of spec.serviceOfferingName plus spec.servicePlanName or spec.servicePlanGuid must be specified")
+		return nil, fmt.Errorf("exactly one of spec.serviceOfferingName plus spec.servicePlanName or spec.servicePlanGuid must be specified")
 	}
 
-	return nil
+	return nil, nil
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (r *ServiceInstance) ValidateUpdate(old runtime.Object) error {
+func (r *ServiceInstance) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 	serviceinstancelog.Info("validate update", "name", r.Name)
 	s := old.(*ServiceInstance)
 	// Call the defaulting webhook logic for the old object (because defaulting through the webhook might be incomplete in case of generateName usage)
@@ -77,35 +78,35 @@ func (r *ServiceInstance) ValidateUpdate(old runtime.Object) error {
 
 	// TODO: why not to allow name updates ?
 	if r.Spec.Name != s.Spec.Name {
-		return fmt.Errorf("spec.name is immutable")
+		return nil, fmt.Errorf("spec.name is immutable")
 	}
 
 	if r.Spec.ClusterSpaceName != s.Spec.ClusterSpaceName {
-		return fmt.Errorf("spec.clusterSpaceName is immutable")
+		return nil, fmt.Errorf("spec.clusterSpaceName is immutable")
 	}
 
 	if r.Spec.SpaceName != s.Spec.SpaceName {
-		return fmt.Errorf("spec.spaceName is immutable")
+		return nil, fmt.Errorf("spec.spaceName is immutable")
 	}
 
 	if r.Spec.ServiceOfferingName != s.Spec.ServiceOfferingName {
-		return fmt.Errorf("spec.serviceOfferingName is immutable")
+		return nil, fmt.Errorf("spec.serviceOfferingName is immutable")
 	}
 
 	if r.Spec.ServicePlanName != s.Spec.ServicePlanName {
-		return fmt.Errorf("spec.servicePlanName is immutable")
+		return nil, fmt.Errorf("spec.servicePlanName is immutable")
 	}
 
 	if r.Spec.ServicePlanGuid != s.Spec.ServicePlanGuid {
-		return fmt.Errorf("spec.servicePlanGuid is immutable")
+		return nil, fmt.Errorf("spec.servicePlanGuid is immutable")
 	}
 
-	return nil
+	return nil, nil
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *ServiceInstance) ValidateDelete() error {
+func (r *ServiceInstance) ValidateDelete() (admission.Warnings, error) {
 	serviceinstancelog.Info("validate delete", "name", r.Name)
 
-	return nil
+	return nil, nil
 }

api/v1alpha1/space_webhook.go

@@ -12,6 +12,7 @@ import (
 	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.
@@ -41,7 +42,7 @@ func (r *Space) Default() {
 var _ webhook.Validator = &Space{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *Space) ValidateCreate() error {
+func (r *Space) ValidateCreate() (admission.Warnings, error) {
 	spacelog.Info("validate create", "name", r.Name)
 	// Call the defaulting logic again (because defaulting might be incomplete in case of generateName usage)
 	if r.Name == "" && r.GenerateName != "" {
@@ -51,39 +52,39 @@ func (r *Space) ValidateCreate() error {
 
 	if !(r.Spec.Guid != "" && r.Spec.Name == "" && r.Spec.OrganizationName == "" ||
 		r.Spec.Guid == "" && r.Spec.Name != "" && r.Spec.OrganizationName != "") {
-		return fmt.Errorf("exactly one of spec.guid or spec.name plus spec.organizationName must be specified")
+		return nil, fmt.Errorf("exactly one of spec.guid or spec.name plus spec.organizationName must be specified")
 	}
 
-	return nil
+	return nil, nil
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (r *Space) ValidateUpdate(old runtime.Object) error {
+func (r *Space) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 	spacelog.Info("validate update", "name", r.Name)
 	s := old.(*Space)
 	// Call the defaulting webhook logic for the old object (because defaulting through the webhook might be incomplete in case of generateName usage)
 	s.Name = r.Name
 	s.Default()
 
 	if r.Spec.Guid != s.Spec.Guid {
-		return fmt.Errorf("spec.guid is immutable")
+		return nil, fmt.Errorf("spec.guid is immutable")
 	}
 
 	// TODO: why not to allow name updates ?
 	if r.Spec.Name != s.Spec.Name {
-		return fmt.Errorf("spec.name is immutable")
+		return nil, fmt.Errorf("spec.name is immutable")
 	}
 
 	if r.Spec.OrganizationName != s.Spec.OrganizationName {
-		return fmt.Errorf("spec.organizationName is immutable")
+		return nil, fmt.Errorf("spec.organizationName is immutable")
 	}
 
-	return nil
+	return nil, nil
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *Space) ValidateDelete() error {
+func (r *Space) ValidateDelete() (admission.Warnings, error) {
 	spacelog.Info("validate delete", "name", r.Name)
 
-	return nil
+	return nil, nil
 }

go.mod

@@ -1,74 +1,70 @@
 module github.com/sap/cf-service-operator
 
-go 1.19
+go 1.21
 
 require (
 	github.com/cloudfoundry-community/go-cfclient/v2 v2.0.0
 	github.com/pkg/errors v0.9.1
-	k8s.io/api v0.26.3
-	k8s.io/apiextensions-apiserver v0.26.3
-	k8s.io/apimachinery v0.26.3
-	k8s.io/client-go v0.26.3
-	sigs.k8s.io/controller-runtime v0.14.6
+	k8s.io/api v0.28.0
+	k8s.io/apiextensions-apiserver v0.28.0
+	k8s.io/apimachinery v0.28.0
+	k8s.io/client-go v0.28.0
+	sigs.k8s.io/controller-runtime v0.16.0
 )
 
 require (
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
-	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
+	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-logr/logr v1.2.4 // indirect
-	github.com/go-logr/zapr v1.2.3 // indirect
+	github.com/go-logr/zapr v1.2.4 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
-	github.com/go-openapi/jsonreference v0.20.1 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/gnostic v0.5.7-v3refs // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/kr/pretty v0.3.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/onsi/ginkgo/v2 v2.9.7 // indirect
-	github.com/onsi/gomega v1.27.8 // indirect
-	github.com/prometheus/client_golang v1.14.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/prometheus/client_golang v1.16.0 // indirect
+	github.com/prometheus/client_model v0.4.0 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/procfs v0.10.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
-	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
-	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
-	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/term v0.8.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.25.0 // indirect
+	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
+	golang.org/x/net v0.13.0 // indirect
+	golang.org/x/oauth2 v0.8.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/term v0.10.0 // indirect
+	golang.org/x/text v0.11.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
+	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/component-base v0.26.3 // indirect
-	k8s.io/klog/v2 v2.90.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
-	k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
+	k8s.io/component-base v0.28.0 // indirect
+	k8s.io/klog/v2 v2.100.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
+	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect