Merge pull request #42 from szuecs/hosts-use-items-markers

Use kubebuilder items markers

Makefile

@@ -31,10 +31,7 @@ $(GENERATED): $(CRD_TYPE_SOURCE)
 	bash -x ./hack/update-codegen.sh
 
 $(GENERATED_CRD): go.mod $(GENERATED)
-	go run sigs.k8s.io/controller-tools/cmd/[email protected] crd:crdVersions=v1 paths=./apis/... output:crd:dir=.
-	# workaround to add validation to array items. Not supported by controller-gen
-	# ref: https://github.com/kubernetes-sigs/controller-tools/issues/342
-	go run hack/crd/add_hosts_validation.go $(GENERATED_CRD)
+	go run sigs.k8s.io/controller-tools/cmd/[email protected] crd:crdVersions=v1 paths=./apis/... output:crd:dir=.
 
 build.local: $(LOCAL_BINARIES) $(GENERATED_CRD)
 build.linux: $(LINUX_BINARIES) $(GENERATED_CRD)

apis/zalando.org/v1/types.go

@@ -43,6 +43,8 @@ type RouteGroupList struct {
 type RouteGroupSpec struct {
 	// List of hostnames for the RouteGroup
 	// +kubebuilder:validation:MinItems=1
+	// +kubebuilder:validation:items:MaxLength=255
+	// +kubebuilder:validation:items:Pattern="^[a-z0-9]([-a-z0-9]*[a-z0-9])?([.][a-z0-9]([-a-z0-9]*[a-z0-9])?)*$"
 	// +listType=set
 	Hosts []string `json:"hosts,omitempty"`
 	// List of backends that can be referenced in the routes
@@ -180,6 +182,8 @@ type RouteGroupTLSSpec struct {
 	// The values in this list must match the host name(s) used for
 	// the RouteGroup in order to terminate TLS for the host(s).
 	// +kubebuilder:validation:MinItems=1
+	// +kubebuilder:validation:items:MaxLength=255
+	// +kubebuilder:validation:items:Pattern="^[a-z0-9]([-a-z0-9]*[a-z0-9])?([.][a-z0-9]([-a-z0-9]*[a-z0-9])?)*$"
 	// +listType=set
 	Hosts []string `json:"hosts"`
 

zalando.org_routegroups.yaml

@@ -1,8 +1,9 @@
+---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: routegroups.zalando.org
 spec:
   group: zalando.org