Skip to content
Snippets Groups Projects
Commit 18018059 authored by Brian Standley's avatar Brian Standley
Browse files

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

Cloud provider and caico cni patch

See merge request mpcdf/cloud/kubernetes!3
parents af9c9d88 3cc38490
No related branches found
No related tags found
No related merge requests found
...@@ -299,7 +299,9 @@ resources: ...@@ -299,7 +299,9 @@ resources:
sed "s/server: https:.*/server: https:\/\/$CONTROLPLANE_IP:6443/" /etc/kubernetes/admin.conf > /root/externaladmin.conf 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 echo "export KUBECONFIG=/etc/kubernetes/admin.conf" >> /root/.bashrc
export KUBECONFIG=/etc/kubernetes/admin.conf 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 cat > /tmp/cloud.conf <<EOF
[Global] [Global]
...@@ -327,7 +329,9 @@ resources: ...@@ -327,7 +329,9 @@ resources:
availability: nova availability: nova
EOF 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 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 kubectl create secret -n kube-system generic cloud-config --from-file=/tmp/cloud.conf
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment