diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46c9c928..8d4e906d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,9 +68,6 @@ jobs: DEX_KEYSTONE_ADMIN_USER: demo DEX_KEYSTONE_ADMIN_PASS: DEMO_PASS - - name: Run Kubernetes tests - run: ./scripts/test-k8s.sh - - name: Run linter run: make lint diff --git a/.travis.yml b/.travis.yml index d8ef066e..6c820183 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,6 @@ install: script: - make testall - - ./scripts/test-k8s.sh - make verify-proto # Ensure proto generation doesn't depend on external packages. notifications: diff --git a/scripts/test-k8s.sh b/scripts/test-k8s.sh deleted file mode 100755 index 86127be1..00000000 --- a/scripts/test-k8s.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash -e - -TEMPDIR=$( mktemp -d ) - -cat << EOF > $TEMPDIR/kubeconfig -apiVersion: v1 -kind: Config -clusters: -- name: local - cluster: - server: http://localhost:8080 -users: -- name: local - user: -contexts: -- context: - cluster: local - user: local -EOF - -cleanup () { - docker rm -f $( cat $TEMPDIR/etcd ) - docker rm -f $( cat $TEMPDIR/kube-apiserver ) - rm -rf $TEMPDIR -} - -trap "{ CODE=$?; cleanup ; exit $CODE; }" EXIT - -docker run \ - --cidfile=$TEMPDIR/etcd \ - -d \ - --net=host \ - gcr.io/google_containers/etcd:3.1.10 \ - etcd - -docker run \ - --cidfile=$TEMPDIR/kube-apiserver \ - -d \ - -v $TEMPDIR:/var/run/kube-test:ro \ - --net=host \ - gcr.io/google_containers/kube-apiserver-amd64:v1.7.4 \ - kube-apiserver \ - --etcd-servers=http://localhost:2379 \ - --service-cluster-ip-range=10.0.0.1/16 \ - --insecure-bind-address=0.0.0.0 \ - --insecure-port=8080 - -until $(curl --output /dev/null --silent --head --fail http://localhost:8080/healthz); do - printf '.' - sleep 1 -done -echo "API server ready" - -export DEX_KUBECONFIG=$TEMPDIR/kubeconfig -go test -v -i ./storage/kubernetes -go test -v ./storage/kubernetes