Skip to content

Commit ad6aae1

Browse files
author
Wei Tie
committed
Rename base.yaml to contiv-base.yaml
1 parent dbca990 commit ad6aae1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

install/k8s/cluster/k8smaster_centos.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ if [ -n "$CONTIV_TEST" ]; then
77
cp /etc/kubernetes/admin.conf /shared/admin.conf
88
chmod 0644 /etc/kubernetes/admin.conf
99
cd /opt/gopath/src/github.com/contiv/netplugin/install/k8s/contiv/
10-
./contiv-compose add-systest --k8s-api https://$2:$3 ./base.yaml > /shared/contiv.yaml
10+
./contiv-compose add-systest --k8s-api https://$2:$3 ./contiv-base.yaml > /shared/contiv.yaml
1111
# remove kube-dns
1212
# TODO: enable kube-dns
1313
kubectl delete deployment -n kube-system kube-dns
1414
else
1515
# update to use released version
1616
cd /opt/gopath/src/github.com/contiv/netplugin/install/k8s/contiv/
17-
./contiv-compose use-release -v $(cat /opt/gopath/src/github.com/contiv/netplugin/version/CURRENT_VERSION) ./base.yaml > /shared/contiv.yaml
17+
./contiv-compose use-release -v $(cat /opt/gopath/src/github.com/contiv/netplugin/version/CURRENT_VERSION) ./contiv-base.yaml > /shared/contiv.yaml
1818
fi
1919

2020
kubectl apply -f /shared/contiv.yaml
File renamed without changes.

0 commit comments

Comments
 (0)