From 850061c486a2cbf2c421875e8637a7b228ecc4bf Mon Sep 17 00:00:00 2001 From: Vadim Kharin Date: Mon, 12 Dec 2022 17:10:51 +0200 Subject: [PATCH 1/7] Add debian tag --- Dockerfile | 3 +- Dockerfile.helm2 | 5 +-- codefresh-helm3.yml | 97 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 5 deletions(-) create mode 100644 codefresh-helm3.yml diff --git a/Dockerfile b/Dockerfile index 4048139..46d4184 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,8 +54,7 @@ COPY lib/* /opt/lib/ COPY build_entrypoint_script /opt/build_entrypoint_script # Install Python3 -RUN apk add --no-cache python3 \ - && rm -rf /root/.cache +RUN rm -rf /root/.cache ENV HELM_VERSION ${HELM_VERSION} diff --git a/Dockerfile.helm2 b/Dockerfile.helm2 index e9bf282..5e8752c 100644 --- a/Dockerfile.helm2 +++ b/Dockerfile.helm2 @@ -36,9 +36,8 @@ COPY lib/* /opt/lib/ COPY build_entrypoint_script /opt/build_entrypoint_script # Install Python3 -RUN apk add --no-cache python3 \ - && rm -rf /root/.cache +RUN rm -rf /root/.cache ENV HELM_VERSION ${HELM_VERSION} -ENTRYPOINT ["/opt/bin/release_chart"] \ No newline at end of file +ENTRYPOINT ["/opt/bin/release_chart"] diff --git a/codefresh-helm3.yml b/codefresh-helm3.yml new file mode 100644 index 0000000..59b3253 --- /dev/null +++ b/codefresh-helm3.yml @@ -0,0 +1,97 @@ +version: '1.0' + +steps: + define_the_versions_list: + image: alpine + commands: + - |- + cat < helmVersionsList + 3.0.0 + 3.0.1 + 3.0.2 + 3.0.3 + 3.1.0 + 3.1.1 + 3.1.2 + 3.1.3 + 3.2.0 + 3.2.1 + 3.2.2 + 3.2.3 + 3.2.4 + 3.3.1 + 3.4.1 + 3.5.2 + 3.6.0 + 3.6.1 + 3.6.2 + 3.7.0 + 3.7.1 + 3.7.2 + 3.8.0 + when: + condition: + all: + notRecursivelyInvoked: 'includes("${{HELM_VERSION}}", "${{") == true' + + run-cli-loop: + image: codefresh/cli + commands: + - for VAR in $(cat helmVersionsList); do codefresh wait $(codefresh run ${{CF_PIPELINE_NAME}} -d --branch ${{CF_BRANCH}} --variable HELM_VERSION=${VAR} --trigger ${{CF_PIPELINE_TRIGGER_ID}} --context github && sleep 10) & done + - for j in $(jobs -p); do wait $j || (echo "Failed to build one of the images" && ! break); done + when: + condition: + all: + notRecursivelyInvoked: 'includes("${{HELM_VERSION}}", "${{") == true' + + clone: + type: git-clone + arguments: + repo: '${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}' + git: github + revision: '${{CF_REVISION}}' + when: + condition: + all: + recursivelyInvoked: 'includes("${{HELM_VERSION}}", "${{") == false' + debug: + type: freestyle + image: alpine + commands: + - echo $HELM_VERSION + + build_image: + type: build + registry: dockerhub + working_directory: '${{clone}}' + image_name: '${{STEP_IMAGE}}' + tag: '${{HELM_VERSION}}-${{CF_SHORT_REVISION}}-debian' + build_arguments: + - 'HELM_VERSION=${{HELM_VERSION}}' + - 'S3_PLUGIN_VERSION=0.9.2' + - 'GCS_PLUGIN_VERSION=0.3.0' + - 'PUSH_PLUGIN_VERSION=0.8.1' + when: + condition: + all: + recursivelyInvoked: 'includes("${{HELM_VERSION}}", "${{") == false' + + push: + type: push + tag: ${{HELM_VERSION}}-debian + candidate: ${{build_image}} + when: + condition: + all: + recursivelyInvoked: 'includes("${{HELM_VERSION}}", "${{") == false' + masterBranch: 'match("${{CF_BRANCH}}", "^master", true) == true' + scale: + PushToDockerHub: + registry: dockerhub + PushToQuay: + image_name: "codefreshplugins/cfstep-helm" + tag: ${{HELM_VERSION}}-debian + candidate: ${{build_image}} + registry: quay + + From de25d20b6d3fd7f6e19f7295110f9375442c15fc Mon Sep 17 00:00:00 2001 From: Vadim Kharin Date: Tue, 13 Dec 2022 13:45:58 +0200 Subject: [PATCH 2/7] add debain to image name --- codefresh-helm3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codefresh-helm3.yml b/codefresh-helm3.yml index 239bb57..6f5a0c6 100644 --- a/codefresh-helm3.yml +++ b/codefresh-helm3.yml @@ -64,7 +64,7 @@ steps: type: build registry: dockerhub working_directory: '${{clone}}' - image_name: '${{STEP_IMAGE}}' + image_name: '${{STEP_IMAGE}}-debian' tag: '${{HELM_VERSION}}-${{CF_SHORT_REVISION}}' build_arguments: - 'HELM_VERSION=${{HELM_VERSION}}' From c3f4d12c608b71af11a55a11ff0bf2483a61c75a Mon Sep 17 00:00:00 2001 From: Vadim Kharin Date: Tue, 13 Dec 2022 13:50:59 +0200 Subject: [PATCH 3/7] Add kube-helm-debian as base imagev for cfstep-helm-debian --- Dockerfile | 2 +- Dockerfile.helm2 | 2 +- codefresh-helm3.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 46d4184..98ae323 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,7 @@ RUN apt-get update \ && apt-get install -y python3-venv \ && make acceptance -FROM codefresh/kube-helm:${HELM_VERSION} +FROM codefresh/kube-helm-debian:${HELM_VERSION} ENV XDG_CACHE_HOME=/root/.helm ENV XDG_DATA_HOME=/root/.helm diff --git a/Dockerfile.helm2 b/Dockerfile.helm2 index 5e8752c..c4e9e25 100644 --- a/Dockerfile.helm2 +++ b/Dockerfile.helm2 @@ -27,7 +27,7 @@ RUN apt-get update \ && apt-get install -y python3-venv \ && make acceptance -FROM codefresh/kube-helm:${HELM_VERSION} +FROM codefresh/kube-helm-debian:${HELM_VERSION} ARG HELM_VERSION COPY --from=setup /temp /root/.helm/* /root/.helm/ COPY bin/* /opt/bin/ diff --git a/codefresh-helm3.yml b/codefresh-helm3.yml index 6f5a0c6..cabbaaf 100644 --- a/codefresh-helm3.yml +++ b/codefresh-helm3.yml @@ -84,7 +84,7 @@ steps: condition: all: recursivelyInvoked: 'includes("${{HELM_VERSION}}", "${{") == false' - masterBranch: 'match("${{CF_BRANCH}}", "^master", true) == true' + masterBranch: 'match("${{CF_BRANCH}}", "^debian", true) == true' scale: PushToDockerHub: registry: dockerhub From ffdf16df75b20d0ac40a2a9edcfddb1c1e315b7c Mon Sep 17 00:00:00 2001 From: Vadim Kharin Date: Tue, 13 Dec 2022 16:44:30 +0200 Subject: [PATCH 4/7] fix cfstep-helm ci --- codefresh.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codefresh.yml b/codefresh.yml index 90804b3..53eedda 100644 --- a/codefresh.yml +++ b/codefresh.yml @@ -59,7 +59,7 @@ steps: build_image: type: build working_directory: '${{clone}}' - image_name: '${{STEP_IMAGE}}' + image_name: '${{STEP_IMAGE}}-debian' tag: '${{HELM_VERSION}}-${{CF_SHORT_REVISION}}' build_arguments: - 'HELM_VERSION=${{HELM_VERSION}}' @@ -91,4 +91,4 @@ steps: condition: all: latestHelmVersion: "'${{HELM_VERSION}}' == '${{LATEST_VERSION}}'" - masterBranch: "'${{CF_BRANCH}}' == 'master'" \ No newline at end of file + masterBranch: "'${{CF_BRANCH}}' == 'debian'" From 1cbe3765e47fbe1b125fb1fbaae3bc3c76052e92 Mon Sep 17 00:00:00 2001 From: Vadim Kharin Date: Tue, 13 Dec 2022 17:06:42 +0200 Subject: [PATCH 5/7] fix cfstep-helm-debian ci --- codefresh-helm3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codefresh-helm3.yml b/codefresh-helm3.yml index cabbaaf..be7ab19 100644 --- a/codefresh-helm3.yml +++ b/codefresh-helm3.yml @@ -89,7 +89,7 @@ steps: PushToDockerHub: registry: dockerhub PushToQuay: - image_name: "codefreshplugins/cfstep-helm" + image_name: "codefreshplugins/cfstep-helm-debian" tag: ${{HELM_VERSION}} candidate: ${{build_image}} registry: quay From 4f4c6cc4e48d0a32c23870096df06c7c1e3221df Mon Sep 17 00:00:00 2001 From: Vadim Kharin Date: Wed, 1 Nov 2023 17:11:48 +0200 Subject: [PATCH 6/7] CR-21055 Add new helm versions to helmVersionsList --- Makefile | 2 +- codefresh-helm3.yml | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index af80fbc..2775e15 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -ACCEPTANCE_PY_REQUIRES = robotframework==3.0.4 +ACCEPTANCE_PY_REQUIRES = robotframework==6.0.2 .PHONY: acceptance acceptance: diff --git a/codefresh-helm3.yml b/codefresh-helm3.yml index be7ab19..83bbe25 100644 --- a/codefresh-helm3.yml +++ b/codefresh-helm3.yml @@ -29,6 +29,25 @@ steps: 3.7.1 3.7.2 3.8.0 + 3.9.0 + 3.9.1 + 3.9.2 + 3.9.3 + 3.9.4 + 3.10.0 + 3.10.1 + 3.10.2 + 3.10.3 + 3.11.0 + 3.11.1 + 3.11.2 + 3.11.3 + 3.12.0 + 3.12.1 + 3.12.2 + 3.12.3 + 3.13.0 + 3.13.1 when: condition: all: From b9b50823ac36bd79e215156e65f56bdeaf4b65fe Mon Sep 17 00:00:00 2001 From: Vasil Sudakou Date: Thu, 20 Mar 2025 18:20:01 +0300 Subject: [PATCH 7/7] feat: use the latest versions of helm in build list --- codefresh-helm3.yml | 92 ++++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 42 deletions(-) diff --git a/codefresh-helm3.yml b/codefresh-helm3.yml index 83bbe25..05b0b8a 100644 --- a/codefresh-helm3.yml +++ b/codefresh-helm3.yml @@ -4,50 +4,58 @@ steps: define_the_versions_list: image: alpine commands: + # already built versions: + # 3.0.0 + # 3.0.1 + # 3.0.2 + # 3.0.3 + # 3.1.0 + # 3.1.1 + # 3.1.2 + # 3.1.3 + # 3.2.0 + # 3.2.1 + # 3.2.2 + # 3.2.3 + # 3.2.4 + # 3.3.1 + # 3.4.1 + # 3.5.2 + # 3.6.0 + # 3.6.1 + # 3.6.2 + # 3.7.0 + # 3.7.1 + # 3.7.2 + # 3.8.0 + # 3.9.0 + # 3.9.1 + # 3.9.2 + # 3.9.3 + # 3.9.4 + # 3.10.0 + # 3.10.1 + # 3.10.2 + # 3.10.3 + # 3.11.0 + # 3.11.1 + # 3.11.2 + # 3.11.3 + # 3.12.0 + # 3.12.1 + # 3.12.2 + # 3.12.3 + # 3.13.0 + # 3.13.1 - |- cat < helmVersionsList - 3.0.0 - 3.0.1 - 3.0.2 - 3.0.3 - 3.1.0 - 3.1.1 - 3.1.2 - 3.1.3 - 3.2.0 - 3.2.1 - 3.2.2 - 3.2.3 - 3.2.4 - 3.3.1 - 3.4.1 - 3.5.2 - 3.6.0 - 3.6.1 - 3.6.2 - 3.7.0 - 3.7.1 - 3.7.2 - 3.8.0 - 3.9.0 - 3.9.1 - 3.9.2 - 3.9.3 - 3.9.4 - 3.10.0 - 3.10.1 - 3.10.2 - 3.10.3 - 3.11.0 - 3.11.1 - 3.11.2 - 3.11.3 - 3.12.0 - 3.12.1 - 3.12.2 - 3.12.3 - 3.13.0 - 3.13.1 + 3.13.2 + 3.13.3 + 3.14.0 + 3.14.1 + 3.14.2 + 3.14.3 + 3.14.4 when: condition: all: