Skip to content

Commit d874f9b

Browse files
chrisplochrisplo
committed
remove some k8s 1.4 support and broken targets
The k8s-legacy-* makefile targets were supporting older versions of kubernetes (pre 1.4). setup_cluster when it does not need legacy installation support or 1.4 support is greatly simplified and some supporting scripts to support ansible are no longer needed. removing k8s-demo and k8s-demo-start as they required the third party ansible deployment that is no longer supported Signed-off-by: Chris Plock <[email protected]>
1 parent 297f20b commit d874f9b

8 files changed

+15
-272
lines changed

‎Makefile

-20
Original file line numberDiff line numberDiff line change
@@ -130,19 +130,8 @@ update:
130130
start:
131131
CONTIV_DOCKER_VERSION="$${CONTIV_DOCKER_VERSION:-$(DEFAULT_DOCKER_VERSION)}" CONTIV_NODE_OS=${CONTIV_NODE_OS} vagrant up
132132

133-
# ===================================================================
134-
#kubernetes demo targets
135-
k8s-demo:
136-
cd vagrant/k8s/ && ./copy_demo.sh
137-
138-
k8s-demo-start:
139-
cd vagrant/k8s/ && ./restart_cluster.sh && vagrant ssh k8master
140-
141133
# ===================================================================
142134
# kubernetes cluster bringup/cleanup targets
143-
k8s-legacy-cluster:
144-
cd vagrant/k8s/ && ./setup_cluster.sh
145-
146135
k8s-cluster:
147136
cd vagrant/k8s/ && CONTIV_K8S_USE_KUBEADM=1 ./setup_cluster.sh
148137

@@ -157,15 +146,6 @@ k8s-l3-destroy:
157146

158147
# ===================================================================
159148
# kubernetes test targets
160-
k8s-legacy-test:
161-
export CONTIV_K8S_LEGACY=1 && \
162-
make k8s-sanity-cluster && \
163-
cd vagrant/k8s/ && vagrant ssh k8master -c 'bash -lc "cd /opt/gopath/src/github.com/contiv/netplugin && make run-build"' && \
164-
./start_sanity_service.sh
165-
cd $(GOPATH)/src/github.com/contiv/netplugin/scripts/python && PYTHONIOENCODING=utf-8 ./createcfg.py -scheduler 'k8s'
166-
CONTIV_K8S_LEGACY=1 CONTIV_NODES=3 go test -v -timeout 540m ./test/systemtests -check.v -check.abort -check.f "00SSH|TestBasic|TestNetwork|ACID|TestPolicy|TestTrigger"
167-
cd vagrant/k8s && vagrant destroy -f
168-
169149
k8s-test: k8s-cluster
170150
cd vagrant/k8s/ && vagrant ssh k8master -c 'bash -lc "cd /opt/gopath/src/github.com/contiv/netplugin && make run-build"'
171151
cd $(GOPATH)/src/github.com/contiv/netplugin/scripts/python && PYTHONIOENCODING=utf-8 ./createcfg.py -scheduler 'k8s' -binpath contiv/bin -install_mode 'kubeadm'

‎install/k8s/DEVENV.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Kubernetes Setup for Contiv
22

3-
This document details the setup instructions for Kubernetes version 1.4 and higher for CentOS 7
3+
This document details the setup instructions for Kubernetes version 1.6 and higher for CentOS 7
44

55
### Setup Kubernetes Cluster
6-
Install kubernetes 1.4 or higher using http://kubernetes.io/docs/getting-started-guides/kubeadm/
6+
Install kubernetes 1.6 or higher using http://kubernetes.io/docs/getting-started-guides/kubeadm/
77

88
(OR) Alternatively do the following:
99
* On all nodes run
@@ -17,7 +17,7 @@ Install kubernetes 1.4 or higher using http://kubernetes.io/docs/getting-started
1717
```sh
1818
./cluster/k8smaster_centos.sh <token> <master management IP> <kubernetes version>
1919
```
20-
For example, k8smaster_centos.sh "d900e1.8a392798f13b33a4" 192.168.2.10 v1.4.1, will start a cluster with kubernetes API server on 192.168.2.10. The token is a 6.16 string which can be generated as shown below:
20+
For example, k8smaster_centos.sh "d900e1.8a392798f13b33a4" 192.168.2.10 v1.6, will start a cluster with kubernetes API server on 192.168.2.10. The token is a 6.16 string which can be generated as shown below:
2121
```sh
2222
python -c 'import random; print "%0x.%0x" % (random.SystemRandom().getrandbits(3*8), random.SystemRandom().getrandbits(8*8))'
2323

‎install/k8s/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Contiv installation for Kubernetes
22

3-
This document details the setup instructions for Kubernetes version 1.4+ and higher for CentOS 7
3+
This document details the setup instructions for Kubernetes version 1.6+ and higher for CentOS 7
44

5-
Install kubernetes 1.4 or higher using http://kubernetes.io/docs/getting-started-guides/kubeadm/ and follow the instructions below.
5+
Install kubernetes 1.6 or higher using http://kubernetes.io/docs/getting-started-guides/kubeadm/ and follow the instructions below.
66

77
### Install Contiv
88
* For ACI setups use contiv/contiv_aci.yaml instead of contiv/contiv.yaml.

‎vagrant/k8s/copy_demo.sh

-4
This file was deleted.

‎vagrant/k8s/restart_cluster.sh

-5
This file was deleted.

‎vagrant/k8s/setup_cluster.sh

+10-116
Original file line numberDiff line numberDiff line change
@@ -1,124 +1,18 @@
11
#!/bin/bash
22

3-
# GetKubernetes fetches k8s binaries from the k8 release repo
4-
function GetKubernetes {
3+
set -euo pipefail
54

6-
# fetch kubernetes released binaries
7-
pushd .
8-
mkdir -p $top_dir/k8s-$k8sVer
9-
if [ -f $top_dir/k8s-$k8sVer/kubernetes.tar.gz ]; then
10-
echo "k8s-$k8sVer/kubernetes.tar.gz found, not fetching."
11-
rm -rf $top_dir/k8s-$k8sVer/kubernetes
12-
rm -rf $top_dir/k8s-$k8sVer/bin
13-
else
14-
cd $top_dir/k8s-$k8sVer
15-
wget https://github.com/kubernetes/kubernetes/releases/download/$k8sVer/kubernetes.tar.gz
16-
fi
5+
echo "Using kubeadm/kubectl installation"
176

18-
# untar kubernetes released binaries
19-
cd $top_dir/k8s-$k8sVer
20-
tar xvfz kubernetes.tar.gz kubernetes/server/kubernetes-server-linux-amd64.tar.gz
21-
tar xvfz kubernetes/server/kubernetes-server-linux-amd64.tar.gz
22-
popd
23-
24-
if [ ! -f $top_dir/k8s-$k8sVer/kubernetes/server/bin/kubelet ]; then
25-
echo "Error kubelet not found after fetch/extraction"
26-
exit 1
27-
fi
28-
}
29-
30-
# GetContiv fetches k8s binaries from the contiv release repo
31-
function GetContiv {
32-
33-
# fetch contiv binaries
34-
pushd .
35-
mkdir -p $top_dir/contiv_bin
36-
if [ -f $top_dir/contiv_bin/netplugin-$contivVer.tar.bz2 ]; then
37-
echo "netplugin-$contivVer.tar.bz2 found, not fetching."
38-
else
39-
cd $top_dir/contiv_bin
40-
wget https://github.com/contiv/netplugin/releases/download/$contivVer/netplugin-$contivVer.tar.bz2
41-
tar xvfj netplugin-$contivVer.tar.bz2
42-
fi
43-
popd
44-
45-
if [ ! -f $top_dir/contiv_bin/contivk8s ]; then
46-
echo "Error contivk8s not found after fetch/extraction"
47-
exit 1
48-
fi
49-
}
50-
51-
#GetContrib fetches contrib if not present
52-
53-
function GetContrib {
54-
pushd .
55-
if [ -f $top_dir/contrib ]; then
56-
echo "contrib found, not fetching."
57-
else
58-
echo "Fetching contrib....."
59-
git clone https://github.com/jojimt/contrib -b contiv
60-
fi
61-
popd
62-
}
63-
64-
# kubernetes version to use -- legacy is v1.2.3
65-
#: ${k8sVer:=v1.2.3}
66-
67-
# kubectl installation mechanism default is v1.4.4
68-
: ${k8sVer:=v1.4.4}
69-
70-
# contiv version
71-
: ${contivVer:=1.0.2}
72-
73-
top_dir=$(git rev-parse --show-toplevel | sed 's|/[^/]*$||')
74-
75-
# kubernetes installation mechanism
76-
k8s_devtest=$CONTIV_K8S_USE_KUBEADM
77-
k8s_legacy_devtest=$CONTIV_K8S_LEGACY
78-
79-
legacyInstall=0
80-
81-
if [ "$k8s_legacy_devtest" == "1" ]; then
82-
legacyInstall=1
83-
elif [ "`printf "v1.4\n$k8sVer" | sort -t '.' -k 1,1 -k 2,2 -k 3,3 -k 4,4 -g | head -n 1`" != "v1.4" ]; then
84-
legacyInstall=1
85-
fi
86-
87-
if [ "$legacyInstall" == 1 ]; then
88-
echo "Using legacy kubernetes installation"
89-
GetKubernetes
90-
GetContrib
7+
# Copy the contiv installation file to shared folder
8+
if [ "${CONTIV_K8S_USE_KUBEADM:-}" == 1 ]; then
9+
cp -f ../../install/k8s/contiv/contiv_devtest.yaml ./export/.contiv.yaml
9110
else
92-
echo "Using kubeadm/kubectl installation"
11+
cp -f ../../install/k8s/contiv/contiv.yaml ./export/.contiv.yaml
9312
fi
94-
95-
if [ "$legacyInstall" == 1 ] && [ "$k8s_devtest" == "" ]; then
96-
GetContiv
97-
fi
98-
99-
# exit on any error
100-
set -e
13+
# Replace __NETMASTER_IP__ and __VLAN_IF__
14+
sed -i.bak 's/__NETMASTER_IP__/192.168.2.10/g' ./export/.contiv.yaml
15+
sed -i.bak 's/__VLAN_IF__/eth2/g' ./export/.contiv.yaml
10116

10217
# bring up vms
103-
if [ "$legacyInstall" == 1 ]; then
104-
vagrant up
105-
else
106-
# Copy the contiv installation file to shared folder
107-
if [ "$k8s_devtest" == 1 ]; then
108-
cp -f ../../install/k8s/contiv/contiv_devtest.yaml ./export/.contiv.yaml
109-
else
110-
cp -f ../../install/k8s/contiv/contiv.yaml ./export/.contiv.yaml
111-
fi
112-
# Replace __NETMASTER_IP__ and __VLAN_IF__
113-
sed -i.bak 's/__NETMASTER_IP__/192.168.2.10/g' ./export/.contiv.yaml
114-
sed -i.bak 's/__VLAN_IF__/eth2/g' ./export/.contiv.yaml
115-
VAGRANT_USE_KUBEADM=1 vagrant up
116-
fi
117-
# generate inventory
118-
./vagrant_cluster.py
119-
120-
121-
if [ "$legacyInstall" == 1 ]; then
122-
# run ansible
123-
ansible-playbook -i .contiv_k8s_inventory ./contrib/ansible/cluster.yml --skip-tags "contiv_restart" -e "networking=contiv contiv_fabric_mode=default localBuildOutput=$top_dir/k8s-$k8sVer/kubernetes/server/bin contiv_bin_path=$top_dir/contiv_bin contiv_demo=True"
124-
fi
18+
VAGRANT_USE_KUBEADM=1 vagrant up

‎vagrant/k8s/start_sanity_service.sh

-5
This file was deleted.

‎vagrant/k8s/vagrant_cluster.py

-117
This file was deleted.

0 commit comments

Comments
 (0)