Skip to content

Commit d95461f

Browse files
ekarlsoekarlso
and
ekarlso
authored
Add missing clusterctl label needed for move (#51)
Co-authored-by: ekarlso <[email protected]>
1 parent 4d8982e commit d95461f

File tree

4 files changed

+30
-29
lines changed

4 files changed

+30
-29
lines changed

bootstrap/config/crd/kustomization.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
commonLabels:
22
cluster.x-k8s.io/v1beta1: v1beta1
3+
clusterctl.cluster.x-k8s.io: ""
34

4-
55
# This kustomization.yaml is not intended to be run by itself,
66
# since it depends on service name and namespace that are out of this kustomize package.
77
# It should be run by config/default
88
resources:
9-
- bases/bootstrap.cluster.x-k8s.io_kthreesconfigs.yaml
10-
- bases/bootstrap.cluster.x-k8s.io_kthreesconfigtemplates.yaml
9+
- bases/bootstrap.cluster.x-k8s.io_kthreesconfigs.yaml
10+
- bases/bootstrap.cluster.x-k8s.io_kthreesconfigtemplates.yaml
1111
# +kubebuilder:scaffold:crdkustomizeresource
1212

1313
patchesStrategicMerge:
@@ -25,4 +25,4 @@ patchesStrategicMerge:
2525

2626
# the following config is for teaching kustomize how to do kustomization for CRDs.
2727
configurations:
28-
- kustomizeconfig.yaml
28+
- kustomizeconfig.yaml
+11-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# This file is for teaching kustomize how to substitute name and namespace reference in CRD
22
nameReference:
3-
- kind: Service
4-
version: v1
5-
fieldSpecs:
6-
- kind: CustomResourceDefinition
7-
group: apiextensions.k8s.io
8-
path: spec/conversion/webhookClientConfig/service/name
3+
- kind: Service
4+
version: v1
5+
fieldSpecs:
6+
- kind: CustomResourceDefinition
7+
group: apiextensions.k8s.io
8+
path: spec/conversion/webhookClientConfig/service/name
99

1010
namespace:
11-
- kind: CustomResourceDefinition
12-
group: apiextensions.k8s.io
13-
path: spec/conversion/webhookClientConfig/service/namespace
14-
create: false
11+
- kind: CustomResourceDefinition
12+
group: apiextensions.k8s.io
13+
path: spec/conversion/webhookClientConfig/service/namespace
14+
create: false
1515

1616
varReference:
17-
- path: metadata/annotations
17+
- path: metadata/annotations

controlplane/config/crd/kustomization.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
commonLabels:
22
cluster.x-k8s.io/v1beta1: v1beta1
3-
3+
clusterctl.cluster.x-k8s.io: ""
4+
45
# This kustomization.yaml is not intended to be run by itself,
56
# since it depends on service name and namespace that are out of this kustomize package.
67
# It should be run by config/default
78
resources:
8-
- bases/controlplane.cluster.x-k8s.io_kthreescontrolplanes.yaml
9+
- bases/controlplane.cluster.x-k8s.io_kthreescontrolplanes.yaml
910
# +kubebuilder:scaffold:crdkustomizeresource
1011

1112
patchesStrategicMerge:
@@ -21,4 +22,4 @@ patchesStrategicMerge:
2122

2223
# the following config is for teaching kustomize how to do kustomization for CRDs.
2324
configurations:
24-
- kustomizeconfig.yaml
25+
- kustomizeconfig.yaml
+11-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# This file is for teaching kustomize how to substitute name and namespace reference in CRD
22
nameReference:
3-
- kind: Service
4-
version: v1
5-
fieldSpecs:
6-
- kind: CustomResourceDefinition
7-
group: apiextensions.k8s.io
8-
path: spec/conversion/webhookClientConfig/service/name
3+
- kind: Service
4+
version: v1
5+
fieldSpecs:
6+
- kind: CustomResourceDefinition
7+
group: apiextensions.k8s.io
8+
path: spec/conversion/webhookClientConfig/service/name
99

1010
namespace:
11-
- kind: CustomResourceDefinition
12-
group: apiextensions.k8s.io
13-
path: spec/conversion/webhookClientConfig/service/namespace
14-
create: false
11+
- kind: CustomResourceDefinition
12+
group: apiextensions.k8s.io
13+
path: spec/conversion/webhookClientConfig/service/namespace
14+
create: false
1515

1616
varReference:
17-
- path: metadata/annotations
17+
- path: metadata/annotations

0 commit comments

Comments
 (0)