@@ -21,8 +21,8 @@ source ./cluster-up/hack/common.sh
2121source ./cluster-up/cluster/${KUBEVIRT_PROVIDER} /provider.sh
2222
2323for i in $( seq 1 ${KUBEVIRT_NUM_NODES} ) ; do
24- ./cluster-up/ssh.sh " node$( printf " %02d" ${i} ) " " sudo mkdir -p /var/hpvolumes"
25- ./cluster-up/ssh.sh " node$( printf " %02d" ${i} ) " " sudo chcon -t container_file_t -R /var/hpvolumes"
24+ ./cluster-up/ssh.sh " node$( printf " %02d" ${i} ) " " sudo mkdir -p /var/hpvolumes"
25+ ./cluster-up/ssh.sh " node$( printf " %02d" ${i} ) " " sudo chcon -t container_file_t -R /var/hpvolumes"
2626done
2727
2828registry=${IMAGE_REGISTRY:- localhost: $(_port registry)}
5252
5353 retry_counter=0
5454 while [[ $retry_counter -lt 10 ]] && [ " $observed_version " != " $UPGRADE_FROM " ]; do
55- observed_version=` _kubectl get Hostpathprovisioner -o=jsonpath=' {.items[*].status.observedVersion}{"\n"}' `
56- target_version=` _kubectl get Hostpathprovisioner -o=jsonpath=' {.items[*].status.targetVersion}{"\n"}' `
57- operator_version=` _kubectl get Hostpathprovisioner -o=jsonpath=' {.items[*].status.operatorVersion}{"\n"}' `
55+ observed_version=$( _kubectl get Hostpathprovisioner -o=jsonpath=' {.items[*].status.observedVersion}{"\n"}' )
56+ target_version=$( _kubectl get Hostpathprovisioner -o=jsonpath=' {.items[*].status.targetVersion}{"\n"}' )
57+ operator_version=$( _kubectl get Hostpathprovisioner -o=jsonpath=' {.items[*].status.operatorVersion}{"\n"}' )
5858 echo " observedVersion: $observed_version , operatorVersion: $operator_version , targetVersion: $target_version "
5959 retry_counter=$(( retry_counter + 1 ))
60- sleep 5
60+ sleep 5
6161 done
6262 if [ $retry_counter -eq 10 ]; then
63- echo " Unable to deploy to version $UPGRADE_FROM "
64- hpp_obj=$( _kubectl get Hostpathprovisioner -o yaml)
65- echo $hpp_obj
66- exit 1
63+ echo " Unable to deploy to version $UPGRADE_FROM "
64+ hpp_obj=$( _kubectl get Hostpathprovisioner -o yaml)
65+ echo $hpp_obj
66+ exit 1
6767 fi
6868
6969fi
7070
7171if [ ${HPP_NAMESPACE} == " hostpath-provisioner" ]; then
72- _kubectl apply -f https://raw.githubusercontent.com/kubevirt/hostpath-provisioner-operator/main/deploy/namespace.yaml
72+ _kubectl apply -f https://raw.githubusercontent.com/kubevirt/hostpath-provisioner-operator/main/deploy/namespace.yaml
7373fi
7474_kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.6.1/cert-manager.yaml
7575_kubectl wait --for=condition=available -n cert-manager --timeout=120s --all deployments
@@ -107,21 +107,22 @@ volumeBindingMode: Immediate
107107EOF
108108echo " Waiting for hostpath provisioner to be available"
109109_kubectl wait hostpathprovisioners.hostpathprovisioner.kubevirt.io/hostpath-provisioner --for=condition=Available --timeout=480s
110+ # _kubectl apply -f "deploy/tests/network-policies.yaml" -n ${HPP_NAMESPACE}
110111
111112retry_counter=0
112113while [[ $retry_counter -lt 10 ]] && [ " $observed_version " == " $UPGRADE_FROM " ]; do
113- observed_version=` _kubectl get Hostpathprovisioner -o=jsonpath=' {.items[*].status.observedVersion}{"\n"}' `
114- target_version=` _kubectl get Hostpathprovisioner -o=jsonpath=' {.items[*].status.targetVersion}{"\n"}' `
115- operator_version=` _kubectl get Hostpathprovisioner -o=jsonpath=' {.items[*].status.operatorVersion}{"\n"}' `
114+ observed_version=$( _kubectl get Hostpathprovisioner -o=jsonpath=' {.items[*].status.observedVersion}{"\n"}' )
115+ target_version=$( _kubectl get Hostpathprovisioner -o=jsonpath=' {.items[*].status.targetVersion}{"\n"}' )
116+ operator_version=$( _kubectl get Hostpathprovisioner -o=jsonpath=' {.items[*].status.operatorVersion}{"\n"}' )
116117 echo " observedVersion: $observed_version , operatorVersion: $operator_version , targetVersion: $target_version "
117118 retry_counter=$(( retry_counter + 1 ))
118- sleep 5
119+ sleep 5
119120done
120121if [ $retry_counter -eq 20 ]; then
121- echo " Unable to deploy to latest version"
122- hpp_obj=$( _kubectl get hostpathprovisioner -o yaml)
123- echo $hpp_obj
124- exit 1
122+ echo " Unable to deploy to latest version"
123+ hpp_obj=$( _kubectl get hostpathprovisioner -o yaml)
124+ echo $hpp_obj
125+ exit 1
125126fi
126127
127128function configure_prometheus {
0 commit comments