From b4a159374976153adc710c97845082e76bd82802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= Date: Fri, 24 Mar 2023 18:07:52 +0100 Subject: [PATCH] minor fixes --- clusterctl | 10 ++++++++-- templates/nfs-provisioner.yaml | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/clusterctl b/clusterctl index 65029f1..3ec1de4 100755 --- a/clusterctl +++ b/clusterctl @@ -27,12 +27,14 @@ function init () { mkdir -p ".clusters/$cluster_name" sed "s/__CLUSTER_NAME__/$cluster_name/" install-config.yaml > ".clusters/$cluster_name/install-config.yaml" sed "s/__CLUSTER_NAME__/$cluster_name/" terraform.tfvars > ".clusters/$cluster_name/terraform.tfvars" + grep LIBVIRT_DEFAULT_URI local.env > ".clusters/$cluster_name/local.env" echo "Cluster $cluster_name initialized successfully!" echo echo "Review and adjust the following files to your needs:" echo "- .clusters/$cluster_name/install-config.yaml" echo "- .clusters/$cluster_name/terraform.tfvars" + echo "- .clusters/$cluster_name/local.env" echo exit 0 } @@ -43,6 +45,10 @@ function destroy () { terraform destroy -var-file=".clusters/$cluster_name/terraform.tfvars" -state=".clusters/$cluster_name/terraform.tfstate" sed -i.bak 's/^\s*bootstrap_nodes\s*=\s*.*$/bootstrap_nodes = 1/' ".clusters/$cluster_name/terraform.tfvars" + if [ -f ".clusters/$cluster_name/install-config.yaml.bak" ]; then + cp ".clusters/$cluster_name/install-config.yaml.bak" ".clusters/$cluster_name/install-config.yaml" + fi + rm -rf .clusters/$cluster_name/{*.ign,metadata.json,auth,.openshift*,manifests} } function prepare () { @@ -281,8 +287,8 @@ if [ ! -e "local.env" ]; then fi source local.env -export LC_ALL=C -export LANG=C +export LC_ALL=C.utf-8 +export LANG=C.utf-8 case "${1:-}" in init) diff --git a/templates/nfs-provisioner.yaml b/templates/nfs-provisioner.yaml index e81b560..9b04c15 100644 --- a/templates/nfs-provisioner.yaml +++ b/templates/nfs-provisioner.yaml @@ -110,6 +110,7 @@ metadata: name: managed-nfs-storage annotations: storageclass.kubernetes.io/is-default-class: "true" + cdi.kubevirt.io/clone-strategy: "copy" provisioner: redhat-emea-ssa-team/hetzner-ocp4 parameters: archiveOnDelete: "false"