Update canal manifest and setup_system.sh

Signed-off-by: Saikrishna Edupuganti <saikrishna.edupuganti@intel.com>
This commit is contained in:
Saikrishna
2019-01-01 21:49:14 +00:00
committed by Manohar Castelino
parent 9f097cacd8
commit d4c47d2c5b
2 changed files with 7 additions and 8 deletions
+6 -6
View File
@@ -1,8 +1,8 @@
# Canal Version v3.3.0
# https://docs.projectcalico.org/v3.3/releases#v3.3.0
# Canal Version v3.3.2
# https://docs.projectcalico.org/v3.3/releases#v3.3.2
# This manifest includes the following component versions:
# calico/node:v3.3.0
# calico/cni:v3.3.0
# calico/node:v3.3.2
# calico/cni:v3.3.2
# coreos/flannel:v0.9.1
# This ConfigMap is used to configure a self-hosted Canal installation.
@@ -115,7 +115,7 @@ spec:
# container programs network policy and routes on each
# host.
- name: calico-node
image: quay.io/calico/node:v3.3.0
image: quay.io/calico/node:v3.3.2
env:
# Use Kubernetes API as the backing datastore.
- name: DATASTORE_TYPE
@@ -194,7 +194,7 @@ spec:
# This container installs the Calico CNI binaries
# and CNI network config file on each node.
- name: install-cni
image: quay.io/calico/cni:v3.3.0
image: quay.io/calico/cni:v3.3.2
command: ["/install-cni.sh"]
env:
# Name of the CNI config file to create.
+1 -2
View File
@@ -64,7 +64,7 @@ if [[ ${http_proxy} ]] || [[ ${HTTP_PROXY} ]]; then
echo "Warning, failed to find /etc/profile.d/proxy.sh to edit no_proxy line"
fi
services=('crio' 'docker' 'kubelet')
services=('crio' 'kubelet')
for s in "${services[@]}"; do
sudo mkdir -p "/etc/systemd/system/${s}.service.d/"
cat << EOF | sudo bash -c "cat > /etc/systemd/system/${s}.service.d/proxy.conf"
@@ -81,5 +81,4 @@ set -o nounset
# We have potentially modified their env files, we need to restart the services.
sudo systemctl daemon-reload
sudo systemctl restart crio || true
sudo systemctl restart docker || true
sudo systemctl restart kubelet || true