Skip to content

Commit

Permalink
Merge pull request lockc-project#196 from vadorovsky/cilium-version
Browse files Browse the repository at this point in the history
terraform: Use default Cilium version
  • Loading branch information
vadorovsky authored Apr 5, 2022
2 parents 638a652 + 34cf3c0 commit abd4967
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 1 addition & 3 deletions contrib/terraform/libvirt/deploy-kubernetes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ fi

sleep 5

CILIUM_VERSION=$(curl -s https://api.github.com/repos/cilium/cilium/releases/latest | jq -r '.tag_name' | sed -e 's/^v//')

info "### Run following commands to bootstrap Kubernetes cluster:\\n"

i=0
Expand All @@ -29,7 +27,7 @@ for MASTER in $TR_MASTER_IPS; do
sudo cp /etc/kubernetes/admin.conf /home/${TR_USERNAME}/.kube/config
sudo chown ${TR_USERNAME}:users /home/${TR_USERNAME}/.kube/config
helm repo add cilium https://helm.cilium.io/
helm install cilium cilium/cilium --version ${CILIUM_VERSION} --namespace kube-system --set kubeProxyReplacement=disabled
helm install cilium cilium/cilium --namespace kube-system --set kubeProxyReplacement=disabled
EOF

export KUBEADM_MASTER_JOIN=`ssh -o 'StrictHostKeyChecking no' -l ${TR_USERNAME} ${MASTER} tail -n12 kubeadm-init.log | head -n3`
Expand Down
4 changes: 1 addition & 3 deletions contrib/terraform/openstack/deploy-kubernetes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ fi

sleep 5

CILIUM_VERSION=$(curl -s https://api.github.com/repos/cilium/cilium/releases/latest | jq -r '.tag_name' | sed -e 's/^v//')

info "### Run following commands to bootstrap Kubernetes cluster:\\n"

i=0
Expand All @@ -30,7 +28,7 @@ for MASTER in $TR_MASTER_IPS; do
sudo cp /etc/kubernetes/admin.conf /home/${TR_USERNAME}/.kube/config
sudo chown ${TR_USERNAME}:users /home/${TR_USERNAME}/.kube/config
helm repo add cilium https://helm.cilium.io/
helm install cilium cilium/cilium --version ${CILIUM_VERSION} --namespace kube-system --set kubeProxyReplacement=disabled
helm install cilium cilium/cilium --namespace kube-system --set kubeProxyReplacement=disabled
EOF

export KUBEADM_MASTER_JOIN=`ssh -o 'StrictHostKeyChecking no' -l ${TR_USERNAME} ${MASTER} tail -n12 kubeadm-init.log | head -n3`
Expand Down

0 comments on commit abd4967

Please sign in to comment.