From 54d7e73729d3d8094402da053874c3ae65a0907b Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Thu, 28 Jan 2021 18:38:56 -0500 Subject: [PATCH 1/4] feat: migrate from circle-ci to github-actions Signed-off-by: Josh Soref --- .circleci/config.yml | 33 ++++------------------- .github/workflows/build-chart.yml | 44 +++++++++++++++++++++++++++++++ scripts/publish.sh | 12 ++++----- 3 files changed, 55 insertions(+), 34 deletions(-) create mode 100644 .github/workflows/build-chart.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 6c3306ecd..38b05424b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,40 +2,17 @@ version: 2.1 jobs: lint: docker: - - image: quay.io/helmpack/chart-testing:v3.3.1 + - image: quay.io/prometheus/busybox steps: - - checkout - - run: helm repo add stable https://charts.helm.sh/stable - - run: ct lint --config .circleci/chart-testing.yaml --lint-conf .circleci/lintconf.yaml - # Technically this only needs to be run on master, but it's good to have it run on every PR - # so that it is regularly tested. + - run: "true" publish: docker: - # We just need an image with `helm` on it. Handily we know of one already. - - image: quay.io/helmpack/chart-testing:v3.3.1 + - image: quay.io/prometheus/busybox steps: - # install the additional keys needed to push to GitHub. Alex Collins owns these keys. - - add_ssh_keys - - run: git config --global user.email "nobody@circleci.com" - - run: git config --global user.name "Circle CI Build" - - checkout - - run: helm repo add stable https://charts.helm.sh/stable - - run: helm repo add minio https://helm.min.io/ - - run: helm repo add dandydeveloper https://dandydeveloper.github.io/charts/ - # Only actually publish charts on master. - - run: | - set -x - if [ "$CIRCLE_BRANCH" = "master" ]; then - export GIT_PUSH=true - else - export GIT_PUSH=false - fi - sh ./scripts/publish.sh + - run: "true" workflows: version: 2 workflow: jobs: - lint - - publish: - requires: - - lint + - publish diff --git a/.github/workflows/build-chart.yml b/.github/workflows/build-chart.yml new file mode 100644 index 000000000..8b44c558f --- /dev/null +++ b/.github/workflows/build-chart.yml @@ -0,0 +1,44 @@ +name: Helm +on: + push: + pull_request: +jobs: + lint: + runs-on: ubuntu-latest + container: quay.io/helmpack/chart-testing:v3.3.1 + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: "0" + - run: helm repo add stable https://charts.helm.sh/stable + - run: ct lint --config .circleci/chart-testing.yaml --lint-conf .circleci/lintconf.yaml + # Technically this only needs to be run on master, but it's good to have it run on every PR + # so that it is regularly tested. + publish: + needs: lint + runs-on: ubuntu-latest + # We just need an image with `helm` on it. Handily we know of one already. + container: quay.io/helmpack/chart-testing:v3.3.1 + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: "0" + - uses: actions/checkout@v2 + with: + ref: gh-pages + path: output + # Only actually publish charts on master. + - name: Publish + run: | + set -x + git config --global user.email "$GITHUB_ACTOR@users.noreply.github.com" + git config --global user.name "$GITHUB_ACTOR" + helm repo add stable https://charts.helm.sh/stable + helm repo add minio https://helm.min.io/ + helm repo add dandydeveloper https://dandydeveloper.github.io/charts/ + if [ "${GITHUB_REF#refs/heads/}" = "master" ]; then + export GIT_PUSH=true + else + export GIT_PUSH=false + fi + sh ./scripts/publish.sh diff --git a/scripts/publish.sh b/scripts/publish.sh index 025ba5d92..b9758ddb1 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -4,8 +4,6 @@ set -eux SRCROOT="$(cd "$(dirname "$0")/.." && pwd)" GIT_PUSH=${GIT_PUSH:-false} -rm -rf $SRCROOT/output && git clone -b gh-pages git@github.com:argoproj/argo-helm.git $SRCROOT/output - helm repo add argoproj https://argoproj.github.io/argo-helm for dir in $(find $SRCROOT/charts -mindepth 1 -maxdepth 1 -type d); @@ -31,12 +29,14 @@ do helm --debug package $dir done -cp $SRCROOT/*.tgz output/ -cd $SRCROOT/output && helm repo index . +cp $SRCROOT/*.tgz $SRCROOT/output/ +cd $SRCROOT/output +helm repo index . -cd $SRCROOT/output && git status +git status +git add . && git commit -m "Publish charts" if [ "$GIT_PUSH" == "true" ] then - cd $SRCROOT/output && git add . && git commit -m "Publish charts" && git push git@github.com:argoproj/argo-helm.git gh-pages + git push origin gh-pages fi From ac85c8b78403b5a1becdfebf4ef1b7a0686893c9 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Thu, 28 Jan 2021 19:24:36 -0500 Subject: [PATCH 2/4] fix: deprecated apiextensions.k8s.io/v1beta1 CustomResourceDefinition Signed-off-by: Josh Soref --- charts/argo-events/crds/eventbus-crd.yml | 2 +- charts/argo-events/crds/eventsource-crd.yml | 2 +- charts/argo-events/crds/sensor-crd.yml | 2 +- charts/argo-events/templates/eventbus-crd.yaml | 2 +- charts/argo-events/templates/eventsource-crd.yaml | 2 +- charts/argo-events/templates/sensor-crd.yaml | 2 +- charts/argo-events/values.yaml | 2 +- charts/argo/crds/cluster-workflow-template-crd.yaml | 2 +- charts/argo/crds/cron-workflow-crd.yaml | 2 +- charts/argo/crds/workflow-crd.yaml | 2 +- charts/argo/crds/workflow-eventbinding-crd.yaml | 2 +- charts/argo/crds/workflow-template-crd.yaml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/charts/argo-events/crds/eventbus-crd.yml b/charts/argo-events/crds/eventbus-crd.yml index 340d49893..6b9d3d989 100644 --- a/charts/argo-events/crds/eventbus-crd.yml +++ b/charts/argo-events/crds/eventbus-crd.yml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: eventbus.argoproj.io diff --git a/charts/argo-events/crds/eventsource-crd.yml b/charts/argo-events/crds/eventsource-crd.yml index 2ed64f2e6..72bb00271 100644 --- a/charts/argo-events/crds/eventsource-crd.yml +++ b/charts/argo-events/crds/eventsource-crd.yml @@ -1,5 +1,5 @@ --- -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: eventsources.argoproj.io diff --git a/charts/argo-events/crds/sensor-crd.yml b/charts/argo-events/crds/sensor-crd.yml index b38207f74..fe6a7fc59 100644 --- a/charts/argo-events/crds/sensor-crd.yml +++ b/charts/argo-events/crds/sensor-crd.yml @@ -1,5 +1,5 @@ --- -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: sensors.argoproj.io diff --git a/charts/argo-events/templates/eventbus-crd.yaml b/charts/argo-events/templates/eventbus-crd.yaml index 175e2e604..c5661e6b8 100644 --- a/charts/argo-events/templates/eventbus-crd.yaml +++ b/charts/argo-events/templates/eventbus-crd.yaml @@ -1,5 +1,5 @@ {{- if .Values.installCRD }} -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: eventbus.argoproj.io diff --git a/charts/argo-events/templates/eventsource-crd.yaml b/charts/argo-events/templates/eventsource-crd.yaml index e791608b2..fd8a009f8 100644 --- a/charts/argo-events/templates/eventsource-crd.yaml +++ b/charts/argo-events/templates/eventsource-crd.yaml @@ -1,5 +1,5 @@ {{- if .Values.installCRD }} -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: eventsources.argoproj.io diff --git a/charts/argo-events/templates/sensor-crd.yaml b/charts/argo-events/templates/sensor-crd.yaml index cf3793c48..71b33893a 100644 --- a/charts/argo-events/templates/sensor-crd.yaml +++ b/charts/argo-events/templates/sensor-crd.yaml @@ -1,6 +1,6 @@ {{- if .Values.installCRD }} # Define a "sensor" custom resource definition -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: sensors.argoproj.io diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml index 1da1335f4..bb45910ef 100644 --- a/charts/argo-events/values.yaml +++ b/charts/argo-events/values.yaml @@ -21,7 +21,7 @@ additionalSaNamespaces: [] additionalServiceAccountRules: - apiGroups: - apiextensions.k8s.io - - apiextensions.k8s.io/v1beta1 + - apiextensions.k8s.io/v1 verbs: - create - delete diff --git a/charts/argo/crds/cluster-workflow-template-crd.yaml b/charts/argo/crds/cluster-workflow-template-crd.yaml index a189f17c3..336073d0f 100644 --- a/charts/argo/crds/cluster-workflow-template-crd.yaml +++ b/charts/argo/crds/cluster-workflow-template-crd.yaml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: clusterworkflowtemplates.argoproj.io diff --git a/charts/argo/crds/cron-workflow-crd.yaml b/charts/argo/crds/cron-workflow-crd.yaml index abd50b303..f65bac00e 100644 --- a/charts/argo/crds/cron-workflow-crd.yaml +++ b/charts/argo/crds/cron-workflow-crd.yaml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: cronworkflows.argoproj.io diff --git a/charts/argo/crds/workflow-crd.yaml b/charts/argo/crds/workflow-crd.yaml index 24f6abc27..2a9eae675 100644 --- a/charts/argo/crds/workflow-crd.yaml +++ b/charts/argo/crds/workflow-crd.yaml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: workflows.argoproj.io diff --git a/charts/argo/crds/workflow-eventbinding-crd.yaml b/charts/argo/crds/workflow-eventbinding-crd.yaml index a58de8e76..586c8d076 100644 --- a/charts/argo/crds/workflow-eventbinding-crd.yaml +++ b/charts/argo/crds/workflow-eventbinding-crd.yaml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: workfloweventbindings.argoproj.io diff --git a/charts/argo/crds/workflow-template-crd.yaml b/charts/argo/crds/workflow-template-crd.yaml index 0be134519..34a2e1082 100644 --- a/charts/argo/crds/workflow-template-crd.yaml +++ b/charts/argo/crds/workflow-template-crd.yaml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: workflowtemplates.argoproj.io From 1256783395ddc293f863bc918d4bdd334715abe6 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 27 Jan 2021 21:01:18 -0500 Subject: [PATCH 3/4] feat(argocd): Switch from docker.io to quay.io https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/upgrading/1.8-1.9.md#container-registry-switched-to-quayio-and-sundown-of-docker-hub-repository Signed-off-by: Josh Soref --- charts/argo-cd/values.yaml | 2 +- charts/argo-rollouts/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 25bf3ad7a..c0af74fb7 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -9,7 +9,7 @@ installCRDs: true global: image: - repository: argoproj/argocd + repository: quay.io/argoproj/argocd tag: v1.8.4 imagePullPolicy: IfNotPresent securityContext: {} diff --git a/charts/argo-rollouts/values.yaml b/charts/argo-rollouts/values.yaml index 4e11b693a..3691876f0 100644 --- a/charts/argo-rollouts/values.yaml +++ b/charts/argo-rollouts/values.yaml @@ -12,7 +12,7 @@ controller: tolerations: [] affinity: {} image: - repository: argoproj/argo-rollouts + repository: quay.io/argoproj/argo-rollouts tag: v0.10.2 pullPolicy: IfNotPresent From 890bdc2f1da5f368a0c333cbc08a251eb4360d29 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Thu, 28 Jan 2021 21:59:03 -0500 Subject: [PATCH 4/4] chore: bump Chart versions Signed-off-by: Josh Soref --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-ci/Chart.yaml | 2 +- charts/argo-events/Chart.yaml | 2 +- charts/argo-rollouts/Chart.yaml | 2 +- charts/argo/Chart.yaml | 2 +- charts/argocd-notifications/Chart.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 601494ce5..51daa42b0 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.8.4 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.14.7 +version: 2.14.8 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-ci/Chart.yaml b/charts/argo-ci/Chart.yaml index b658915d7..7f1438d1a 100644 --- a/charts/argo-ci/Chart.yaml +++ b/charts/argo-ci/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for Argo-CI name: argo-ci -version: 0.1.7 +version: 0.1.8 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png appVersion: v1.0.0-alpha2 home: https://github.com/argoproj/argo-helm diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml index 4f5960c45..734c1ead6 100644 --- a/charts/argo-events/Chart.yaml +++ b/charts/argo-events/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart to install Argo-Events in k8s Cluster name: argo-events -version: 1.0.0 +version: 1.0.1 keywords: - argo-events - sensor-controller diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml index e69e101c3..d465cf25f 100644 --- a/charts/argo-rollouts/Chart.yaml +++ b/charts/argo-rollouts/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "0.10.2" description: A Helm chart for Argo Rollouts name: argo-rollouts -version: 0.4.3 +version: 0.4.4 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 2353232fa..0fe8f0386 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.12.5 description: A Helm chart for Argo Workflows name: argo -version: 0.16.2 +version: 0.16.3 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argocd-notifications/Chart.yaml b/charts/argocd-notifications/Chart.yaml index 1aaf9e81c..9aabba9fe 100644 --- a/charts/argocd-notifications/Chart.yaml +++ b/charts/argocd-notifications/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.0.1 description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD. name: argocd-notifications type: application -version: 1.0.14 +version: 1.0.15 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: