From aaaff80f5cb37a9c9fd84f338d7b55dde0bf58be Mon Sep 17 00:00:00 2001 From: Dean Roehrich Date: Tue, 13 Jun 2023 10:32:02 -0500 Subject: [PATCH 1/2] Update controller-tools to v0.12.0 The older controller-tools would put a creationTimestamp in the resources and would give it a "null" value. This breaks with "kubectl apply -k" with the newer kubectl 1.27 release. Re-run "make manifests" to let the new controller-gen cleanup this stuff. Signed-off-by: Dean Roehrich --- Makefile | 2 +- config/crd/bases/lus.cray.hpe.com_lustrefilesystems.yaml | 3 +-- config/rbac/role.yaml | 1 - config/webhook/manifests.yaml | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 85118ea..893d829 100644 --- a/Makefile +++ b/Makefile @@ -243,7 +243,7 @@ CONVERSION_VERIFIER_PKG := sigs.k8s.io/cluster-api/hack/tools/conversion-verifie ## Tool Versions KUSTOMIZE_VERSION ?= v4.5.7 -CONTROLLER_TOOLS_VERSION ?= v0.11.1 +CONTROLLER_TOOLS_VERSION ?= v0.12.0 CONVERSION_GEN_VER := v0.26.3 # Can be "latest", but cannot be a tag, such as "v1.3.3". However, it will diff --git a/config/crd/bases/lus.cray.hpe.com_lustrefilesystems.yaml b/config/crd/bases/lus.cray.hpe.com_lustrefilesystems.yaml index 3abf0ce..f72a7e4 100644 --- a/config/crd/bases/lus.cray.hpe.com_lustrefilesystems.yaml +++ b/config/crd/bases/lus.cray.hpe.com_lustrefilesystems.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.12.0 name: lustrefilesystems.lus.cray.hpe.com spec: group: lus.cray.hpe.com diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 68f2d72..fba2f07 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/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index c74da46..9adfd88 100644 --- a/config/webhook/manifests.yaml +++ b/config/webhook/manifests.yaml @@ -2,7 +2,6 @@ apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration metadata: - creationTimestamp: null name: validating-webhook-configuration webhooks: - admissionReviewVersions: From a4a7a8636b1a00019210705b231fbf1e4c902f02 Mon Sep 17 00:00:00 2001 From: Dean Roehrich Date: Wed, 14 Jun 2023 09:58:13 -0500 Subject: [PATCH 2/2] Set v0.0.4 for container tag Signed-off-by: Dean Roehrich --- config/manager/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 1b9310a..1c3266e 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -18,4 +18,4 @@ kind: Kustomization images: - name: controller newName: ghcr.io/nearnodeflash/lustre-fs-operator - newTag: 0.0.3 + newTag: 0.0.4