fix error

This commit is contained in:
magicsong
2019-08-18 10:26:20 +08:00
parent 122fb9035d
commit e33f5824b3
63 changed files with 104 additions and 177 deletions

View File

@@ -1,63 +0,0 @@
#!/bin/bash
set -e
function cleanup(){
result=$?
set +e
echo "Cleaning Namespace"
kubectl delete ns $TEST_NS > /dev/null
exit $result
}
tag=`git rev-parse --short HEAD`
IMG=magicsong/ks-network:$tag
DEST=/tmp/manager.yaml
TEST_NS=porter-test-$tag
SKIP_BUILD=no
##cleanning before running
kubectl get ns $TEST_NS 2>&1 | grep "not found" || kubectl delete ns $TEST_NS
while [[ $# -gt 0 ]]
do
key="$1"
case $key in
-s|--skip-build)
SKIP_BUILD=yes
shift # past argument
;;
-n|--NAMESPACE)
TEST_NS=$2
shift # past argument
shift # past value
;;
-t|--tag)
tag="$2"
shift # past argument
shift # past value
;;
--default)
DEFAULT=YES
shift # past argument
;;
*) # unknown option
POSITIONAL+=("$1") # save it in an array for later
shift # past argument
;;
esac
done
trap cleanup EXIT SIGINT SIGQUIT
kustomize_dir="./kustomize/network"
if [ "$(uname)" == "Darwin" ]; then
sed -i '' -e 's/namespace: .*/namespace: '"${TEST_NS}"'/' $kustomize_dir/kustomization.yaml
sed -i '' -e 's@image: .*@image: '"${IMG}"'@' $kustomize_dir/patch_image_name.yaml
else
sed -i -e 's/namespace: .*/namespace: '"${TEST_NS}"'/' $kustomize_dir/kustomization.yaml
sed -i -e 's@image: .*@image: '"${IMG}"'@' $kustomize_dir/patch_image_name.yaml
fi
kubectl create ns $TEST_NS
kubectl apply -k $kustomize_dir

View File

@@ -1,57 +0,0 @@
#!/bin/bash
#this script must invoked in the root directory of this repo
tag=`git rev-parse --short HEAD`
IMG=magicsong/ks-network:$tag
DEST=/tmp/manager.yaml
SKIP_BUILD=no
echo "try to delete old yaml"
kubectl delete -f $DEST
set -e
while [[ $# -gt 0 ]]
do
key="$1"
case $key in
-s|--skip-build)
SKIP_BUILD=yes
shift # past argument
;;
-n|--NAMESPACE)
TEST_NS=$2
shift # past argument
shift # past value
;;
-t|--tag)
tag="$2"
shift # past argument
shift # past value
;;
--default)
DEFAULT=YES
shift # past argument
;;
*) # unknown option
POSITIONAL+=("$1") # save it in an array for later
shift # past argument
;;
esac
done
if [ $SKIP_BUILD == "no" ]; then
echo "Building binary"
hack/gobuild.sh cmd/ks-network
docker build -f build/ks-network/Dockerfile -t $IMG bin/cmd
echo "Push images"
docker push $IMG
fi
echo "Generating yaml"
sed -e 's@image: .*@image: '"${IMG}"'@' config/manager/network.yaml > $DEST
kubectl apply -f $DEST
kubectl apply -f config/rbac/rbac_role_binding_network.yaml