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

[7.15] [meta] add helm 3.6.2 support (#1232) #1368

Merged
merged 1 commit into from
Sep 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ exact versions are defined under `KUBERNETES_VERSIONS` in
### Helm Versions

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


## ECK
Expand Down
16 changes: 12 additions & 4 deletions helpers/examples.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,15 @@ help: ## Display this help

.PHONY: goss
goss: ## Run goss tests
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 ) && \
echo Testing with pod: $$GOSS_CONTAINER && \
kubectl cp test/$(GOSS_FILE) $$GOSS_CONTAINER:/tmp/$(GOSS_FILE) && \
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"
for i in $$(seq 1 5); do \
if [ -z "$$GOSS_CONTAINER" ]; then \
sleep 5; \
echo "Retrieving pod ($$i/5)"; \
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 ); \
else \
echo "Testing with pod: $$GOSS_CONTAINER" && \
kubectl cp "test/$(GOSS_FILE)" "$$GOSS_CONTAINER:/tmp/$(GOSS_FILE)" && \
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"; \
break; \
fi; \
done
2 changes: 1 addition & 1 deletion helpers/helm-tester/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM python:3.7

ENV HELM_VERSION=3.5.3
ENV HELM_VERSION=3.6.2

RUN wget --no-verbose https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz && \
tar xfv helm-v${HELM_VERSION}-linux-amd64.tar.gz && \
Expand Down
2 changes: 1 addition & 1 deletion helpers/terraform/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM centos:7
ENV VAULT_VERSION 0.9.3
ENV TERRAFORM_VERSION=0.11.7
ENV KUBECTL_VERSION=1.19.9
ENV HELM_VERSION=3.5.3
ENV HELM_VERSION=3.6.2
ENV DOCKER_VERSION=18.09.7
ENV JQ_VERSION=1.6

Expand Down