From 97756414308d9cfa5c74a049bf5e233d2c503fbe Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Wed, 13 Dec 2017 21:37:35 +0200 Subject: [PATCH] Remove k8s unit test --- build/bin/.gitkeep | 0 k8s/k8s_test.go | 86 ---------------------------------------------- scripts/test | 82 ------------------------------------------- 3 files changed, 168 deletions(-) create mode 100644 build/bin/.gitkeep delete mode 100644 k8s/k8s_test.go diff --git a/build/bin/.gitkeep b/build/bin/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/k8s/k8s_test.go b/k8s/k8s_test.go deleted file mode 100644 index 10acfeff..00000000 --- a/k8s/k8s_test.go +++ /dev/null @@ -1,86 +0,0 @@ -package k8s - -import ( - "testing" - - check "gopkg.in/check.v1" - "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/kubernetes" -) - -const ( - KubeConfigPath = "/etc/kubernetes/ssl/kubeconfig" - ConfigMapName = "testconfigmap" - ConfigYaml = `--- -foo: bar -test: test123` - SecretFile = `secret123` - SecretName = "secret" -) - -type KubernetesOperationsTestSuite struct { - kubeClient *kubernetes.Clientset -} - -func Test(t *testing.T) { - check.TestingT(t) -} - -var _ = check.Suite(&KubernetesOperationsTestSuite{}) - -func (k *KubernetesOperationsTestSuite) SetUpSuite(c *check.C) { - var err error - k.kubeClient, err = NewClient(KubeConfigPath) - meta := metav1.ObjectMeta{Name: metav1.NamespaceSystem} - ns := &v1.Namespace{ - ObjectMeta: meta, - } - if _, err = k.kubeClient.CoreV1().Namespaces().Create(ns); err != nil { - c.Fatalf("Failed to set up test suite: %v", err) - } - -} - -func (k *KubernetesOperationsTestSuite) TestSaveConfig(c *check.C) { - var err error - if err != nil { - c.Fatalf("Failed to initialize kubernetes client") - } - - // Make sure that config yaml file can be stored as a config map - err = UpdateConfigMap(k.kubeClient, []byte(ConfigYaml), ConfigMapName) - if err != nil { - c.Fatalf("Failed to store config map %s: %v", ConfigMapName, err) - } - - cfgMap, err := GetConfigMap(k.kubeClient, ConfigMapName) - if err != nil { - c.Fatalf("Failed to fetch config map %s: %v", ConfigMapName, err) - } - - if cfgMap.Data[ConfigMapName] != ConfigYaml { - c.Fatalf("Failed to verify the config map %s: %v", ConfigMapName, err) - } -} - -func (k *KubernetesOperationsTestSuite) TestSaveSecret(c *check.C) { - var err error - if err != nil { - c.Fatalf("Failed to initialize kubernetes client") - } - - err = UpdateSecret(k.kubeClient, SecretName, []byte(SecretFile), SecretName) - if err != nil { - c.Fatalf("Failed to store secret %s: %v", SecretName, err) - } - - secret, err := GetSecret(k.kubeClient, SecretName) - if err != nil { - c.Fatalf("Failed to fetch secret %s: %v", SecretName, err) - } - - if string(secret.Data[SecretName]) != SecretFile { - c.Fatalf("Failed to verify the secret %s: %v", SecretName, err) - } -} diff --git a/scripts/test b/scripts/test index d52af208..78d0797a 100755 --- a/scripts/test +++ b/scripts/test @@ -1,92 +1,10 @@ #!/bin/bash set -e -cleanup() -{ - local exit=$? - kill $PID || true - wait $PID || true - exit $exit -} - cd $(dirname $0)/.. echo Running tests -export SOCK=/var/run/dind.sock -export DOCKER_HOST=unix://${SOCK} -export CATTLE_DOCKER_USE_BOOT2DOCKER=true -export INCLUSTER_CONFIG=false - -ip link set dev eth0 mtu 1300 - - -if grep overlay /proc/filesystems; then - STORAGE=overlay -else - STORAGE=aufs -fi -docker daemon -s $STORAGE -D -H $DOCKER_HOST >/tmp/docker.log 2>&1 & -PID=$! -trap cleanup EXIT - -sleep 1 - -IDS=$(docker ps -qa) -if [ -n "$IDS" ]; then - docker kill $(docker ps -qa) || true - docker rm -fv $(docker ps -qa) || true -fi - -export ARCH=amd64 K8S_VERSION=v1.2.4 -docker run -d \ - --volume=/:/rootfs:ro \ - --volume=/sys:/sys:rw \ - --volume=/var/lib/docker/:/var/lib/docker:rw \ - --volume=/var/lib/kubelet/:/var/lib/kubelet:rw \ - --volume=/var/run:/var/run:rw \ - --volume=/var/run/dind.sock:/var/run/docker.sock:rw \ - --net=host \ - --pid=host \ - --privileged \ - gcr.io/google_containers/hyperkube-${ARCH}:${K8S_VERSION} \ - /hyperkube kubelet \ - --hostname-override=127.0.0.1 \ - --api-servers=http://localhost:8080 \ - --config=/etc/kubernetes/manifests \ - --cluster-dns=10.0.0.10 \ - --cluster-domain=cluster.local \ - --allow-privileged --v=2 -docker ps -a - -echo "Waiting for kubernetes" -until $(curl --output /dev/null --silent --fail http://localhost:8080/api/v1/services); do - printf '.' - sleep 5 -done - -mkdir -p /etc/kubernetes/ssl -cat > /etc/kubernetes/ssl/kubeconfig << EOF -apiVersion: v1 -kind: Config -clusters: -- cluster: - api-version: v1 - insecure-skip-tls-verify: true - server: "http://localhost:8080" - name: "Default" -contexts: -- context: - cluster: "Default" - user: "Default" - name: "Default" -current-context: "Default" -users: -- name: "Default" - user: - token: "test" -EOF - PACKAGES=". $(find -name '*.go' | xargs -I{} dirname {} | cut -f2 -d/ | sort -u | grep -Ev '(^\.$|.git|.trash-cache|vendor|bin)' | sed -e 's!^!./!' -e 's!$!/...!')" [ "${ARCH}" == "amd64" ] && RACE=-race