Skip to content

Commit 6007d7c

Browse files
jannfisjessebye
authored andcommitted
ci: Fix codegen and update kustomize to post-2.0 (argoproj-labs#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> Signed-off-by: Jesse Bye <8467862+jessebye@users.noreply.github.com>
1 parent 31c0152 commit 6007d7c

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

.github/workflows/ci-tests.yaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,17 @@ jobs:
3535
- name: Install Kustomize v2
3636
run: |
3737
set -xo pipefail
38-
KUSTOMIZE_VERSION=2.0.2
39-
URL="https://github.com/kubernetes-sigs/kustomize/releases/download/v${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64"
40-
BINNAME=kustomize2
41-
curl -sLf --retry 3 -o /tmp/kustomize2 "$URL"
42-
sudo mv /tmp/kustomize2 /usr/local/bin/kustomize2
43-
chmod +x /usr/local/bin/kustomize2
38+
URL="https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.1.0/kustomize_v5.1.0_linux_amd64.tar.gz"
39+
BINNAME=kustomize
40+
curl -sLf --retry 3 -o /tmp/kustomize.tar.gz "$URL"
41+
chksum=$(sha256sum /tmp/kustomize.tar.gz | awk '{ print $1; }')
42+
if test "${chksum}" != "52f4cf1ba34d38fd55a9bef819e329c9a4561f5f57f8f539346038ab5026dda8"; then
43+
echo "Checksum mismatch" >&2
44+
exit 1
45+
fi
46+
tar -C /tmp -xvzf /tmp/kustomize.tar.gz
47+
sudo mv /tmp/kustomize /usr/local/bin/kustomize
48+
chmod +x /usr/local/bin/kustomize
4449
- name: Run make manifests
4550
run: |
4651
make manifests

hack/generate-manifests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -x
66
SRCROOT="$( CDPATH='' cd -- "$(dirname "$0")/.." && pwd -P )"
77
# Make sure that KUSTOMIZE points to a v2 - we need that to support the kubectl
88
# integration.
9-
KUSTOMIZE=${KUSTOMIZE:-kustomize2}
9+
KUSTOMIZE=${KUSTOMIZE:-kustomize}
1010
TEMPFILE=$(mktemp /tmp/aic-manifests.XXXXXX)
1111

1212
IMAGE_NAMESPACE="${IMAGE_NAMESPACE:-argoprojlabs}"

manifests/base/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ images:
55
- name: quay.io/argoprojlabs/argocd-image-updater
66
newTag: latest
77

8-
bases:
8+
resources:
99
- ./config
1010
- ./deployment
1111
- ./rbac

manifests/install.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ spec:
101101
app.kubernetes.io/name: argocd-image-updater
102102
spec:
103103
containers:
104-
- command:
105-
- /usr/local/bin/argocd-image-updater
104+
- args:
106105
- run
107106
env:
108107
- name: APPLICATIONS_API

0 commit comments

Comments
 (0)