From c0a183b0067119c425d4d08e51525608c13d1ad3 Mon Sep 17 00:00:00 2001 From: Morre Date: Mon, 20 May 2024 18:22:54 +0200 Subject: [PATCH] fix: re-add api-approved.kubernetes.io annotation --- Makefile | 6 +----- docs/contributing/crd-source/crd-manifest.yaml | 3 ++- endpoint/endpoint.go | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 860796933..be24ff476 100644 --- a/Makefile +++ b/Makefile @@ -33,11 +33,7 @@ controller-gen: ifeq (, $(shell which controller-gen)) @{ \ set -e ;\ - CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\ - cd $$CONTROLLER_GEN_TMP_DIR ;\ - go mod init tmp ;\ - go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 ;\ - rm -rf $$CONTROLLER_GEN_TMP_DIR ;\ + go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0 ;\ } CONTROLLER_GEN=$(GOBIN)/controller-gen else diff --git a/docs/contributing/crd-source/crd-manifest.yaml b/docs/contributing/crd-source/crd-manifest.yaml index f5cf97119..5d4a44159 100644 --- a/docs/contributing/crd-source/crd-manifest.yaml +++ b/docs/contributing/crd-source/crd-manifest.yaml @@ -3,7 +3,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + api-approved.kubernetes.io: https://github.com/kubernetes-sigs/external-dns/pull/2007 + controller-gen.kubebuilder.io/version: v0.15.0 name: dnsendpoints.externaldns.k8s.io spec: group: externaldns.k8s.io diff --git a/endpoint/endpoint.go b/endpoint/endpoint.go index 9c7107a37..1bd2d54fb 100644 --- a/endpoint/endpoint.go +++ b/endpoint/endpoint.go @@ -357,6 +357,7 @@ type DNSEndpointStatus struct { // +kubebuilder:resource:path=dnsendpoints // +kubebuilder:object:root=true // +kubebuilder:subresource:status +// +kubebuilder:metadata:annotations="api-approved.kubernetes.io=https://github.com/kubernetes-sigs/external-dns/pull/2007" // +versionName=v1alpha1 type DNSEndpoint struct {