updated code generation

gardener · Oct 6, 2023 · 552c4a9 · 552c4a9
1 parent ca84d2f
commit 552c4a9
Show file tree

Hide file tree

Showing 21 changed files with 488 additions and 526 deletions.
diff --git a/Makefile b/Makefile
@@ -16,6 +16,7 @@ revendor:
 	@GO111MODULE=on go mod tidy
 	@GO111MODULE=on go mod vendor
 	@chmod +x $(REPO_ROOT)/vendor/github.com/gardener/controller-manager-library/hack/run-in.sh
+	@chmod +x $(REPO_ROOT)/vendor/k8s.io/code-generator/*.sh
 
 .PHONY: check
 check:
@@ -53,6 +54,7 @@ generate:
 	@./hack/generate-code
 	@GO111MODULE=on go generate ./pkg/apis/cert/...
 	@./hack/copy-crds.sh
+	@go fmt ./pkg/...
 
 .PHONY: docker-images
 docker-images:

diff --git a/charts/cert-management/templates/cert.gardener.cloud_certificaterevocations.yaml b/charts/cert-management/templates/cert.gardener.cloud_certificaterevocations.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.createCRDs.certificates }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -9,8 +8,7 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: certificaterevocations.cert.gardener.cloud
 spec:
   group: cert.gardener.cloud
@@ -286,4 +284,3 @@ spec:
     storage: true
     subresources:
       status: {}
-{{- end }}
diff --git a/charts/cert-management/templates/cert.gardener.cloud_certificates.yaml b/charts/cert-management/templates/cert.gardener.cloud_certificates.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.createCRDs.certificates }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -9,8 +8,7 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: certificates.cert.gardener.cloud
 spec:
   group: cert.gardener.cloud
@@ -359,4 +357,3 @@ spec:
     storage: true
     subresources:
       status: {}
-{{- end }}
diff --git a/charts/cert-management/templates/cert.gardener.cloud_issuers.yaml b/charts/cert-management/templates/cert.gardener.cloud_issuers.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.createCRDs.issuers }}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -9,8 +8,7 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: issuers.cert.gardener.cloud
 spec:
   group: cert.gardener.cloud
@@ -219,4 +217,3 @@ spec:
     storage: true
     subresources:
       status: {}
-{{- end }}
diff --git a/hack/generate-code b/hack/generate-code
@@ -13,9 +13,20 @@ source "$PROJECT_ROOT/build/settings.src"
 
 rm -rf "$SCRIPT_ROOT/pkg/client/cert"
 
-bash "${PROJECT_ROOT}"/vendor/k8s.io/code-generator/generate-groups.sh \
-  "deepcopy,client,informer,lister" \
-  $PKGPATH/pkg/client/$APINAME \
-  $PKGPATH/pkg/apis \
-  $APINAME:$APIVERSION \
-  -h "${PROJECT_ROOT}/hack/LICENSE_BOILERPLATE.txt"
+CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
+
+source "${CODEGEN_PKG}/kube_codegen.sh"
+
+kube::codegen::gen_helpers \
+  --input-pkg-root $PKGPATH/pkg/apis \
+  --output-base "${PROJECT_ROOT}/../../.." \
+  --boilerplate "${PROJECT_ROOT}/hack/LICENSE_BOILERPLATE.txt"
+
+echo base "${PROJECT_ROOT}/../../.."
+
+kube::codegen::gen_client \
+    --with-watch \
+    --input-pkg-root $PKGPATH/pkg/apis \
+    --output-pkg-root $PKGPATH/pkg/client/$APINAME \
+    --output-base "${PROJECT_ROOT}/../../.." \
+    --boilerplate "${PROJECT_ROOT}/hack/LICENSE_BOILERPLATE.txt"
diff --git a/pkg/apis/cert/crds/cert.gardener.cloud_certificaterevocations.yaml b/pkg/apis/cert/crds/cert.gardener.cloud_certificaterevocations.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: certificaterevocations.cert.gardener.cloud
 spec:
   group: cert.gardener.cloud

diff --git a/pkg/apis/cert/crds/cert.gardener.cloud_certificates.yaml b/pkg/apis/cert/crds/cert.gardener.cloud_certificates.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: certificates.cert.gardener.cloud
 spec:
   group: cert.gardener.cloud

diff --git a/pkg/apis/cert/crds/cert.gardener.cloud_issuers.yaml b/pkg/apis/cert/crds/cert.gardener.cloud_issuers.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: issuers.cert.gardener.cloud
 spec:
   group: cert.gardener.cloud

diff --git a/pkg/apis/cert/crds/zz_generated_crds.go b/pkg/apis/cert/crds/zz_generated_crds.go
@@ -21,8 +21,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: certificaterevocations.cert.gardener.cloud
 spec:
   group: cert.gardener.cloud
@@ -306,8 +305,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: certificates.cert.gardener.cloud
 spec:
   group: cert.gardener.cloud
@@ -664,8 +662,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: issuers.cert.gardener.cloud
 spec:
   group: cert.gardener.cloud

diff --git a/pkg/apis/cert/v1alpha1/certificate.go b/pkg/apis/cert/v1alpha1/certificate.go