From 5ab3ff2625afc10360c22cdd0a4a4ef584923456 Mon Sep 17 00:00:00 2001 From: ekarlso Date: Fri, 15 Sep 2023 14:31:52 +0200 Subject: [PATCH] Add missing clusterctl label needed for move --- bootstrap/config/crd/kustomization.yaml | 8 +++---- bootstrap/config/crd/kustomizeconfig.yaml | 22 ++++++++++---------- controlplane/config/crd/kustomization.yaml | 7 ++++--- controlplane/config/crd/kustomizeconfig.yaml | 22 ++++++++++---------- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/bootstrap/config/crd/kustomization.yaml b/bootstrap/config/crd/kustomization.yaml index 144a6b52..9a498c19 100644 --- a/bootstrap/config/crd/kustomization.yaml +++ b/bootstrap/config/crd/kustomization.yaml @@ -1,13 +1,13 @@ commonLabels: cluster.x-k8s.io/v1beta1: v1beta1 + clusterctl.cluster.x-k8s.io: "" - # This kustomization.yaml is not intended to be run by itself, # since it depends on service name and namespace that are out of this kustomize package. # It should be run by config/default resources: -- bases/bootstrap.cluster.x-k8s.io_kthreesconfigs.yaml -- bases/bootstrap.cluster.x-k8s.io_kthreesconfigtemplates.yaml + - bases/bootstrap.cluster.x-k8s.io_kthreesconfigs.yaml + - bases/bootstrap.cluster.x-k8s.io_kthreesconfigtemplates.yaml # +kubebuilder:scaffold:crdkustomizeresource patchesStrategicMerge: @@ -25,4 +25,4 @@ patchesStrategicMerge: # the following config is for teaching kustomize how to do kustomization for CRDs. configurations: -- kustomizeconfig.yaml + - kustomizeconfig.yaml diff --git a/bootstrap/config/crd/kustomizeconfig.yaml b/bootstrap/config/crd/kustomizeconfig.yaml index 6f83d9a9..e9cda712 100644 --- a/bootstrap/config/crd/kustomizeconfig.yaml +++ b/bootstrap/config/crd/kustomizeconfig.yaml @@ -1,17 +1,17 @@ # This file is for teaching kustomize how to substitute name and namespace reference in CRD nameReference: -- kind: Service - version: v1 - fieldSpecs: - - kind: CustomResourceDefinition - group: apiextensions.k8s.io - path: spec/conversion/webhookClientConfig/service/name + - kind: Service + version: v1 + fieldSpecs: + - kind: CustomResourceDefinition + group: apiextensions.k8s.io + path: spec/conversion/webhookClientConfig/service/name namespace: -- kind: CustomResourceDefinition - group: apiextensions.k8s.io - path: spec/conversion/webhookClientConfig/service/namespace - create: false + - kind: CustomResourceDefinition + group: apiextensions.k8s.io + path: spec/conversion/webhookClientConfig/service/namespace + create: false varReference: -- path: metadata/annotations + - path: metadata/annotations diff --git a/controlplane/config/crd/kustomization.yaml b/controlplane/config/crd/kustomization.yaml index 5aff2481..85f7c5b3 100644 --- a/controlplane/config/crd/kustomization.yaml +++ b/controlplane/config/crd/kustomization.yaml @@ -1,11 +1,12 @@ commonLabels: cluster.x-k8s.io/v1beta1: v1beta1 - + clusterctl.cluster.x-k8s.io: "" + # This kustomization.yaml is not intended to be run by itself, # since it depends on service name and namespace that are out of this kustomize package. # It should be run by config/default resources: -- bases/controlplane.cluster.x-k8s.io_kthreescontrolplanes.yaml + - bases/controlplane.cluster.x-k8s.io_kthreescontrolplanes.yaml # +kubebuilder:scaffold:crdkustomizeresource patchesStrategicMerge: @@ -21,4 +22,4 @@ patchesStrategicMerge: # the following config is for teaching kustomize how to do kustomization for CRDs. configurations: -- kustomizeconfig.yaml + - kustomizeconfig.yaml diff --git a/controlplane/config/crd/kustomizeconfig.yaml b/controlplane/config/crd/kustomizeconfig.yaml index 6f83d9a9..e9cda712 100644 --- a/controlplane/config/crd/kustomizeconfig.yaml +++ b/controlplane/config/crd/kustomizeconfig.yaml @@ -1,17 +1,17 @@ # This file is for teaching kustomize how to substitute name and namespace reference in CRD nameReference: -- kind: Service - version: v1 - fieldSpecs: - - kind: CustomResourceDefinition - group: apiextensions.k8s.io - path: spec/conversion/webhookClientConfig/service/name + - kind: Service + version: v1 + fieldSpecs: + - kind: CustomResourceDefinition + group: apiextensions.k8s.io + path: spec/conversion/webhookClientConfig/service/name namespace: -- kind: CustomResourceDefinition - group: apiextensions.k8s.io - path: spec/conversion/webhookClientConfig/service/namespace - create: false + - kind: CustomResourceDefinition + group: apiextensions.k8s.io + path: spec/conversion/webhookClientConfig/service/namespace + create: false varReference: -- path: metadata/annotations + - path: metadata/annotations