Skip to content

Commit

Permalink
Revert "Add Dispatchfile (#430)"
Browse files Browse the repository at this point in the history
This reverts commit 576d61b.
  • Loading branch information
joejulian committed Feb 26, 2020
1 parent 342a120 commit b5944c2
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 102 deletions.
71 changes: 0 additions & 71 deletions Dispatchfile

This file was deleted.

13 changes: 1 addition & 12 deletions test/e2e-kind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
set -o errexit
set -o nounset
set -o pipefail
set -x

readonly KIND_VERSION=v0.6.1
readonly CLUSTER_NAME=chart-testing
Expand Down Expand Up @@ -46,18 +45,8 @@ create_kind_cluster() {
"https://github.com/kubernetes-sigs/kind/releases/download/$KIND_VERSION/kind-$(uname)-amd64"
chmod +x "${tmp}/kind"

curl -sSLo "${tmp}/entrypoint.sh" "https://raw.githubusercontent.com/mesosphere/dispatch/f74d477930e8cf05b84eb8a0f98c3866b66e1125/docker/kind/entrypoint.sh?token=ACIQJHWXERD34NEOUHGOWIS6KWQO6"
chmod +x "${tmp}/entrypoint.sh"

cat << EOF > tmp_dockerfile
FROM kindest/node:$K8S_VERSION
ADD ./entrypoint.sh /usr/local/bin/entrypoint
EOF

docker build -t tmp-dispatch-kind:latest -f tmp_dockerfile "${tmp}"

"${tmp}/kind" create cluster --name "$CLUSTER_NAME" \
--config test/kind-config.yaml --image "tmp-dispatch-kind:latest" \
--config test/kind-config.yaml --image "kindest/node:$K8S_VERSION" \
--wait 60s

docker_exec mkdir -p /root/.kube
Expand Down
19 changes: 0 additions & 19 deletions test/kind-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,3 @@ apiVersion: kind.x-k8s.io/v1alpha4
nodes:
- role: control-plane
- role: worker
# These kubeadm config patches are required for running Kind inside a docker container.
# We started running Kind in a kubernetes pod as part of the CI transition to Dispatch.
kubeadmConfigPatches:
- |
apiVersion: kubeadm.k8s.io/v1beta2
kind: JoinConfiguration
metadata:
name: config
nodeRegistration:
kubeletExtraArgs:
cgroup-root: "/kubelet"
- |
apiVersion: kubeadm.k8s.io/v1beta2
kind: InitConfiguration
metadata:
name: config
nodeRegistration:
kubeletExtraArgs:
cgroup-root: "/kubelet"

0 comments on commit b5944c2

Please sign in to comment.