From 242b48b1335c7f49fdb85164d9f72e282da1647c Mon Sep 17 00:00:00 2001 From: Juri Berlanda Date: Sun, 22 Dec 2024 15:59:56 +0100 Subject: [PATCH] [Build] Update controller-gen and Kustomize. Signed-off-by: Juri Berlanda --- Makefile | 4 ++-- .../desec.owly.dedyn.io_desecdnsdnses.yaml | 21 ++++--------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index f37402d..5424620 100644 --- a/Makefile +++ b/Makefile @@ -179,8 +179,8 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen ENVTEST ?= $(LOCALBIN)/setup-envtest ## Tool Versions -KUSTOMIZE_VERSION ?= v3.8.7 -CONTROLLER_TOOLS_VERSION ?= v0.15.0 +KUSTOMIZE_VERSION ?= v5.5.0 +CONTROLLER_TOOLS_VERSION ?= v0.16.5 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize diff --git a/config/crd/bases/desec.owly.dedyn.io_desecdnsdnses.yaml b/config/crd/bases/desec.owly.dedyn.io_desecdnsdnses.yaml index 70b14ce..65faf5b 100644 --- a/config/crd/bases/desec.owly.dedyn.io_desecdnsdnses.yaml +++ b/config/crd/bases/desec.owly.dedyn.io_desecdnsdnses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.5 name: desecdnsdnses.desec.owly.dedyn.io spec: group: desec.owly.dedyn.io @@ -53,16 +53,8 @@ spec: conditions: description: Conditions items: - description: "Condition contains details for one aspect of the current - state of this API Resource.\n---\nThis struct is intended for - direct use as an array at the field path .status.conditions. For - example,\n\n\n\ttype FooStatus struct{\n\t // Represents the - observations of a foo's current state.\n\t // Known .status.conditions.type - are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // - +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t - \ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" - patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t - \ // other fields\n\t}" + description: Condition contains details for one aspect of the current + state of this API Resource. properties: lastTransitionTime: description: |- @@ -103,12 +95,7 @@ spec: - Unknown type: string type: - description: |- - type of condition in CamelCase or in foo.example.com/CamelCase. - --- - Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - useful (see .node.status.conditions), the ability to deconflict is important. - The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + description: type of condition in CamelCase or in foo.example.com/CamelCase. maxLength: 316 pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ type: string