diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/deployment-it.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/deployment-it.yaml deleted file mode 100644 index dd2ffc9c..00000000 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/deployment-it.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - creationTimestamp: null - labels: - app: k8s-demo-app - name: k8s-demo-app -spec: - replicas: 1 - selector: - matchLabels: - app: k8s-demo-app - strategy: {} - template: - metadata: - creationTimestamp: null - labels: - app: k8s-demo-app - spec: - containers: - - image: docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher-it:3.0.0-SNAPSHOT - name: spring-cloud-kubernetes-configuration-watcher-it - resources: {} - env: - - name: SPRING_RABBITMQ_HOST - value: rabbitmq-service -status: {} diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/kind-config.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/kind-config.yaml deleted file mode 100644 index 90afa077..00000000 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/kind-config.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# this config file contains all config fields with comments -# NOTE: this is not a particularly useful config file -kind: Cluster -apiVersion: kind.x-k8s.io/v1alpha4 -containerdConfigPatches: -- |- - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."localhost:5000"] - endpoint = ["http://kind-registry:5000"] - -# 1 control plane node and 3 workers -nodes: - - role: control-plane - image: kindest/node:v1.14.10@sha256:6cd43ff41ae9f02bb46c8f455d5323819aec858b99534a290517ebc181b443c6 - kubeadmConfigPatches: - - | - kind: InitConfiguration - nodeRegistration: - kubeletExtraArgs: - node-labels: "ingress-ready=true" - extraPortMappings: - - containerPort: 80 - hostPort: 80 - protocol: TCP - - containerPort: 443 - hostPort: 443 - protocol: TCP - - role: worker - image: kindest/node:v1.14.10@sha256:6cd43ff41ae9f02bb46c8f455d5323819aec858b99534a290517ebc181b443c6 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/permissions.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/permissions.yaml deleted file mode 100644 index f5183e04..00000000 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/permissions.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -apiVersion: v1 -kind: List -items: - - apiVersion: v1 - kind: ServiceAccount - metadata: - labels: - app: spring-cloud-kubernetes-configuration-watcher - name: spring-cloud-kubernetes-serviceaccount - - apiVersion: rbac.authorization.k8s.io/v1 - kind: RoleBinding - metadata: - labels: - app: spring-cloud-kubernetes-configuration-watcher - name: spring-cloud-kubernetes-serviceaccount:view - roleRef: - kind: Role - apiGroup: rbac.authorization.k8s.io - name: namespace-reader - subjects: - - kind: ServiceAccount - name: spring-cloud-kubernetes-serviceaccount - - apiVersion: rbac.authorization.k8s.io/v1 - kind: Role - metadata: - namespace: default - name: namespace-reader - rules: - - apiGroups: ["", "extensions", "apps"] - resources: ["configmaps", "pods", "services", "endpoints", "secrets"] - verbs: ["get", "list", "watch"] diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/run.sh b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/run.sh deleted file mode 100755 index 5cc30242..00000000 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/run.sh +++ /dev/null @@ -1,144 +0,0 @@ -#!/bin/bash - -# standard bash error handling -set -o errexit; -set -o pipefail; -set -o nounset; -# debug commands -set -x; - -# working dir to install binaries etc, cleaned up on exit -BIN_DIR="$(mktemp -d)" -# kind binary will be here -KIND="${BIN_DIR}/kind" - -ISTIOCTL="${BIN_DIR}/istio-1.6.2/bin/istioctl" - -CURRENT_DIR="$(pwd)" - -# cleanup on exit (useful for running locally) -cleanup() { - "${KIND}" delete cluster || true - rm -rf "${BIN_DIR}" - - docker kill kind-registry - docker rm kind-registry - docker network rm kind -} -trap cleanup EXIT - -# util to install the latest kind version into ${BIN_DIR} -install_latest_kind() { - # clone kind into a tempdir within BIN_DIR - local tmp_dir - tmp_dir="$(TMPDIR="${BIN_DIR}" mktemp -d "${BIN_DIR}/kind-source.XXXXX")" - cd "${tmp_dir}" || exit - git clone https://github.com/kubernetes-sigs/kind && cd ./kind - make install INSTALL_DIR="${BIN_DIR}" -} - -# util to install a released kind version into ${BIN_DIR} -install_kind_release() { - VERSION="v0.5.1" - KIND_BINARY_URL="https://github.com/kubernetes-sigs/kind/releases/download/${VERSION}/kind-linux-amd64" - if [[ "$OSTYPE" == "darwin"* ]]; then - KIND_BINARY_URL="https://github.com/kubernetes-sigs/kind/releases/download/${VERSION}/kind-darwin-amd64" - elif [[ "$OSTYPE" == "cygwin" ]]; then - KIND_BINARY_URL="https://github.com/kubernetes-sigs/kind/releases/download/${VERSION}/kind-windows-amd64" - elif [[ "$OSTYPE" == "msys" ]]; then - KIND_BINARY_URL="https://github.com/kubernetes-sigs/kind/releases/download/${VERSION}/kind-windows-amd64" - elif [[ "$OSTYPE" == "win32" ]]; then - KIND_BINARY_URL="https://github.com/kubernetes-sigs/kind/releases/download/${VERSION}/kind-windows-amd64" - else - echo "Uknown OS, using linux binary" - fi - wget -O "${KIND}" "${KIND_BINARY_URL}" - chmod +x "${KIND}" -} - -setup_registry() { -set -o errexit - -# create registry container unless it already exists -reg_name='kind-registry' -reg_port='5000' -running="$(docker inspect -f '{{.State.Running}}' "${reg_name}" 2>/dev/null || true)" -if [ "${running}" != 'true' ]; then - docker run \ - -d --restart=always -p "${reg_port}:5000" --name "${reg_name}" \ - registry:2 -fi - -# create a cluster with the local registry enabled in containerd -cat </dev/null || true)" - if [ "${running}" != 'true' ]; then - docker run \ - -d --restart=always -p "${reg_port}:5000" --name "${reg_name}" \ - registry:2 - fi - - #TODO what happens if cluster is already there???? - "${KIND}" create cluster --config kind-config.yaml --loglevel=debug - - # connect the registry to the cluster network - docker network connect "kind" "${reg_name}" - - # tell https://tilt.dev to use the registry - # https://docs.tilt.dev/choosing_clusters.html#discovering-the-registry - for node in $("${KIND}" get nodes); do - kubectl annotate node "${node}" "kind.x-k8s.io/registry=localhost:${reg_port}"; - done - - # set KUBECONFIG to point to the cluster - kubectl cluster-info --context kind-kind - - #setup nginx ingress -# kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/static/provider/kind/deploy.yaml - kubectl apply -fhttps://raw.githubusercontent.com/kubernetes/ingress-nginx/12150e318b972a03fb49d827e6cabb8ef62247ef/deploy/static/provider/kind/deploy.yaml - kubectl wait --namespace ingress-nginx --for=condition=ready pod --selector=app.kubernetes.io/component=controller --timeout=360s - - # This creates the service account, role, and role binding necessary for Spring Cloud k8s apps - kubectl apply -f ./permissions.yaml - -# cd ${BIN_DIR} -# curl -L https://istio.io/downloadIstio | sh - - #"${ISTIOCTL}" install --set profile=demo - - cd $CURRENT_DIR - - # TODO: invoke your tests here - ../../mvnw clean install -P it - # teardown will happen automatically on exit -} - -main