Skip to content

Commit

Permalink
maybe :shrug
Browse files Browse the repository at this point in the history
  • Loading branch information
omerlh committed Aug 14, 2019
1 parent b4392d3 commit b8e723d
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ commands:
- docker_api_cache_key-{{ .Revision }}
- run:
name: install
environment:
kubernetesVersion: parameters.kubernetesVersion
command: |
tests/crd-controller/run-tests.sh << parameters.kubernetesVersion >>
no_output_timeout: 3600
Expand Down
17 changes: 17 additions & 0 deletions tests/crd-controller/kind-config-1.15.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
kind: Config
apiVersion: kind.sigs.k8s.io/v1alpha3
nodes:
- role: control-plane
- role: worker
replicas: 3

# this config file contains all config fields with comments
kind: Cluster
apiVersion: kind.sigs.k8s.io/v1alpha3
nodes:
# the control plane node config
- role: control-plane
# the three workers
- role: worker
- role: worker
- role: worker
9 changes: 8 additions & 1 deletion tests/crd-controller/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,14 @@ create_kind_cluster() {

docker cp kubectl e2e:/usr/local/bin/kubectl

kind create cluster --name "$CLUSTER_NAME" --config tests/crd-controller/kind-config.yaml --image "kindest/node:$K8S_VERSION"
if [[ $kubernetesVersion == "v.15.0" ]]
then
kind_config="kind-config-1.15.yaml"
else
kind_config="kind-config.yaml"
fi

kind create cluster --name "$CLUSTER_NAME" --config tests/crd-controller/$kind_config --image "kindest/node:$K8S_VERSION"

kind load image-archive docker-cache-api/crd-controller.tar --name "$CLUSTER_NAME"
docker_exec mkdir -p /root/.kube
Expand Down

0 comments on commit b8e723d

Please sign in to comment.