Skip to content

Commit 6d54adb

Browse files
AshleyDumaineAshleyDumaine
committed
more shortening
1 parent 7083eb2 commit 6d54adb

File tree

23 files changed

+58
-58
lines changed

23 files changed

+58
-58
lines changed

‎templates/flavors/clusterclass-kubeadm/clusterClass.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ spec:
77
ref:
88
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
99
kind: KubeadmControlPlaneTemplate
10-
name: kubeadm-control-plane
10+
name: kubeadm-cp
1111
machineInfrastructure:
1212
ref:
1313
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
1414
kind: LinodeMachineTemplate
15-
name: kubeadm-control-plane
15+
name: kubeadm-cp
1616
infrastructure:
1717
ref:
1818
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2

‎templates/flavors/clusterclass-kubeadm/deleteTransformer.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ patch: |-
3333
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
3434
kind: KubeadmControlPlane
3535
metadata:
36-
name: ${CLUSTER_NAME}-control-plane
36+
name: ${CLUSTER_NAME}-cp
3737
---
3838
# delete machineDeployment from ../base
3939
apiVersion: builtin

‎templates/flavors/clusterclass-kubeadm/kubeadmControlPlaneTemplate.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
kind: KubeadmControlPlaneTemplate
22
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
33
metadata:
4-
name: kubeadm-control-plane
4+
name: kubeadm-cp
55
spec:
66
template:
77
spec:

‎templates/flavors/clusterclass-kubeadm/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ patches:
3636
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
3737
kind: LinodeMachineTemplate
3838
metadata:
39-
name: kubeadm-control-plane
39+
name: kubeadm-cp
4040
4141
- target:
4242
group: bootstrap.cluster.x-k8s.io

‎templates/flavors/clusterclass-kubeadm/replacementTransformer.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ metadata:
2020
replacements:
2121
- source:
2222
kind: KubeadmControlPlane
23-
name: ${CLUSTER_NAME}-control-plane
23+
name: ${CLUSTER_NAME}-cp
2424
fieldPath: spec
2525
targets:
2626
- select:
2727
kind: KubeadmControlPlaneTemplate
28-
name: kubeadm-control-plane
28+
name: kubeadm-cp
2929
fieldPaths:
3030
- spec.template.spec

‎templates/flavors/k3s/default/k3sControlPlane.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
33
kind: KThreesControlPlane
44
metadata:
5-
name: ${CLUSTER_NAME}-control-plane
5+
name: ${CLUSTER_NAME}-cp
66
spec:
77
machineTemplate:
88
infrastructureRef:
99
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
1010
kind: LinodeMachineTemplate
11-
name: ${CLUSTER_NAME}-control-plane
11+
name: ${CLUSTER_NAME}-cp
1212
kthreesConfigSpec:
1313
files:
1414
- path: /etc/rancher/k3s/config.yaml.d/capi-config.yaml

‎templates/flavors/k3s/dual-stack/kustomization.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ patches:
4747
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
4848
kind: LinodeMachineTemplate
4949
metadata:
50-
name: ${CLUSTER_NAME}-control-plane
50+
name: ${CLUSTER_NAME}-cp
5151
spec:
5252
template:
5353
spec:
@@ -77,7 +77,7 @@ patches:
7777
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
7878
kind: KThreesControlPlane
7979
metadata:
80-
name: ${CLUSTER_NAME}-control-plane
80+
name: ${CLUSTER_NAME}-cp
8181
spec:
8282
kthreesConfigSpec:
8383
serverConfig:

‎templates/flavors/k3s/full-vpcless/kustomization.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ patches:
8383
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
8484
kind: KThreesControlPlane
8585
metadata:
86-
name: ${CLUSTER_NAME}-control-plane
86+
name: ${CLUSTER_NAME}-cp
8787
spec:
8888
kthreesConfigSpec:
8989
serverConfig:
@@ -202,12 +202,12 @@ patches:
202202
group: infrastructure.cluster.x-k8s.io
203203
version: v1alpha2
204204
kind: LinodeMachineTemplate
205-
name: .*-control-plane
205+
name: .*-cp
206206
patch: |-
207207
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
208208
kind: LinodeMachineTemplate
209209
metadata:
210-
name: ${CLUSTER_NAME}-control-plane
210+
name: ${CLUSTER_NAME}-cp
211211
spec:
212212
template:
213213
spec:

‎templates/flavors/k3s/full/kustomization.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ patches:
3838
group: infrastructure.cluster.x-k8s.io
3939
version: v1alpha2
4040
kind: LinodeMachineTemplate
41-
name: .*-control-plane
41+
name: .*-cp
4242
patch: |-
4343
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
4444
kind: LinodeMachineTemplate
4545
metadata:
46-
name: ${CLUSTER_NAME}-control-plane
46+
name: ${CLUSTER_NAME}-cp
4747
spec:
4848
template:
4949
spec:

‎templates/flavors/kubeadm/default/kubeadmControlPlane.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
kind: KubeadmControlPlane
33
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
44
metadata:
5-
name: ${CLUSTER_NAME}-control-plane
5+
name: ${CLUSTER_NAME}-cp
66
spec:
77
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
88
machineTemplate:
99
infrastructureRef:
1010
kind: LinodeMachineTemplate
1111
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2
12-
name: ${CLUSTER_NAME}-control-plane
12+
name: ${CLUSTER_NAME}-cp
1313
kubeadmConfigSpec:
1414
preKubeadmCommands:
1515
- curl -fsSL https://github.com/linode/cluster-api-provider-linode/raw/dd76b1f979696ef22ce093d420cdbd0051a1d725/scripts/pre-kubeadminit.sh | bash -s ${KUBERNETES_VERSION}

0 commit comments

Comments
 (0)