Merge branch 'cloud-provider_and_caico-cni_patch' into 'master'

Cloud provider and caico cni patch

See merge request mpcdf/cloud/kubernetes!3

mom-template.yaml

@@ -299,7 +299,9 @@ resources:
                 sed "s/server: https:.*/server: https:\/\/$CONTROLPLANE_IP:6443/" /etc/kubernetes/admin.conf > /root/externaladmin.conf
                 echo "export KUBECONFIG=/etc/kubernetes/admin.conf" >> /root/.bashrc
                 export KUBECONFIG=/etc/kubernetes/admin.conf
-                curl https://projectcalico.docs.tigera.io/manifests/calico-vxlan.yaml | sed 's/CrossSubnet/Always/' | kubectl apply -f -
+                curl -s https://raw.githubusercontent.com/projectcalico/calico/v3.25.0/manifests/calico-vxlan.yaml \
+                    | sed 's/CrossSubnet/Always/' \
+                    | kubectl apply -f -
                 
                 cat > /tmp/cloud.conf <<EOF
                 [Global]
@@ -327,7 +329,9 @@ resources:
                   availability: nova
                 EOF
                 
-                git clone https://github.com/kubernetes/cloud-provider-openstack.git /tmp/cloud-provider-openstack
+                mkdir -p /tmp/cloud-provider-openstack
+                curl -sL 'https://github.com/kubernetes/cloud-provider-openstack/archive/refs/tags/v1.25.3.tar.gz' \
+                    | tar zxv --strip-components=1 -C /tmp/cloud-provider-openstack
                 rm /tmp/cloud-provider-openstack/manifests/cinder-csi-plugin/csi-secret-cinderplugin.yaml
                 
                 kubectl create secret -n kube-system generic cloud-config --from-file=/tmp/cloud.conf