Migrate registry/strategy Updates to webhooks (#17)

charts/catalog/templates/webhook-register.yaml

@@ -120,6 +120,45 @@ metadata:
   name: {{ template "fullname" . }}-validating-webhook
   namespace: "{{ .Release.Namespace }}"
 webhooks:
+- name: validating.status.servicebindings.servicecatalog.k8s.io
+  clientConfig:
+    caBundle: {{ b64enc $ca.Cert }}
+    service:
+      name: {{ template "fullname" . }}-webhook
+      namespace: "{{ .Release.Namespace }}"
+      path: "/validating-servicebindings/status"
+  failurePolicy: Fail
+  rules:
+  - operations: [ "UPDATE" ]
+    apiGroups: ["servicecatalog.k8s.io"]
+    apiVersions: ["v1beta1"]
+    resources: ["servicebindings/status"]
+- name: validating.status.servicbrokers.servicecatalog.k8s.io
+  clientConfig:
+    caBundle: {{ b64enc $ca.Cert }}
+    service:
+      name: {{ template "fullname" . }}-webhook
+      namespace: "{{ .Release.Namespace }}"
+      path: "/validating-servicebrokers/status"
+  failurePolicy: Fail
+  rules:
+  - operations: [ "UPDATE" ]
+    apiGroups: ["servicecatalog.k8s.io"]
+    apiVersions: ["v1beta1"]
+    resources: ["servicebrokers/status"]
+- name: validating.status.clusterservicbrokers.servicecatalog.k8s.io
+  clientConfig:
+    caBundle: {{ b64enc $ca.Cert }}
+    service:
+      name: {{ template "fullname" . }}-webhook
+      namespace: "{{ .Release.Namespace }}"
+      path: "/validating-clusterservicebrokers/status"
+  failurePolicy: Fail
+  rules:
+  - operations: [ "UPDATE" ]
+    apiGroups: ["servicecatalog.k8s.io"]
+    apiVersions: ["v1beta1"]
+    resources: ["clusterservicebrokers/status"]
 - name: validating.serviceinstances.servicecatalog.k8s.io
   clientConfig:
     caBundle: {{ b64enc $ca.Cert }}
@@ -172,6 +211,58 @@ webhooks:
       apiGroups: ["servicecatalog.k8s.io"]
       apiVersions: ["v1beta1"]
       resources: ["servicebrokers"]
+- name: validating.serviceclasses.servicecatalog.k8s.io
+  clientConfig:
+    caBundle: {{ b64enc $ca.Cert }}
+    service:
+      name: {{ template "fullname" . }}-webhook
+      namespace: "{{ .Release.Namespace }}"
+      path: "/validating-serviceclasses"
+  failurePolicy: Fail
+  rules:
+    - operations: [ "CREATE", "UPDATE" ]
+      apiGroups: ["servicecatalog.k8s.io"]
+      apiVersions: ["v1beta1"]
+      resources: ["serviceclasses"]
+- name: validating.clusterserviceclasses.servicecatalog.k8s.io
+  clientConfig:
+    caBundle: {{ b64enc $ca.Cert }}
+    service:
+      name: {{ template "fullname" . }}-webhook
+      namespace: "{{ .Release.Namespace }}"
+      path: "/validating-clusterserviceclasses"
+  failurePolicy: Fail
+  rules:
+    - operations: [ "CREATE", "UPDATE" ]
+      apiGroups: ["servicecatalog.k8s.io"]
+      apiVersions: ["v1beta1"]
+      resources: ["clusterserviceclasses"]
+- name: validating.serviceplans.servicecatalog.k8s.io
+  clientConfig:
+    caBundle: {{ b64enc $ca.Cert }}
+    service:
+      name: {{ template "fullname" . }}-webhook
+      namespace: "{{ .Release.Namespace }}"
+      path: "/validating-serviceplans"
+  failurePolicy: Fail
+  rules:
+    - operations: [ "CREATE", "UPDATE" ]
+      apiGroups: ["servicecatalog.k8s.io"]
+      apiVersions: ["v1beta1"]
+      resources: ["serviceplans"]
+- name: validating.clusterserviceplans.servicecatalog.k8s.io
+  clientConfig:
+    caBundle: {{ b64enc $ca.Cert }}
+    service:
+      name: {{ template "fullname" . }}-webhook
+      namespace: "{{ .Release.Namespace }}"
+      path: "/validating-clusterserviceplans"
+  failurePolicy: Fail
+  rules:
+    - operations: [ "CREATE", "UPDATE" ]
+      apiGroups: ["servicecatalog.k8s.io"]
+      apiVersions: ["v1beta1"]
+      resources: ["clusterserviceplans"]
 ---
 apiVersion: v1
 kind: Secret

cmd/webhook/server/webhook.go

@@ -32,9 +32,13 @@ import (
 	spmutation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/serviceplan/mutation"
 
 	csbrvalidation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/clusterservicebroker/validation"
+	cscvalidation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/clusterserviceclass/validation"
+	cspvalidation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/clusterserviceplan/validation"
 	sbvalidation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/servicebinding/validation"
 	sbrvalidation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/servicebroker/validation"
+	scvalidation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/serviceclass/validation"
 	sivalidation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/serviceinstance/validation"
+	spvalidation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/serviceplan/validation"
 
 	"github.com/pkg/errors"
 	"k8s.io/apiserver/pkg/server/healthz"
@@ -84,10 +88,18 @@ func run(opts *WebhookServerOptions, stopCh <-chan struct{}) error {
 		"/mutating-serviceplans":     &spmutation.CreateUpdateHandler{},
 		"/mutating-serviceinstances": simutation.New(),
 
-		"/validating-clusterservicebrokers": csbrvalidation.NewAdmissionHandler(),
-		"/validating-servicebindings":       sbvalidation.NewAdmissionHandler(),
-		"/validating-servicebrokers":        sbrvalidation.NewAdmissionHandler(),
-		"/validating-serviceinstances":      sivalidation.NewAdmissionHandler(),
+		"/validating-clusterservicebrokers":        csbrvalidation.NewAdmissionHandler(),
+		"/validating-clusterservicebrokers/status": &csbrvalidation.StatusUpdateHandler{},
+		"/validating-clusterserviceclasses":        cscvalidation.NewAdmissionHandler(),
+		"/validating-clusterserviceplans":          cspvalidation.NewAdmissionHandler(),
+
+		"/validating-servicebindings":        sbvalidation.NewAdmissionHandler(),
+		"/validating-servicebindings/status": &sbvalidation.StatusUpdateValidationHandler{},
+		"/validating-servicebrokers":         sbrvalidation.NewAdmissionHandler(),
+		"/validating-servicebrokers/status":  &sbrvalidation.StatusUpdateHandler{},
+		"/validating-serviceclasses":         scvalidation.NewAdmissionHandler(),
+		"/validating-serviceplans":           spvalidation.NewAdmissionHandler(),
+		"/validating-serviceinstances":       sivalidation.NewAdmissionHandler(),
 	}
 
 	for path, handler := range webhooks {

pkg/apis/servicecatalog/validation/binding.go

@@ -17,7 +17,7 @@ limitations under the License.
 package validation
 
 import (
-	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 	scfeatures "github.com/kubernetes-sigs/service-catalog/pkg/features"
 	apivalidation "k8s.io/apimachinery/pkg/api/validation"
 	"k8s.io/apimachinery/pkg/util/validation/field"

pkg/apis/servicecatalog/validation/binding_test.go

@@ -23,7 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
-	"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	servicecatalog "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 )
 
 func validServiceBinding() *servicecatalog.ServiceBinding {

pkg/apis/servicecatalog/validation/broker.go

@@ -23,8 +23,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
-	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
-	"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
+	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 	"github.com/kubernetes-sigs/service-catalog/pkg/filter"
 )
 
@@ -218,8 +217,8 @@ func validateCommonServiceBrokerSpec(spec *sc.CommonServiceBrokerSpec, fldPath *
 		} else {
 			for _, restriction := range spec.CatalogRestrictions.ServiceClass {
 				p := filter.ExtractProperty(restriction)
-				if !isClusterServiceBroker && !v1beta1.IsValidServiceClassProperty(p) ||
-					isClusterServiceBroker && !v1beta1.IsValidClusterServiceClassProperty(p) {
+				if !isClusterServiceBroker && !sc.IsValidServiceClassProperty(p) ||
+					isClusterServiceBroker && !sc.IsValidClusterServiceClassProperty(p) {
 					commonErrs = append(commonErrs,
 						field.Invalid(fldPath.Child("catalogRestrictions", "serviceClass"),
 							spec.CatalogRestrictions.ServiceClass, fmt.Sprintf("Invalid property: %s", p)))
@@ -237,8 +236,8 @@ func validateCommonServiceBrokerSpec(spec *sc.CommonServiceBrokerSpec, fldPath *
 		} else {
 			for _, restriction := range spec.CatalogRestrictions.ServicePlan {
 				p := filter.ExtractProperty(restriction)
-				if !isClusterServiceBroker && !v1beta1.IsValidServicePlanProperty(p) ||
-					isClusterServiceBroker && !v1beta1.IsValidClusterServicePlanProperty(p) {
+				if !isClusterServiceBroker && !sc.IsValidServicePlanProperty(p) ||
+					isClusterServiceBroker && !sc.IsValidClusterServicePlanProperty(p) {
 					commonErrs = append(commonErrs,
 						field.Invalid(fldPath.Child("catalogRestrictions", "servicePlan"),
 							spec.CatalogRestrictions.ServicePlan, fmt.Sprintf("Invalid property: %s", p)))

pkg/apis/servicecatalog/validation/broker_test.go

@@ -22,7 +22,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	servicecatalog "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 )
 
 func TestValidateClusterServiceBroker(t *testing.T) {

pkg/apis/servicecatalog/validation/instance.go

@@ -19,7 +19,7 @@ package validation
 import (
 	"fmt"
 
-	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 	"github.com/kubernetes-sigs/service-catalog/pkg/controller"
 	scfeatures "github.com/kubernetes-sigs/service-catalog/pkg/features"
 	apivalidation "k8s.io/apimachinery/pkg/api/validation"
@@ -78,7 +78,6 @@ func internalValidateServiceInstance(instance *sc.ServiceInstance, create bool)
 		validateServiceInstanceName,
 		field.NewPath("metadata"))...)
 	allErrs = append(allErrs, validateServiceInstanceSpec(&instance.Spec, field.NewPath("spec"), create)...)
-	allErrs = append(allErrs, validateServiceInstanceStatus(&instance.Status, field.NewPath("status"), create)...)
 	if create {
 		allErrs = append(allErrs, validateServiceInstanceCreate(instance)...)
 	} else {
@@ -405,6 +404,7 @@ func internalValidateServiceInstanceReferencesUpdateAllowed(new *sc.ServiceInsta
 func ValidateServiceInstanceStatusUpdate(new *sc.ServiceInstance, old *sc.ServiceInstance) field.ErrorList {
 	allErrs := field.ErrorList{}
 	allErrs = append(allErrs, internalValidateServiceInstanceStatusUpdateAllowed(new, old)...)
+	allErrs = append(allErrs, validateServiceInstanceStatus(&new.Status, field.NewPath("status"), false)...)
 	allErrs = append(allErrs, internalValidateServiceInstance(new, false)...)
 	return allErrs
 }

pkg/apis/servicecatalog/validation/instance_test.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
-	"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	servicecatalog "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 )
 
 const (
@@ -893,6 +893,7 @@ func TestValidateServiceInstance(t *testing.T) {
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
 			errs := internalValidateServiceInstance(tc.instance, tc.create)
+			errs = append(errs, validateServiceInstanceStatus(&tc.instance.Status, field.NewPath("status"), tc.create)...)
 			if len(errs) != 0 && tc.valid {
 				t.Errorf("unexpected error: %v", errs)
 			} else if len(errs) == 0 && !tc.valid {

pkg/apis/servicecatalog/validation/serviceclass.go

@@ -21,7 +21,7 @@ import (
 	utilvalidation "k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
-	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 )
 
 const commonServiceClassNameMaxLength int = 63

pkg/apis/servicecatalog/validation/serviceclass_test.go

@@ -21,7 +21,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	servicecatalog "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 )
 
 func validClusterServiceClass() *servicecatalog.ClusterServiceClass {

pkg/apis/servicecatalog/validation/serviceplan.go

@@ -23,7 +23,7 @@ import (
 	utilvalidation "k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
-	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 )
 
 const commonServicePlanNameMaxLength int = 63

pkg/apis/servicecatalog/validation/serviceplan_test.go

@@ -21,7 +21,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	servicecatalog "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 )
 
 func validClusterServicePlan() *servicecatalog.ClusterServicePlan {

pkg/apis/servicecatalog/validation/validation.go

@@ -17,7 +17,7 @@ limitations under the License.
 package validation
 
 import (
-	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"regexp"
 )

pkg/registry/servicecatalog/binding/strategy.go

@@ -32,7 +32,7 @@ import (
 	"k8s.io/apiserver/pkg/storage/names"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 
-	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 	scv "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/validation"
 	scfeatures "github.com/kubernetes-sigs/service-catalog/pkg/features"
 	"k8s.io/klog"

pkg/registry/servicecatalog/binding/strategy_test.go

@@ -23,7 +23,7 @@ import (
 	sctestutil "github.com/kubernetes-sigs/service-catalog/test/util"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 
-	"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	servicecatalog "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 	scfeatures "github.com/kubernetes-sigs/service-catalog/pkg/features"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

pkg/registry/servicecatalog/clusterservicebroker/strategy.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/apiserver/pkg/registry/rest"
 	"k8s.io/apiserver/pkg/storage/names"
 
-	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 	scv "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/validation"
 	"k8s.io/klog"
 )

pkg/registry/servicecatalog/clusterservicebroker/strategy_test.go

@@ -19,7 +19,7 @@ package clusterservicebroker
 import (
 	"testing"
 
-	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 	sctestutil "github.com/kubernetes-sigs/service-catalog/test/util"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

pkg/registry/servicecatalog/clusterserviceclass/strategy.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/apiserver/pkg/registry/rest"
 	"k8s.io/apiserver/pkg/storage/names"
 
-	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 	scv "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/validation"
 	"k8s.io/klog"
 )

pkg/registry/servicecatalog/clusterserviceplan/strategy.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/apiserver/pkg/registry/rest"
 	"k8s.io/apiserver/pkg/storage/names"
 
-	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 	scv "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/validation"
 	"k8s.io/klog"
 )

pkg/registry/servicecatalog/instance/strategy.go

@@ -32,7 +32,7 @@ import (
 	"k8s.io/apiserver/pkg/storage/names"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 
-	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 	scv "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/validation"
 	scfeatures "github.com/kubernetes-sigs/service-catalog/pkg/features"
 	"k8s.io/klog"

pkg/registry/servicecatalog/instance/strategy_test.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	servicecatalog "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 	scfeatures "github.com/kubernetes-sigs/service-catalog/pkg/features"
 	sctestutil "github.com/kubernetes-sigs/service-catalog/test/util"
 

pkg/registry/servicecatalog/servicebroker/strategy.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/apiserver/pkg/registry/rest"
 	"k8s.io/apiserver/pkg/storage/names"
 
-	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 	scv "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/validation"
 	"k8s.io/klog"
 )

pkg/registry/servicecatalog/servicebroker/strategy_test.go

@@ -19,7 +19,7 @@ package servicebroker
 import (
 	"testing"
 
-	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 	sctestutil "github.com/kubernetes-sigs/service-catalog/test/util"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

pkg/registry/servicecatalog/serviceclass/strategy.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/apiserver/pkg/registry/rest"
 	"k8s.io/apiserver/pkg/storage/names"
 
-	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 	scv "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/validation"
 	"k8s.io/klog"
 )

pkg/registry/servicecatalog/serviceplan/strategy.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/apiserver/pkg/registry/rest"
 	"k8s.io/apiserver/pkg/storage/names"
 
-	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
+	sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
 	scv "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/validation"
 	"k8s.io/klog"
 )