BUILD/MINOR: remove controller-gen annotation from CRDs

oktalz · oktalz · commit a8f5b276ad3d · 2025-02-25T14:12:54.000+01:00
diff --git a/crs/code-generator.sh b/crs/code-generator.sh
@@ -100,3 +100,5 @@ go install sigs.k8s.io/controller-tools/cmd/controller-gen@${CONTROLLER_GEN_VERS
 # # Controller-gen version
 echo "Controller-gen: " ${CONTROLLER_GEN_VERSION}
 controller-gen crd paths=./crs/api/ingress/v3/...  output:crd:dir=./crs/definition
+# remove code-gen annotation (dependabot fails)
+find ${CR_DIR}/definition -type f -name '*.yaml' -exec sed -i '/controller-gen.kubebuilder.io\/version/d' {} +
diff --git a/crs/definition/ingress.v1.haproxy.org_backends.yaml b/crs/definition/ingress.v1.haproxy.org_backends.yaml
@@ -3,7 +3,6 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.0
     haproxy.org/client-native: v5.1.16-0.20241206145631-acb903fd9ec2
   name: backends.ingress.v1.haproxy.org
 spec:
diff --git a/crs/definition/ingress.v1.haproxy.org_defaults.yaml b/crs/definition/ingress.v1.haproxy.org_defaults.yaml
@@ -3,7 +3,6 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.0
     haproxy.org/client-native: v5.1.16-0.20241206145631-acb903fd9ec2
   name: defaults.ingress.v1.haproxy.org
 spec:
diff --git a/crs/definition/ingress.v1.haproxy.org_globals.yaml b/crs/definition/ingress.v1.haproxy.org_globals.yaml
@@ -3,7 +3,6 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.0
     haproxy.org/client-native: v5.1.16-0.20241206145631-acb903fd9ec2
   name: globals.ingress.v1.haproxy.org
 spec:
diff --git a/crs/definition/ingress.v1.haproxy.org_tcps.yaml b/crs/definition/ingress.v1.haproxy.org_tcps.yaml
@@ -3,7 +3,6 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.0
     haproxy.org/client-native: v5.1.16-0.20241206145631-acb903fd9ec2
   name: tcps.ingress.v1.haproxy.org
 spec:
diff --git a/crs/definition/ingress.v3.haproxy.org_backends.yaml b/crs/definition/ingress.v3.haproxy.org_backends.yaml
@@ -3,7 +3,6 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.0
     haproxy.org/client-native: v6.1.1
   name: backends.ingress.v3.haproxy.org
 spec:
diff --git a/crs/definition/ingress.v3.haproxy.org_defaults.yaml b/crs/definition/ingress.v3.haproxy.org_defaults.yaml
@@ -3,7 +3,6 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.0
     haproxy.org/client-native: v6.1.1
   name: defaults.ingress.v3.haproxy.org
 spec:
diff --git a/crs/definition/ingress.v3.haproxy.org_globals.yaml b/crs/definition/ingress.v3.haproxy.org_globals.yaml
@@ -3,7 +3,6 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.0
     haproxy.org/client-native: v6.1.1
   name: globals.ingress.v3.haproxy.org
 spec:
diff --git a/crs/definition/ingress.v3.haproxy.org_tcps.yaml b/crs/definition/ingress.v3.haproxy.org_tcps.yaml
@@ -3,7 +3,6 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.0
     haproxy.org/client-native: v6.1.1
   name: tcps.ingress.v3.haproxy.org
 spec:
diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	k8s.io/apimachinery v0.32.0
 	k8s.io/client-go v0.32.0
 	sigs.k8s.io/controller-runtime v0.19.4
-	sigs.k8s.io/controller-tools v0.17.0
+	sigs.k8s.io/controller-tools v0.17.1
 	sigs.k8s.io/gateway-api v0.5.0
 	sigs.k8s.io/yaml v1.4.0
 )
diff --git a/go.sum b/go.sum
@@ -234,8 +234,8 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ
 k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/controller-runtime v0.19.4 h1:SUmheabttt0nx8uJtoII4oIP27BVVvAKFvdvGFwV/Qo=
 sigs.k8s.io/controller-runtime v0.19.4/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
-sigs.k8s.io/controller-tools v0.17.0 h1:KaEQZbhrdY6J3zLBHplt+0aKUp8PeIttlhtF2UDo6bI=
-sigs.k8s.io/controller-tools v0.17.0/go.mod h1:SKoWY8rwGWDzHtfnhmOwljn6fViG0JF7/xmnxpklgjo=
+sigs.k8s.io/controller-tools v0.17.1 h1:bQ+dKCS7jY9AgpefenBDtm6geJZCHVKbegpLynxgyus=
+sigs.k8s.io/controller-tools v0.17.1/go.mod h1:3QXAdrmdxYuQ4MifvbCAFD9wLXn7jylnfBPYS4yVDdc=
 sigs.k8s.io/gateway-api v0.5.0 h1:ze+k9fJqvmL8s1t3e4q1ST8RnN+f09dEv+gfacahlAE=
 sigs.k8s.io/gateway-api v0.5.0/go.mod h1:x0AP6gugkFV8fC/oTlnOMU0pnmuzIR8LfIPRVUjxSqA=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ require (`
`24`	`24`	`k8s.io/apimachinery v0.32.0`
`25`	`25`	`k8s.io/client-go v0.32.0`
`26`	`26`	`sigs.k8s.io/controller-runtime v0.19.4`
`27`		`- sigs.k8s.io/controller-tools v0.17.0`
	`27`	`+ sigs.k8s.io/controller-tools v0.17.1`
`28`	`28`	`sigs.k8s.io/gateway-api v0.5.0`
`29`	`29`	`sigs.k8s.io/yaml v1.4.0`
`30`	`30`	`)`