From 02554b33ffe11905d4396b2d2b368d7e726ee926 Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Tue, 11 Jul 2023 08:33:58 -0700 Subject: [PATCH 1/2] chore: Bump controller-gen to v0.12.0 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1559df5c8..44a3543dd 100644 --- a/Makefile +++ b/Makefile @@ -137,7 +137,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest ## Tool Versions KUSTOMIZE_VERSION ?= v4.5.7 -CONTROLLER_TOOLS_VERSION ?= v0.10.0 +CONTROLLER_TOOLS_VERSION ?= v0.12.0 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize From b188a2df3810c337812a4090160c2e51f12247c2 Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Tue, 11 Jul 2023 08:34:20 -0700 Subject: [PATCH 2/2] chore: Bump manifests for controller-gen v0.12.0 --- .../grafana.integreatly.org_grafanadashboards.yaml | 3 +-- .../grafana.integreatly.org_grafanadatasources.yaml | 3 +-- .../grafana.integreatly.org_grafanafolders.yaml | 3 +-- .../crd/bases/grafana.integreatly.org_grafanas.yaml | 3 +-- .../grafana.integreatly.org_grafanadashboards.yaml | 3 +-- .../grafana.integreatly.org_grafanadatasources.yaml | 3 +-- config/grafana.integreatly.org_grafanafolders.yaml | 3 +-- config/grafana.integreatly.org_grafanas.yaml | 3 +-- config/rbac/role.yaml | 1 - .../grafana.integreatly.org_grafanadashboards.yaml | 3 +-- .../grafana.integreatly.org_grafanadatasources.yaml | 3 +-- .../crds/grafana.integreatly.org_grafanafolders.yaml | 3 +-- .../crds/grafana.integreatly.org_grafanas.yaml | 3 +-- deploy/kustomize/base/crds.yaml | 12 ++++-------- 14 files changed, 16 insertions(+), 33 deletions(-) diff --git a/config/crd/bases/grafana.integreatly.org_grafanadashboards.yaml b/config/crd/bases/grafana.integreatly.org_grafanadashboards.yaml index 80ff5fa39..97c3aae1b 100644 --- a/config/crd/bases/grafana.integreatly.org_grafanadashboards.yaml +++ b/config/crd/bases/grafana.integreatly.org_grafanadashboards.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: grafanadashboards.grafana.integreatly.org spec: group: grafana.integreatly.org diff --git a/config/crd/bases/grafana.integreatly.org_grafanadatasources.yaml b/config/crd/bases/grafana.integreatly.org_grafanadatasources.yaml index 05f521715..90de4e92c 100644 --- a/config/crd/bases/grafana.integreatly.org_grafanadatasources.yaml +++ b/config/crd/bases/grafana.integreatly.org_grafanadatasources.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: grafanadatasources.grafana.integreatly.org spec: group: grafana.integreatly.org diff --git a/config/crd/bases/grafana.integreatly.org_grafanafolders.yaml b/config/crd/bases/grafana.integreatly.org_grafanafolders.yaml index cc942ce44..b9efb7f00 100644 --- a/config/crd/bases/grafana.integreatly.org_grafanafolders.yaml +++ b/config/crd/bases/grafana.integreatly.org_grafanafolders.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: grafanafolders.grafana.integreatly.org spec: group: grafana.integreatly.org diff --git a/config/crd/bases/grafana.integreatly.org_grafanas.yaml b/config/crd/bases/grafana.integreatly.org_grafanas.yaml index 439adcc4a..aa4337552 100644 --- a/config/crd/bases/grafana.integreatly.org_grafanas.yaml +++ b/config/crd/bases/grafana.integreatly.org_grafanas.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: grafanas.grafana.integreatly.org spec: group: grafana.integreatly.org diff --git a/config/grafana.integreatly.org_grafanadashboards.yaml b/config/grafana.integreatly.org_grafanadashboards.yaml index 50a5c610f..ffa9f07f5 100644 --- a/config/grafana.integreatly.org_grafanadashboards.yaml +++ b/config/grafana.integreatly.org_grafanadashboards.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: grafanadashboards.grafana.integreatly.org spec: group: grafana.integreatly.org diff --git a/config/grafana.integreatly.org_grafanadatasources.yaml b/config/grafana.integreatly.org_grafanadatasources.yaml index 6cfed7cbb..b8ab37233 100644 --- a/config/grafana.integreatly.org_grafanadatasources.yaml +++ b/config/grafana.integreatly.org_grafanadatasources.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: grafanadatasources.grafana.integreatly.org spec: group: grafana.integreatly.org diff --git a/config/grafana.integreatly.org_grafanafolders.yaml b/config/grafana.integreatly.org_grafanafolders.yaml index 6eed112fc..625b19599 100644 --- a/config/grafana.integreatly.org_grafanafolders.yaml +++ b/config/grafana.integreatly.org_grafanafolders.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: grafanafolders.grafana.integreatly.org spec: group: grafana.integreatly.org diff --git a/config/grafana.integreatly.org_grafanas.yaml b/config/grafana.integreatly.org_grafanas.yaml index dfa264cfb..945567a0f 100644 --- a/config/grafana.integreatly.org_grafanas.yaml +++ b/config/grafana.integreatly.org_grafanas.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: grafanas.grafana.integreatly.org spec: group: grafana.integreatly.org diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 0d1ce459e..cad7511ca 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -2,7 +2,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - creationTimestamp: null name: manager-role rules: - apiGroups: diff --git a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanadashboards.yaml b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanadashboards.yaml index 80ff5fa39..97c3aae1b 100644 --- a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanadashboards.yaml +++ b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanadashboards.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: grafanadashboards.grafana.integreatly.org spec: group: grafana.integreatly.org diff --git a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanadatasources.yaml b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanadatasources.yaml index 05f521715..90de4e92c 100644 --- a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanadatasources.yaml +++ b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanadatasources.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: grafanadatasources.grafana.integreatly.org spec: group: grafana.integreatly.org diff --git a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanafolders.yaml b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanafolders.yaml index cc942ce44..b9efb7f00 100644 --- a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanafolders.yaml +++ b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanafolders.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: grafanafolders.grafana.integreatly.org spec: group: grafana.integreatly.org diff --git a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanas.yaml b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanas.yaml index 439adcc4a..aa4337552 100644 --- a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanas.yaml +++ b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanas.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: grafanas.grafana.integreatly.org spec: group: grafana.integreatly.org diff --git a/deploy/kustomize/base/crds.yaml b/deploy/kustomize/base/crds.yaml index 92b705883..04a6123c8 100644 --- a/deploy/kustomize/base/crds.yaml +++ b/deploy/kustomize/base/crds.yaml @@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: grafanadashboards.grafana.integreatly.org spec: group: grafana.integreatly.org @@ -302,8 +301,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: grafanadatasources.grafana.integreatly.org spec: group: grafana.integreatly.org @@ -527,8 +525,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: grafanafolders.grafana.integreatly.org spec: group: grafana.integreatly.org @@ -650,8 +647,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: grafanas.grafana.integreatly.org spec: group: grafana.integreatly.org