-
Notifications
You must be signed in to change notification settings - Fork 177
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This commit updated to use kubeadm stable for system testing, and created a single base yaml file for contiv deployment, also created a contiv-compose to update the base yaml file to support system testing, prometheus, auth_proxy and ACI(not yet). Update system testings to allow running netplugin on master nodes, so that service like kube-dns and kube-dashboard could be created correctly. Also formated ruby files and updated vagrant file so kube master could have more memories. Signed-off-by: Wei Tie <wtie@cisco.com>
- Loading branch information
Showing
16 changed files
with
721 additions
and
1,081 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,14 @@ | ||
kubeadm init --token=$1 --api-advertise-addresses=$2 --skip-preflight-checks=true --use-kubernetes-version $3 | ||
#!/bin/bash -x | ||
kubeadm init --token $1 --apiserver-advertise-address $2 --ignore-preflight-errors all --kubernetes-version $3 | ||
|
||
kubectl taint nodes --all node-role.kubernetes.io/master- | ||
|
||
if [ ! -z "$CONTIV_TEST" ]; then | ||
cp /etc/kubernetes/admin.conf /shared/admin.conf | ||
chmod 0644 /etc/kubernetes/admin.conf | ||
cd /opt/gopath/src/github.com/contiv/netplugin/install/k8s/contiv/ | ||
./contiv-compose add-systest ./base.yaml > /shared/contiv.yaml | ||
else | ||
cp /opt/gopath/src/github.com/contiv/netplugin/install/k8s/contiv/base.yaml /shared/contiv.yaml | ||
fi | ||
kubectl apply -f /shared/contiv.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,6 @@ | ||
kubeadm join --token=$1 --skip-preflight-checks=true $2 | ||
#!/bin/bash -x | ||
kubeadm join --token "$1" "$2" --ignore-preflight-errors all --discovery-token-unsafe-skip-ca-verification | ||
if [ ! -z "$CONTIV_TEST" ]; then | ||
cp /shared/admin.conf /etc/kubernetes/admin.conf | ||
chmod 0644 /etc/kubernetes/admin.conf | ||
fi |
Oops, something went wrong.