diff options
| author | jannfis <jann@mistrust.net> | 2023-07-09 17:27:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-09 17:27:45 -0400 |
| commit | 8dd44c84a6a3be8ed692ec74adcd56fb18265b1b (patch) | |
| tree | d4c3457c330c18f0fadbfcec53442e2939823011 | |
| parent | 972500fc657f5980915f07317f963b4b091e4ff7 (diff) | |
ci: Fix codegen and update kustomize to post-2.0 (#590)
* ci: Fix codegen
Signed-off-by: jannfis <jann@mistrust.net>
* Fix tar call
Signed-off-by: jannfis <jann@mistrust.net>
---------
Signed-off-by: jannfis <jann@mistrust.net>
| -rw-r--r-- | .github/workflows/ci-tests.yaml | 17 | ||||
| -rwxr-xr-x | hack/generate-manifests.sh | 2 | ||||
| -rw-r--r-- | manifests/base/kustomization.yaml | 2 | ||||
| -rw-r--r-- | manifests/install.yaml | 3 |
4 files changed, 14 insertions, 10 deletions
diff --git a/.github/workflows/ci-tests.yaml b/.github/workflows/ci-tests.yaml index 46abe21..831f2f4 100644 --- a/.github/workflows/ci-tests.yaml +++ b/.github/workflows/ci-tests.yaml @@ -35,12 +35,17 @@ jobs: - name: Install Kustomize v2 run: | set -xo pipefail - KUSTOMIZE_VERSION=2.0.2 - URL="https://github.com/kubernetes-sigs/kustomize/releases/download/v${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64" - BINNAME=kustomize2 - curl -sLf --retry 3 -o /tmp/kustomize2 "$URL" - sudo mv /tmp/kustomize2 /usr/local/bin/kustomize2 - chmod +x /usr/local/bin/kustomize2 + URL="https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.1.0/kustomize_v5.1.0_linux_amd64.tar.gz" + BINNAME=kustomize + curl -sLf --retry 3 -o /tmp/kustomize.tar.gz "$URL" + chksum=$(sha256sum /tmp/kustomize.tar.gz | awk '{ print $1; }') + if test "${chksum}" != "52f4cf1ba34d38fd55a9bef819e329c9a4561f5f57f8f539346038ab5026dda8"; then + echo "Checksum mismatch" >&2 + exit 1 + fi + tar -C /tmp -xvzf /tmp/kustomize.tar.gz + sudo mv /tmp/kustomize /usr/local/bin/kustomize + chmod +x /usr/local/bin/kustomize - name: Run make manifests run: | make manifests diff --git a/hack/generate-manifests.sh b/hack/generate-manifests.sh index 91bec84..575225b 100755 --- a/hack/generate-manifests.sh +++ b/hack/generate-manifests.sh @@ -6,7 +6,7 @@ set -x SRCROOT="$( CDPATH='' cd -- "$(dirname "$0")/.." && pwd -P )" # Make sure that KUSTOMIZE points to a v2 - we need that to support the kubectl # integration. -KUSTOMIZE=${KUSTOMIZE:-kustomize2} +KUSTOMIZE=${KUSTOMIZE:-kustomize} TEMPFILE=$(mktemp /tmp/aic-manifests.XXXXXX) IMAGE_NAMESPACE="${IMAGE_NAMESPACE:-argoprojlabs}" diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml index 406ff0c..e362df0 100644 --- a/manifests/base/kustomization.yaml +++ b/manifests/base/kustomization.yaml @@ -5,7 +5,7 @@ images: - name: quay.io/argoprojlabs/argocd-image-updater newTag: latest -bases: +resources: - ./config - ./deployment - ./rbac diff --git a/manifests/install.yaml b/manifests/install.yaml index 775ae24..640368d 100644 --- a/manifests/install.yaml +++ b/manifests/install.yaml @@ -101,8 +101,7 @@ spec: app.kubernetes.io/name: argocd-image-updater spec: containers: - - command: - - /usr/local/bin/argocd-image-updater + - args: - run env: - name: APPLICATIONS_API |