From 565868201c5f39b79cf929b361e88100877e8075 Mon Sep 17 00:00:00 2001 From: pashavictorovich Date: Mon, 21 Feb 2022 15:22:14 +0200 Subject: [PATCH 1/2] change docker version --- incubating/github-release/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/incubating/github-release/Dockerfile b/incubating/github-release/Dockerfile index ed818234a..3b03f3b52 100644 --- a/incubating/github-release/Dockerfile +++ b/incubating/github-release/Dockerfile @@ -1,16 +1,16 @@ -FROM node:13.0-alpine +FROM node:12.0-alpine ARG CF_CLI_VERSION=v0.35.0 RUN apk add -U --no-cache openssl bash wget jq libgcc libstdc++ RUN wget https://github.com/codefresh-io/cli/releases/download/v0.35.0/codefresh-${CF_CLI_VERSION}-alpine-x64.tar.gz -O - \ - | tar -xzf - -C /usr/local/bin + | tar -xzf - -C /usr/local/bin WORKDIR /plugin COPY github-release-cli/package* ./ -RUN npm install +RUN npm install COPY github-release-cli/ ./ RUN npm run build && npm install -g @@ -19,4 +19,4 @@ COPY run.sh run.sh SHELL ["/bin/bash"] -CMD /plugin/run.sh \ No newline at end of file +CMD /plugin/run.sh From 6c7cc163d2624564df411461809bcf102ecc7819 Mon Sep 17 00:00:00 2001 From: pashavictorovich Date: Fri, 22 Jul 2022 13:20:48 +0300 Subject: [PATCH 2/2] basic auth as primary creds --- graduated/argocd-sync/step.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/graduated/argocd-sync/step.yaml b/graduated/argocd-sync/step.yaml index 6bb562521..d86693b9e 100644 --- a/graduated/argocd-sync/step.yaml +++ b/graduated/argocd-sync/step.yaml @@ -2,7 +2,7 @@ version: '1.0' kind: step-type metadata: name: argocd-sync - version: 1.16.2 + version: 1.16.3 isPublic: true description: This pipeline plugin trigger a sync for ArgoCD app sources: @@ -122,20 +122,25 @@ spec: "type": "boolean", "description": "Skip wait rollout", "default": false + }, + "basic_auth": { + "type": "boolean", + "description": "Use ArgoCD username/password as primary credentials", + "default": false } } } steps: runArgoCd: title: "Run ArgoCD" - image: "codefresh/cf-argo-plugin:0.2.3" + image: "codefresh/cf-argo-plugin:0.2.4" commands: - >- cf-argo-plugin sync "${{app_name}}" --cf-host=$CF_URL --cf-token=$CF_API_KEY --cf-integration="${{context}}" --argo-host=${{host}} --argo-username=${{username}} --argo-password="${{password}}" --sync=${{sync}} --prune=${{prune}} --wait-healthy=${{wait_healthy}} --wait-suspend=${{wait_for_suspend}} --debug=${{debug}} - --revision="${{revision}}" --wait-additional-flags="${{additional_flags_for_wait_cmd}}" --skip=${{skip_wait_rollout}} + --revision="${{revision}}" --wait-additional-flags="${{additional_flags_for_wait_cmd}}" --skip=${{skip_wait_rollout}} --basic-auth=${{basic_auth}} --out-commands-file /codefresh/volume/${CF_BLOCK_NAME}-argo-executor --out-export-file /codefresh/volume/${CF_BLOCK_NAME}-argo-export_url - chmod +x /codefresh/volume/${CF_BLOCK_NAME}-argo-executor - chmod +x /codefresh/volume/${CF_BLOCK_NAME}-argo-export_url @@ -144,11 +149,11 @@ spec: - echo ARGOCD_OPTS=$ARGOCD_OPTS >> /meta/env_vars_to_export executeArgoCd: title: "ExecuteArgoCd" - image: "codefresh/cf-argo-plugin:0.2.3" + image: "codefresh/cf-argo-plugin:0.2.4" commands: - /codefresh/volume/${CF_BLOCK_NAME}-argo-executor rollback: title: "Rollback" - image: "codefresh/cf-argo-plugin:0.2.3" + image: "codefresh/cf-argo-plugin:0.2.4" commands: - cf-argo-plugin rollback ${{app_name}} --code=$ARGO_SYNC_ERROR --cf-host=$CF_URL --cf-token=$CF_API_KEY --cf-integration="${{context}}" --needRollback=${{rollback}}