mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-30 19:35:06 +00:00
Code Activity

Feat: Upgrade controller-gen to v0.12.0 and fix tooling (#7683)

Browse source 
* Upgrade controller-gen and fix tooling

Signed-off-by: shahbaz <shahbaz@shahbaz.myguest.virtualbox.org>

* Address comments

Signed-off-by: shahbaz <shahbaz@shahbaz.myguest.virtualbox.org>

* Add a marker in the sed command

Signed-off-by: shahbaz <shahbaz@shahbaz.myguest.virtualbox.org>

* Upgrade to the latest version and rearrange the annotations

Signed-off-by: shahbaz <shahbaz@shahbaz.myguest.virtualbox.org>

* Fix failing Verify Codegen tests

Signed-off-by: shahbaz <shahbaz@shahbaz.myguest.virtualbox.org>

* Remove unnecessary file

Signed-off-by: shahbaz <shahbaz@shahbaz.myguest.virtualbox.org>

* Restore original version in test folder

Signed-off-by: shahbaz <shahbaz@shahbaz.myguest.virtualbox.org>

* Add creationTimestamp: null again in the test folder

Signed-off-by: shahbaz <shahbaz@shahbaz.myguest.virtualbox.org>

---------

Signed-off-by: shahbaz <shahbaz@shahbaz.myguest.virtualbox.org>
Co-authored-by: shahbaz <shahbaz@shahbaz.myguest.virtualbox.org>
Co-authored-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
This commit is contained in:
Md Shahbaz Alam 2023-06-29 21:28:18 +05:30 • committed by GitHub
parent f6933f11f3
commit 41c3490ba9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 78 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Makefile
View file

@ -36,7 +36,7 @@ TOOLS_DIR := $(PWD)/.tools
KIND := $(TOOLS_DIR)/kind
KIND_VERSION := v0.17.0
CONTROLLER_GEN := $(TOOLS_DIR)/controller-gen
CONTROLLER_GEN_VERSION := v0.11.3
CONTROLLER_GEN_VERSION := v0.12.0
CLIENT_GEN := $(TOOLS_DIR)/client-gen
LISTER_GEN := $(TOOLS_DIR)/lister-gen
INFORMER_GEN := $(TOOLS_DIR)/informer-gen
@ -469,12 +469,11 @@ codegen-helm-crds: codegen-crds-all ## Generate helm CRDs
@cat $(CRDS_PATH)/* \
| $(SED) -e '1i{{- if .Values.crds.install }}' \
| $(SED) -e '$$a{{- end }}' \
| $(SED) -e '/^ creationTimestamp: null/i \ \ \ \ {{- with .Values.crds.annotations }}' \
| $(SED) -e '/^ creationTimestamp: null/i \ \ \ \ {{- toYaml . | nindent 4 }}' \
| $(SED) -e '/^ creationTimestamp: null/i \ \ \ \ {{- end }}' \
| $(SED) -e '/^ creationTimestamp: null/a \ \ \ \ {{- include "kyverno.crds.labels" . | nindent 4 }}' \
| $(SED) -e '/^ creationTimestamp: null/a \ \ labels:' \
| $(SED) -e '/^ creationTimestamp: null/d' \
| $(SED) -e '/^ annotations:/a \ \ \ \ {{- end }}' \
| $(SED) -e '/^ annotations:/a \ \ \ \ {{- toYaml . | nindent 4 }}' \
| $(SED) -e '/^ annotations:/a \ \ \ \ {{- with .Values.crds.annotations }}' \
| $(SED) -e '/^ annotations:/i \ \ labels:' \
| $(SED) -e '/^ labels:/a \ \ \ \ {{- include "kyverno.crds.labels" . | nindent 4 }}' \
> ./charts/kyverno/templates/crds/crds.yaml
.PHONY: codegen-helm-all

72
charts/kyverno/templates/crds/crds.yaml
View file

@ -3,13 +3,13 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
{{- with .Values.crds.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
controller-gen.kubebuilder.io/version: v0.12.0
name: admissionreports.kyverno.io
spec:
group: kyverno.io
@ -340,13 +340,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
{{- with .Values.crds.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
controller-gen.kubebuilder.io/version: v0.12.0
name: backgroundscanreports.kyverno.io
spec:
group: kyverno.io
@ -645,13 +645,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
{{- with .Values.crds.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
controller-gen.kubebuilder.io/version: v0.12.0
name: cleanuppolicies.kyverno.io
spec:
group: kyverno.io
@ -1908,13 +1908,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
{{- with .Values.crds.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
controller-gen.kubebuilder.io/version: v0.12.0
name: clusteradmissionreports.kyverno.io
spec:
group: kyverno.io
@ -2246,13 +2246,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
{{- with .Values.crds.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
controller-gen.kubebuilder.io/version: v0.12.0
name: clusterbackgroundscanreports.kyverno.io
spec:
group: kyverno.io
@ -2551,13 +2551,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
{{- with .Values.crds.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
controller-gen.kubebuilder.io/version: v0.12.0
name: clustercleanuppolicies.kyverno.io
spec:
group: kyverno.io
@ -3814,13 +3814,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
{{- with .Values.crds.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
controller-gen.kubebuilder.io/version: v0.12.0
name: clusterpolicies.kyverno.io
spec:
group: kyverno.io
@ -19808,13 +19808,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
{{- with .Values.crds.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
controller-gen.kubebuilder.io/version: v0.12.0
name: policies.kyverno.io
spec:
group: kyverno.io
@ -35805,13 +35805,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
{{- with .Values.crds.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
controller-gen.kubebuilder.io/version: v0.12.0
name: policyexceptions.kyverno.io
spec:
group: kyverno.io
@ -36329,13 +36329,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
{{- with .Values.crds.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
controller-gen.kubebuilder.io/version: v0.12.0
name: updaterequests.kyverno.io
spec:
group: kyverno.io
@ -36734,13 +36734,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
{{- with .Values.crds.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
controller-gen.kubebuilder.io/version: v0.12.0
name: clusterpolicyreports.wgpolicyk8s.io
spec:
group: wgpolicyk8s.io
@ -37101,13 +37101,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
{{- with .Values.crds.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "kyverno.crds.labels" . | nindent 4 }}
controller-gen.kubebuilder.io/version: v0.12.0
name: policyreports.wgpolicyk8s.io
spec:
group: wgpolicyk8s.io

3
config/crds/kyverno.io_admissionreports.yaml
View file

@ -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.12.0
name: admissionreports.kyverno.io
spec:
group: kyverno.io

3
config/crds/kyverno.io_backgroundscanreports.yaml
View file

@ -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.12.0
name: backgroundscanreports.kyverno.io
spec:
group: kyverno.io

3
config/crds/kyverno.io_cleanuppolicies.yaml
View file

@ -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.12.0
name: cleanuppolicies.kyverno.io
spec:
group: kyverno.io

3
config/crds/kyverno.io_clusteradmissionreports.yaml
View file

@ -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.12.0
name: clusteradmissionreports.kyverno.io
spec:
group: kyverno.io

3
config/crds/kyverno.io_clusterbackgroundscanreports.yaml
View file

@ -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.12.0
name: clusterbackgroundscanreports.kyverno.io
spec:
group: kyverno.io

3
config/crds/kyverno.io_clustercleanuppolicies.yaml
View file

@ -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.12.0
name: clustercleanuppolicies.kyverno.io
spec:
group: kyverno.io

3
config/crds/kyverno.io_clusterpolicies.yaml
View file

@ -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.12.0
name: clusterpolicies.kyverno.io
spec:
group: kyverno.io

3
config/crds/kyverno.io_policies.yaml
View file

@ -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.12.0
name: policies.kyverno.io
spec:
group: kyverno.io

3
config/crds/kyverno.io_policyexceptions.yaml
View file

@ -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.12.0
name: policyexceptions.kyverno.io
spec:
group: kyverno.io

3
config/crds/kyverno.io_updaterequests.yaml
View file

@ -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.12.0
name: updaterequests.kyverno.io
spec:
group: kyverno.io

3
config/crds/wgpolicyk8s.io_clusterpolicyreports.yaml
View file

@ -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.12.0
name: clusterpolicyreports.wgpolicyk8s.io
spec:
group: wgpolicyk8s.io

3
config/crds/wgpolicyk8s.io_policyreports.yaml
View file

@ -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.12.0
name: policyreports.wgpolicyk8s.io
spec:
group: wgpolicyk8s.io

48
config/install-latest-testing.yaml
View file

@ -206,13 +206,13 @@ data:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
labels:
app.kubernetes.io/component: crds
app.kubernetes.io/instance: kyverno
app.kubernetes.io/part-of: kyverno
app.kubernetes.io/version: latest
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
name: admissionreports.kyverno.io
spec:
group: kyverno.io
@ -543,13 +543,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
labels:
app.kubernetes.io/component: crds
app.kubernetes.io/instance: kyverno
app.kubernetes.io/part-of: kyverno
app.kubernetes.io/version: latest
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
name: backgroundscanreports.kyverno.io
spec:
group: kyverno.io
@ -848,13 +848,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
labels:
app.kubernetes.io/component: crds
app.kubernetes.io/instance: kyverno
app.kubernetes.io/part-of: kyverno
app.kubernetes.io/version: latest
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
name: cleanuppolicies.kyverno.io
spec:
group: kyverno.io
@ -2111,13 +2111,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
labels:
app.kubernetes.io/component: crds
app.kubernetes.io/instance: kyverno
app.kubernetes.io/part-of: kyverno
app.kubernetes.io/version: latest
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
name: clusteradmissionreports.kyverno.io
spec:
group: kyverno.io
@ -2449,13 +2449,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
labels:
app.kubernetes.io/component: crds
app.kubernetes.io/instance: kyverno
app.kubernetes.io/part-of: kyverno
app.kubernetes.io/version: latest
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
name: clusterbackgroundscanreports.kyverno.io
spec:
group: kyverno.io
@ -2754,13 +2754,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
labels:
app.kubernetes.io/component: crds
app.kubernetes.io/instance: kyverno
app.kubernetes.io/part-of: kyverno
app.kubernetes.io/version: latest
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
name: clustercleanuppolicies.kyverno.io
spec:
group: kyverno.io
@ -4017,13 +4017,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
labels:
app.kubernetes.io/component: crds
app.kubernetes.io/instance: kyverno
app.kubernetes.io/part-of: kyverno
app.kubernetes.io/version: latest
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
name: clusterpolicies.kyverno.io
spec:
group: kyverno.io
@ -20011,13 +20011,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
labels:
app.kubernetes.io/component: crds
app.kubernetes.io/instance: kyverno
app.kubernetes.io/part-of: kyverno
app.kubernetes.io/version: latest
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
name: policies.kyverno.io
spec:
group: kyverno.io
@ -36008,13 +36008,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
labels:
app.kubernetes.io/component: crds
app.kubernetes.io/instance: kyverno
app.kubernetes.io/part-of: kyverno
app.kubernetes.io/version: latest
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
name: policyexceptions.kyverno.io
spec:
group: kyverno.io
@ -36532,13 +36532,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
labels:
app.kubernetes.io/component: crds
app.kubernetes.io/instance: kyverno
app.kubernetes.io/part-of: kyverno
app.kubernetes.io/version: latest
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
name: updaterequests.kyverno.io
spec:
group: kyverno.io
@ -36937,13 +36937,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
labels:
app.kubernetes.io/component: crds
app.kubernetes.io/instance: kyverno
app.kubernetes.io/part-of: kyverno
app.kubernetes.io/version: latest
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
name: clusterpolicyreports.wgpolicyk8s.io
spec:
group: wgpolicyk8s.io
@ -37304,13 +37304,13 @@ spec:
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
labels:
app.kubernetes.io/component: crds
app.kubernetes.io/instance: kyverno
app.kubernetes.io/part-of: kyverno
app.kubernetes.io/version: latest
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
name: policyreports.wgpolicyk8s.io
spec:
group: wgpolicyk8s.io