Skip to content

Commit f22ad46

Browse files
Merge pull request #1590 from Nordix/rename-cluster
Rename cluster name from EPHEMERAL to BOOTSTRAP
2 parents b1e71b3 + 8bb9382 commit f22ad46

File tree

17 files changed

+51
-51
lines changed

17 files changed

+51
-51
lines changed

01_prepare_host.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ if ! kubectl krew > /dev/null 2>&1; then
100100
download_and_install_krew
101101
fi
102102

103-
if [[ "${EPHEMERAL_CLUSTER}" = "minikube" ]]; then
103+
if [[ "${BOOTSTRAP_CLUSTER}" = "minikube" ]]; then
104104
# shellcheck disable=SC2312
105105
if ! command -v minikube &>/dev/null || [[ "$(minikube version --short)" != "${MINIKUBE_VERSION}" ]]; then
106106
download_and_install_minikube
@@ -116,7 +116,7 @@ else
116116
if ! command -v kind &>/dev/null || [[ "v$(kind version -q)" != "${KIND_VERSION}" ]]; then
117117
download_and_install_kind
118118
fi
119-
if [[ "${EPHEMERAL_CLUSTER}" = "tilt" ]]; then
119+
if [[ "${BOOTSTRAP_CLUSTER}" = "tilt" ]]; then
120120
download_and_install_tilt
121121
fi
122122
fi

02_configure_host.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ init_minikube()
124124
fi
125125
}
126126

127-
if [[ "${EPHEMERAL_CLUSTER}" == "minikube" ]]; then
127+
if [[ "${BOOTSTRAP_CLUSTER}" == "minikube" ]]; then
128128
init_minikube
129129
fi
130130

@@ -257,7 +257,7 @@ if [[ "${OS}" == "ubuntu" ]]; then
257257
source disable_apparmor_driver_libvirtd.sh
258258
else
259259
if [[ "${MANAGE_PRO_BRIDGE}" == "y" ]]; then
260-
if [[ ${EPHEMERAL_CLUSTER} == "kind" ]]; then
260+
if [[ ${BOOTSTRAP_CLUSTER} == "kind" ]]; then
261261
configure_kind_network
262262
else
263263
configure_minikube_network

03_launch_mgmt_cluster.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ launch_baremetal_operator()
5959
pushd "${BMOPATH}"
6060

6161
# Deploy BMO using deploy.sh script
62-
if [[ "${EPHEMERAL_CLUSTER}" != "tilt" ]]; then
62+
if [[ "${BOOTSTRAP_CLUSTER}" != "tilt" ]]; then
6363
# Update container images to use local ones
6464
if [[ -n "${BARE_METAL_OPERATOR_LOCAL_IMAGE:-}" ]]; then
6565
update_component_image BMO "${BARE_METAL_OPERATOR_LOCAL_IMAGE}"
@@ -236,7 +236,7 @@ EOF
236236
update_component_image IPA-downloader "${IPA_DOWNLOADER_IMAGE}"
237237
fi
238238

239-
if [[ "${EPHEMERAL_CLUSTER}" != "minikube" ]]; then
239+
if [[ "${BOOTSTRAP_CLUSTER}" != "minikube" ]]; then
240240
update_images
241241
${RUN_LOCAL_IRONIC_SCRIPT}
242242
# Wait for ironic to become ready
@@ -352,7 +352,7 @@ launch_fake_ipa()
352352
{
353353
# Create a folder to host fakeIPA config and certs
354354
mkdir -p "${WORKING_DIR}/fake-ipa"
355-
if [[ "${EPHEMERAL_CLUSTER}" = "kind" ]] && [[ "${IRONIC_TLS_SETUP}" = "true" ]]; then
355+
if [[ "${BOOTSTRAP_CLUSTER}" = "kind" ]] && [[ "${IRONIC_TLS_SETUP}" = "true" ]]; then
356356
cp "${IRONIC_CACERT_FILE}" "${WORKING_DIR}/fake-ipa/ironic-ca.crt"
357357
elif [[ "${IRONIC_TLS_SETUP}" = "true" ]]; then
358358
# wait for ironic to be running to ensure ironic-cert is created
@@ -716,9 +716,9 @@ start_management_cluster()
716716
{
717717
local minikube_error
718718

719-
if [[ "${EPHEMERAL_CLUSTER}" = "kind" ]]; then
719+
if [[ "${BOOTSTRAP_CLUSTER}" = "kind" ]]; then
720720
launch_kind
721-
elif [[ "${EPHEMERAL_CLUSTER}" = "minikube" ]]; then
721+
elif [[ "${BOOTSTRAP_CLUSTER}" = "minikube" ]]; then
722722
# This method, defined in lib/common.sh, will either ensure sockets are up'n'running
723723
# for CS9 and RHEL9, or restart the libvirtd.service for other DISTRO
724724
manage_libvirtd
@@ -810,7 +810,7 @@ build_ipxe_firmware()
810810
"${BMOPATH}"/tools/remove_local_ironic.sh
811811
create_clouds_yaml
812812

813-
if [[ "${EPHEMERAL_CLUSTER}" = "tilt" ]]; then
813+
if [[ "${BOOTSTRAP_CLUSTER}" = "tilt" ]]; then
814814
# shellcheck disable=SC1091
815815
. tilt-setup/deploy_tilt_env.sh
816816
exit 0

03_launch_mgmt_cluster_pre_1_10.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ launch_baremetal_operator()
5252
pushd "${BMOPATH}"
5353

5454
# Deploy BMO using deploy.sh script
55-
if [[ "${EPHEMERAL_CLUSTER}" != "tilt" ]]; then
55+
if [[ "${BOOTSTRAP_CLUSTER}" != "tilt" ]]; then
5656
# Update container images to use local ones
5757
if [[ -n "${BARE_METAL_OPERATOR_LOCAL_IMAGE:-}" ]]; then
5858
update_component_image BMO "${BARE_METAL_OPERATOR_LOCAL_IMAGE}"
@@ -229,7 +229,7 @@ EOF
229229
update_component_image IPA-downloader "${IPA_DOWNLOADER_IMAGE}"
230230
fi
231231

232-
if [[ "${EPHEMERAL_CLUSTER}" != "minikube" ]]; then
232+
if [[ "${BOOTSTRAP_CLUSTER}" != "minikube" ]]; then
233233
update_images
234234
${RUN_LOCAL_IRONIC_SCRIPT}
235235
# Wait for ironic to become ready
@@ -345,7 +345,7 @@ launch_fake_ipa()
345345
{
346346
# Create a folder to host fakeIPA config and certs
347347
mkdir -p "${WORKING_DIR}/fake-ipa"
348-
if [[ "${EPHEMERAL_CLUSTER}" = "kind" ]] && [[ "${IRONIC_TLS_SETUP}" = "true" ]]; then
348+
if [[ "${BOOTSTRAP_CLUSTER}" = "kind" ]] && [[ "${IRONIC_TLS_SETUP}" = "true" ]]; then
349349
cp "${IRONIC_CACERT_FILE}" "${WORKING_DIR}/fake-ipa/ironic-ca.crt"
350350
elif [[ "${IRONIC_TLS_SETUP}" = "true" ]]; then
351351
# wait for ironic to be running to ensure ironic-cert is created
@@ -640,9 +640,9 @@ start_management_cluster()
640640
{
641641
local minikube_error
642642

643-
if [[ "${EPHEMERAL_CLUSTER}" = "kind" ]]; then
643+
if [[ "${BOOTSTRAP_CLUSTER}" = "kind" ]]; then
644644
launch_kind
645-
elif [[ "${EPHEMERAL_CLUSTER}" = "minikube" ]]; then
645+
elif [[ "${BOOTSTRAP_CLUSTER}" = "minikube" ]]; then
646646
# This method, defined in lib/common.sh, will either ensure sockets are up'n'running
647647
# for CS9 and RHEL9, or restart the libvirtd.service for other DISTRO
648648
manage_libvirtd
@@ -731,7 +731,7 @@ build_ipxe_firmware()
731731
"${BMOPATH}"/tools/remove_local_ironic.sh
732732
create_clouds_yaml
733733

734-
if [[ "${EPHEMERAL_CLUSTER}" = "tilt" ]]; then
734+
if [[ "${BOOTSTRAP_CLUSTER}" = "tilt" ]]; then
735735
# shellcheck disable=SC1091
736736
. tilt-setup/deploy_tilt_env.sh
737737
exit 0

04_verify.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ source lib/images.sh
1717
# shellcheck disable=SC1091
1818
source lib/releases.sh
1919

20-
if [ "${EPHEMERAL_CLUSTER}" == "tilt" ]; then
20+
if [ "${BOOTSTRAP_CLUSTER}" == "tilt" ]; then
2121
exit 0
2222
fi
2323

@@ -195,7 +195,7 @@ EXPTD_DEPLOYMENTS="capm3-system:capm3-controller-manager \
195195
capi-kubeadm-control-plane-system:capi-kubeadm-control-plane-controller-manager \
196196
baremetal-operator-system:baremetal-operator-controller-manager"
197197

198-
if [[ "${EPHEMERAL_CLUSTER}" == "minikube" ]]; then
198+
if [[ "${BOOTSTRAP_CLUSTER}" == "minikube" ]]; then
199199
if [[ "${USE_IRSO}" == "true" ]]; then
200200
EXPTD_DEPLOYMENTS+=" \
201201
baremetal-operator-system:ironic-service \

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ kubectl delete cluster "${CLUSTER_NAME:-"test1"}" -n metal3
118118
### Deploying and developing with Tilt
119119

120120
It is possible to use Tilt to run the CAPI, BMO, CAPM3 and IPAM components. Tilt
121-
ephemeral cluster will utilize Kind and Docker, so it requires an Ubuntu host.
121+
bootstrap cluster will utilize Kind and Docker, so it requires an Ubuntu host.
122122
For this, run:
123123

124124
By default, Metal3 components are not built locally. To develop with Tilt, you
@@ -130,11 +130,11 @@ development branch content. Same for IPAM, BMO and CAPI.
130130
See `vars.md` for more information.
131131

132132
After specifying the components and paths to your liking, bring the cluster up
133-
by setting the ephemeral cluster type to Tilt and image OS to Ubuntu.
133+
by setting the bootstrap cluster type to Tilt and image OS to Ubuntu.
134134

135135
```sh
136136
export IMAGE_OS=ubuntu
137-
export EPHEMERAL_CLUSTER="tilt"
137+
export BOOTSTRAP_CLUSTER="tilt"
138138
make
139139
```
140140

cluster_cleanup.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ set -eux
66
source lib/common.sh
77

88
# Delete cluster
9-
if [[ "${EPHEMERAL_CLUSTER}" = "kind" ]] || [[ "${EPHEMERAL_CLUSTER}" = "tilt" ]]; then
9+
if [[ "${BOOTSTRAP_CLUSTER}" = "kind" ]] || [[ "${BOOTSTRAP_CLUSTER}" = "tilt" ]]; then
1010
sudo su -l -c "kind delete cluster || true" "${USER}"
1111
# Kill and remove the running ironic containers
1212
if [[ -x "${BMOPATH}/tools/remove_local_ironic.sh" ]]; then
1313
"${BMOPATH}"/tools/remove_local_ironic.sh
1414
fi
15-
if [[ "${EPHEMERAL_CLUSTER}" = "tilt" ]]; then
15+
if [[ "${BOOTSTRAP_CLUSTER}" = "tilt" ]]; then
1616
pushd "${CAPM3PATH}"
1717
pgrep tilt | xargs kill || true
1818
make kind-reset
1919
popd
2020
fi
2121
fi
2222

23-
if [[ "${EPHEMERAL_CLUSTER}" = "minikube" ]]; then
23+
if [[ "${BOOTSTRAP_CLUSTER}" = "minikube" ]]; then
2424
sudo su -l -c "minikube delete" "${USER}"
2525
fi

config_example.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,13 +189,13 @@
189189
# of the node.
190190
#export NODE_HOSTNAME_FORMAT="node-%d"
191191

192-
# Ephemeral cluster used as management cluster for cluster API
192+
# Bootstrap cluster used as management cluster for cluster API
193193
# (can be "kind", "minikube" or "tilt"). Only "minikube" is supported with
194194
# CentOS
195195
# Selecting "tilt" does not deploy a management cluster, it is left up to the
196196
# user
197197
# Default is "kind" when CONTAINER_RUNTIME="docker", otherwise it is "minikube"
198-
#export EPHEMERAL_CLUSTER=minikube
198+
#export BOOTSTRAP_CLUSTER=minikube
199199

200200
# Secure Ironic deployment with TLS ("true" or "false")
201201
#export IRONIC_TLS_SETUP="true"

lib/common.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -380,11 +380,11 @@ export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.34.1}"
380380
export KUBERNETES_BINARIES_VERSION="${KUBERNETES_BINARIES_VERSION:-${KUBERNETES_VERSION}}"
381381
export KUBERNETES_BINARIES_CONFIG_VERSION=${KUBERNETES_BINARIES_CONFIG_VERSION:-"v0.15.1"}
382382

383-
# Ephemeral Cluster
383+
# Bootstrap Cluster
384384
if [[ "${CONTAINER_RUNTIME}" = "docker" ]]; then
385-
export EPHEMERAL_CLUSTER=${EPHEMERAL_CLUSTER:-"kind"}
385+
export BOOTSTRAP_CLUSTER=${BOOTSTRAP_CLUSTER:-"kind"}
386386
else
387-
export EPHEMERAL_CLUSTER="minikube"
387+
export BOOTSTRAP_CLUSTER="minikube"
388388
fi
389389

390390
# Kubectl version - SHA256 is downloaded and verified
@@ -397,10 +397,10 @@ export KREW_SHA256="${KREW_SHA256:-5df32eaa0e888a2566439c4ccb2ef3a3e6e89522f2f21
397397
# Kustomize version
398398
export KUSTOMIZE_VERSION="${KUSTOMIZE_VERSION:-v5.4.1}"
399399

400-
# Minikube version (if EPHEMERAL_CLUSTER=minikube)
400+
# Minikube version (if BOOTSTRAP_CLUSTER=minikube)
401401
export MINIKUBE_VERSION="${MINIKUBE_VERSION:-v1.37.0}"
402402

403-
# Kind, kind node image versions (if EPHEMERAL_CLUSTER=kind)
403+
# Kind, kind node image versions (if BOOTSTRAP_CLUSTER=kind)
404404
export KIND_VERSION="${KIND_VERSION:-v0.30.0}"
405405
export KIND_NODE_IMAGE_VERSION="${KIND_NODE_IMAGE_VERSION:-v1.34.0}"
406406
export KIND_NODE_IMAGE="${KIND_NODE_IMAGE:-${DOCKER_HUB_PROXY}/kindest/node:${KIND_NODE_IMAGE_VERSION}}"

lib/network.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ else
140140
fi
141141
export CLUSTER_APIENDPOINT_PORT=${CLUSTER_APIENDPOINT_PORT:-"6443"}
142142

143-
if [[ "${EPHEMERAL_CLUSTER}" == "minikube" ]] && [[ -n "${EXTERNAL_SUBNET_V6}" ]]; then
143+
if [[ "${BOOTSTRAP_CLUSTER}" == "minikube" ]] && [[ -n "${EXTERNAL_SUBNET_V6}" ]]; then
144144
network_address MINIKUBE_BMNET_V6_IP "${EXTERNAL_SUBNET_V6}" 9
145145
fi
146146

0 commit comments

Comments
 (0)