fix: Use Kustomize v2 for manifest generation to support kubectl apply -k (#62)

* fix: Use Kustomize v2 for manifest generation to support kubectl apply -k

* Adapt GH workflow to check for manifest changes

* Fix curl flag

* Download curl to appropriate location

* Use bash shell for manifest generation

Author: jannfis

.github/workflows/ci-tests.yaml

@@ -26,6 +26,28 @@ jobs:
         run: |
           go mod tidy
           git diff --exit-code -- .
+  codegen:
+    name: Run codegen
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - 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
+      - name: Run make manifests
+        run: |
+          make manifests
+      - name: Check nothing has changed
+        run: |
+          set -xo pipefail
+          git diff --exit-code -- . ':!go.sum' ':!go.mod' ':!assets/swagger.json' | tee codegen.patch
   lint:
     name: Ensure code is correctly linted
     runs-on: ubuntu-latest

hack/generate-manifests.sh

@@ -1,10 +1,12 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -eo pipefail
 set -x
 
 SRCROOT="$( CDPATH='' cd -- "$(dirname "$0")/.." && pwd -P )"
-KUSTOMIZE="kustomize"
+# Make sure that KUSTOMIZE points to a v2 - we need that to support the kubectl
+# integration.
+KUSTOMIZE=${KUSTOMIZE:-kustomize2}
 TEMPFILE=$(mktemp /tmp/aic-manifests.XXXXXX)
 
 IMAGE_NAMESPACE="${IMAGE_NAMESPACE:-argoprojlabs}"
@@ -23,7 +25,7 @@ if [ "$IMAGE_TAG" = "" ]; then
   IMAGE_TAG=latest
 fi
 
-cd ${SRCROOT}/manifests/base && kustomize edit set image argoprojlabs/argocd-image-updater=${IMAGE_NAMESPACE}/argocd-image-updater:${IMAGE_TAG}
+cd ${SRCROOT}/manifests/base && ${KUSTOMIZE} edit set image ${IMAGE_NAMESPACE}/argocd-image-updater:${IMAGE_TAG}
 cd ${SRCROOT}/manifests/base && ${KUSTOMIZE} build . > ${TEMPFILE}
 
 mv ${TEMPFILE} ${SRCROOT}/manifests/install.yaml

manifests/base/deployment/argocd-image-updater-deployment.yaml

@@ -19,7 +19,7 @@ spec:
       - command:
         - /usr/local/bin/argocd-image-updater
         - run
-        image: argoproj-labs/argocd-image-updater:latest
+        image: argoprojlabs/argocd-image-updater:latest
         imagePullPolicy: Always
         env:
         - name: ARGOCD_GRPC_WEB

manifests/base/kustomization.yaml

@@ -1,16 +1,11 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-
 images:
-- name: argoproj-labs/argocd-image-updater
-  newName: argoprojlabs/argocd-image-updater
-  newTag: latest
 - name: argoprojlabs/argocd-image-updater
-  newName: argoprojlabs/argocd-image-updater
   newTag: latest
 
-resources:
+bases:
 - ./config
 - ./deployment
 - ./rbac