Skip to content
This repository was archived by the owner on May 16, 2023. It is now read-only.

Commit ee49f80

Browse files
authored
[meta] add helm 3.6.2 support (#1232) (#1344)
* [meta] add helm 3.6.0 support This commit bump the Helm version used in helm-charts tests to 3.6.0. https://github.com/helm/helm/releases/tag/v3.6.0 * [meta] bump to helm 3.6.2 * [meta] add retry to goss test
1 parent 11483fb commit ee49f80

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ exact versions are defined under `KUBERNETES_VERSIONS` in
5252
### Helm Versions
5353

5454
While we are checking backward compatibility, the charts are only tested with
55-
Helm version mentioned in [helm-tester Dockerfile][] (currently 3.5.3).
55+
Helm version mentioned in [helm-tester Dockerfile][] (currently 3.6.2).
5656

5757

5858
## ECK

helpers/examples.mk

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,15 @@ help: ## Display this help
1010

1111
.PHONY: goss
1212
goss: ## Run goss tests
13-
GOSS_CONTAINER=$$(kubectl get --no-headers=true pods -l $(GOSS_SELECTOR) -o custom-columns=:metadata.name --field-selector=status.phase=Running --sort-by=.metadata.creationTimestamp | tail -1 ) && \
14-
echo Testing with pod: $$GOSS_CONTAINER && \
15-
kubectl cp test/$(GOSS_FILE) $$GOSS_CONTAINER:/tmp/$(GOSS_FILE) && \
16-
kubectl exec $$GOSS_CONTAINER -- sh -c "cd /tmp/ && curl -s -L https://github.com/aelsabbahy/goss/releases/download/$(GOSS_VERSION)/goss-linux-amd64 -o goss && chmod +rx ./goss && ./goss --gossfile $(GOSS_FILE) validate --retry-timeout 300s --sleep 5s --color --format documentation"
13+
for i in $$(seq 1 5); do \
14+
if [ -z "$$GOSS_CONTAINER" ]; then \
15+
sleep 5; \
16+
echo "Retrieving pod ($$i/5)"; \
17+
GOSS_CONTAINER=$$(kubectl get --no-headers=true pods -l "$(GOSS_SELECTOR)" -o custom-columns=:metadata.name --field-selector=status.phase=Running --sort-by=.metadata.creationTimestamp | tail -1 ); \
18+
else \
19+
echo "Testing with pod: $$GOSS_CONTAINER" && \
20+
kubectl cp "test/$(GOSS_FILE)" "$$GOSS_CONTAINER:/tmp/$(GOSS_FILE)" && \
21+
kubectl exec "$$GOSS_CONTAINER" -- sh -c "cd /tmp/ && curl -s -L \"https://github.com/aelsabbahy/goss/releases/download/$(GOSS_VERSION)/goss-linux-amd64\" -o goss && chmod +rx ./goss && ./goss --gossfile \"$(GOSS_FILE)\" validate --retry-timeout 300s --sleep 5s --color --format documentation"; \
22+
break; \
23+
fi; \
24+
done

helpers/helm-tester/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM python:3.7
22

3-
ENV HELM_VERSION=3.5.3
3+
ENV HELM_VERSION=3.6.2
44

55
RUN wget --no-verbose https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz && \
66
tar xfv helm-v${HELM_VERSION}-linux-amd64.tar.gz && \

helpers/terraform/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM centos:7
33
ENV VAULT_VERSION 0.9.3
44
ENV TERRAFORM_VERSION=0.11.7
55
ENV KUBECTL_VERSION=1.19.9
6-
ENV HELM_VERSION=3.5.3
6+
ENV HELM_VERSION=3.6.2
77
ENV DOCKER_VERSION=18.09.7
88
ENV JQ_VERSION=1.6
99

0 commit comments

Comments
 (0)