Skip to content

Commit

Permalink
Add missing clusterctl label needed for move (#51)
Browse files Browse the repository at this point in the history
Co-authored-by: ekarlso <[email protected]>
  • Loading branch information
ekarlso and ekarlso authored Sep 15, 2023
1 parent 4d8982e commit d95461f
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 29 deletions.
8 changes: 4 additions & 4 deletions bootstrap/config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -25,4 +25,4 @@ patchesStrategicMerge:

# the following config is for teaching kustomize how to do kustomization for CRDs.
configurations:
- kustomizeconfig.yaml
- kustomizeconfig.yaml
22 changes: 11 additions & 11 deletions bootstrap/config/crd/kustomizeconfig.yaml
Original file line number Diff line number Diff line change
@@ -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
7 changes: 4 additions & 3 deletions controlplane/config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -21,4 +22,4 @@ patchesStrategicMerge:

# the following config is for teaching kustomize how to do kustomization for CRDs.
configurations:
- kustomizeconfig.yaml
- kustomizeconfig.yaml
22 changes: 11 additions & 11 deletions controlplane/config/crd/kustomizeconfig.yaml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit d95461f

Please sign in to comment.