Skip to content

Commit

Permalink
installing Kustomize in e2d if missing
Browse files Browse the repository at this point in the history
  • Loading branch information
universam1 committed Aug 14, 2020
1 parent 42bb59a commit e19fbd1
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:
- run: test/e2e-kind.sh
- run: test/e2e-skipper.sh
- run: test/e2e-skipper-tests.sh
- run: test/e2e-nginx-cleanup.sh
- run: test/e2e-skipper-cleanup.sh

push-helm-charts:
docker:
Expand Down
6 changes: 3 additions & 3 deletions kustomize/skipper/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ kind: Kustomization
resources:
- ../base/prometheus/
- ../base/flagger/
- https://raw.githubusercontent.com/zalando/skipper/master/docs/kubernetes/deploy/deployment/rbac.yaml
- https://raw.githubusercontent.com/zalando/skipper/master/docs/kubernetes/deploy/deployment/service.yaml
- https://raw.githubusercontent.com/zalando/skipper/master/docs/kubernetes/deploy/deployment/deployment.yaml
- https://raw.githubusercontent.com/zalando/skipper/v0.11.140/docs/kubernetes/deploy/deployment/rbac.yaml
- https://raw.githubusercontent.com/zalando/skipper/v0.11.140/docs/kubernetes/deploy/deployment/service.yaml
- https://raw.githubusercontent.com/zalando/skipper/v0.11.140/docs/kubernetes/deploy/deployment/deployment.yaml
- namespace.yaml
patchesStrategicMerge:
- patch.yaml
Expand Down
9 changes: 9 additions & 0 deletions test/e2e-skipper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ echo '>>> Installing Skipper Ingress, Flagger and Prometheus'
# https://github.com/kubernetes-sigs/kustomize/issues/2390
# Skipper will throw an Prometheus warning which can be ignored:
# https://github.com/weaveworks/flagger/issues/664

# installing kustomize if not installed
if ! command -v kustomize &> /dev/null; then
echo "kustomize not found, installing"
GO111MODULE=on go get sigs.k8s.io/kustomize/kustomize/v3
which kustomize
kustomize version
fi

kustomize build ${REPO_ROOT}/kustomize/skipper | kubectl apply -f -

kubectl rollout status deployment/skipper-ingress -n kube-system
Expand Down
15 changes: 0 additions & 15 deletions test/local/skipper.sh

This file was deleted.

0 comments on commit e19fbd1

Please sign in to comment.