From 3499a0b3fca4397a41c22072a300c294d57cd895 Mon Sep 17 00:00:00 2001 From: Ivan Teterevkov Date: Wed, 9 Aug 2023 15:36:24 +0100 Subject: [PATCH] cleanup: Update CONTROLLER_TOOLS_VERSION v0.11.1 -> v0.12.1 Update controller-gen to the latest released version for the headerFile support by the rbac and crd generators that generate YAML files. Also, re-generate YAML files with "make manifests". Co-Authored-By: Thomas Crawley --- Makefile | 4 ++-- config/crd/bases/onload.amd.com_onloads.yaml | 3 +-- config/rbac/role.yaml | 1 - hack/boilerplate.yaml.txt | 2 ++ 4 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 hack/boilerplate.yaml.txt diff --git a/Makefile b/Makefile index 1264674..bda43da 100644 --- a/Makefile +++ b/Makefile @@ -94,7 +94,7 @@ help: ## Display this help. .PHONY: manifests manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. - $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases + $(CONTROLLER_GEN) rbac:roleName=manager-role,headerFile="hack/boilerplate.yaml.txt" crd:headerFile="hack/boilerplate.yaml.txt" webhook paths="./..." output:crd:artifacts:config=config/crd/bases .PHONY: generate generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations. @@ -187,7 +187,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest ## Tool Versions KUSTOMIZE_VERSION ?= v3.8.7 -CONTROLLER_TOOLS_VERSION ?= v0.11.1 +CONTROLLER_TOOLS_VERSION ?= v0.12.1 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize diff --git a/config/crd/bases/onload.amd.com_onloads.yaml b/config/crd/bases/onload.amd.com_onloads.yaml index 3213c66..6bf3073 100644 --- a/config/crd/bases/onload.amd.com_onloads.yaml +++ b/config/crd/bases/onload.amd.com_onloads.yaml @@ -5,8 +5,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.1 name: onloads.onload.amd.com spec: group: onload.amd.com diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index ae866a9..f8b859e 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -4,7 +4,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - creationTimestamp: null name: manager-role rules: - apiGroups: diff --git a/hack/boilerplate.yaml.txt b/hack/boilerplate.yaml.txt new file mode 100644 index 0000000..26b454d --- /dev/null +++ b/hack/boilerplate.yaml.txt @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: (c) Copyright 2023 Advanced Micro Devices, Inc.