Browse Source

minor fixes

main
Nicolas Massé 3 years ago
parent
commit
b4a1593749
  1. 10
      clusterctl
  2. 1
      templates/nfs-provisioner.yaml

10
clusterctl

@ -27,12 +27,14 @@ function init () {
mkdir -p ".clusters/$cluster_name" 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/" install-config.yaml > ".clusters/$cluster_name/install-config.yaml"
sed "s/__CLUSTER_NAME__/$cluster_name/" terraform.tfvars > ".clusters/$cluster_name/terraform.tfvars" 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 "Cluster $cluster_name initialized successfully!"
echo echo
echo "Review and adjust the following files to your needs:" echo "Review and adjust the following files to your needs:"
echo "- .clusters/$cluster_name/install-config.yaml" echo "- .clusters/$cluster_name/install-config.yaml"
echo "- .clusters/$cluster_name/terraform.tfvars" echo "- .clusters/$cluster_name/terraform.tfvars"
echo "- .clusters/$cluster_name/local.env"
echo echo
exit 0 exit 0
} }
@ -43,6 +45,10 @@ function destroy () {
terraform destroy -var-file=".clusters/$cluster_name/terraform.tfvars" -state=".clusters/$cluster_name/terraform.tfstate" 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" 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 () { function prepare () {
@ -281,8 +287,8 @@ if [ ! -e "local.env" ]; then
fi fi
source local.env source local.env
export LC_ALL=C export LC_ALL=C.utf-8
export LANG=C export LANG=C.utf-8
case "${1:-}" in case "${1:-}" in
init) init)

1
templates/nfs-provisioner.yaml

@ -110,6 +110,7 @@ metadata:
name: managed-nfs-storage name: managed-nfs-storage
annotations: annotations:
storageclass.kubernetes.io/is-default-class: "true" storageclass.kubernetes.io/is-default-class: "true"
cdi.kubevirt.io/clone-strategy: "copy"
provisioner: redhat-emea-ssa-team/hetzner-ocp4 provisioner: redhat-emea-ssa-team/hetzner-ocp4
parameters: parameters:
archiveOnDelete: "false" archiveOnDelete: "false"

Loading…
Cancel
Save