Skip to content

Commit cd65987

Browse files
eromanovapierreprinetti
authored andcommitted
Change calico version to v3.5 (openshift#245)
Calico v3.5 manifest includes all necessary rbac roles and bindings Change-Id: I583d028133ccc1e1aa8bfc3e8bccf9c6791f48f7
1 parent 6fb6f86 commit cd65987

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

cmd/clusterctl/examples/openstack/provider-component/user-data/centos/templates/master-user-data.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ for tries in $(seq 1 60); do
131131
done
132132

133133
# By default, use calico for container network plugin, should make this configurable.
134-
kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f https://docs.projectcalico.org/v3.1/getting-started/kubernetes/installation/hosted/rbac-kdd.yaml
135-
kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f https://docs.projectcalico.org/v3.1/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.7/calico.yaml
134+
kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f https://docs.projectcalico.org/v3.5/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.7/calico.yaml
136135

137136
mkdir -p /root/.kube
138137
cp -i /etc/kubernetes/admin.conf /root/.kube/config

cmd/clusterctl/examples/openstack/provider-component/user-data/ubuntu/templates/master-user-data.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,7 @@ for tries in $(seq 1 60); do
161161
sleep 1
162162
done
163163
# By default, use calico for container network plugin, should make this configurable.
164-
kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f https://docs.projectcalico.org/v3.1/getting-started/kubernetes/installation/hosted/rbac-kdd.yaml
165-
kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f https://docs.projectcalico.org/v3.1/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.7/calico.yaml
164+
kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f https://docs.projectcalico.org/v3.5/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.7/calico.yaml
166165
echo done.
167166
) 2>&1 | tee /var/log/startup.log
168167

0 commit comments

Comments
 (0)