Skip to content

Commit fe70579

Browse files
committed
fix version
1 parent 4bfff4f commit fe70579

File tree

4 files changed

+23
-3
lines changed

4 files changed

+23
-3
lines changed

examples/cluster/cluster.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@ metadata:
2323
spec:
2424
tags:
2525
- a_cluster_wide_tag
26+
cloudName: $CLOUD
27+
cloudsSecret:
28+
name: cloud-config
29+
namespace: capo-system

examples/controlplane/controlplane.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ spec:
3434
trunk: false
3535
tags:
3636
- a-machine-specific-tag
37+
cloudName: $CLOUD
38+
cloudsSecret:
39+
name: cloud-config
40+
namespace: capo-system
3741
serverMetadata:
3842
key: value
3943
---
@@ -131,6 +135,10 @@ spec:
131135
trunk: false
132136
tags:
133137
- a-machine-specific-tag
138+
cloudName: $CLOUD
139+
cloudsSecret:
140+
name: cloud-config
141+
namespace: capo-system
134142
serverMetadata:
135143
key: value
136144
---
@@ -202,6 +210,10 @@ spec:
202210
trunk: false
203211
tags:
204212
- a-machine-specific-tag
213+
cloudName: $CLOUD
214+
cloudsSecret:
215+
name: cloud-config
216+
namespace: capo-system
205217
serverMetadata:
206218
key: value
207219
---

examples/generate.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ENVSUBST=${ENVSUBST:-envsubst}
2424
command -v "${ENVSUBST}" >/dev/null 2>&1 || echo -v "Cannot find ${ENVSUBST} in path."
2525

2626
# Cluster.
27-
export CLUSTER_NAME="${CLUSTER_NAME:-test1}"
27+
export CLUSTER_NAME="${CLUSTER_NAME:-test-cluster}"
2828
export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.15.0}"
2929

3030
# Machine settings.
@@ -75,7 +75,7 @@ fi
7575

7676
# Check if os cloud is provided
7777
if [[ -n "$2" ]] && [[ $2 != -* ]] && [[ $2 != --* ]]; then
78-
CLOUD=$2
78+
export CLOUD=$2
7979
else
8080
echo "Error: No cloud specified"
8181
echo "You must specify which cloud you want to use."

examples/machines/machines.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
labels:
66
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
77
spec:
8-
version: v1.15.0
8+
version: ${KUBERNETES_VERSION}
99
bootstrap:
1010
configRef:
1111
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2
@@ -32,6 +32,10 @@ spec:
3232
trunk: false
3333
tags:
3434
- a-machine-specific-tag
35+
cloudName: $CLOUD
36+
cloudsSecret:
37+
name: cloud-config
38+
namespace: capo-system
3539
serverMetadata:
3640
key: value
3741
---

0 commit comments

Comments
 (0)