Change kustomize-controller to batch build

Makefile

@@ -217,6 +217,7 @@ generate-staging-buildspec: | ensure-locale
 	build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "tinkerbell_tink" "$(BASE_DIRECTORY)/projects/tinkerbell/tink/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true
 	build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "linuxkit_linuxkit" "$(BASE_DIRECTORY)/projects/linuxkit/linuxkit/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true
 	build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "emissary-ingress_emissary" "$(BASE_DIRECTORY)/projects/emissary-ingress/emissary/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true "DO_NOT_EXCLUDE_FROM_BUILDSPEC"
+	build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "fluxcd_kustomize-controller" "$(BASE_DIRECTORY)/projects/fluxcd/kustomize-controller/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true "DO_NOT_EXCLUDE_FROM_BUILDSPEC"
 	build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "distribution_distribution" "$(BASE_DIRECTORY)/projects/distribution/distribution/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true "DO_NOT_EXCLUDE_FROM_BUILDSPEC"
 	build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "goharbor_harbor" "$(BASE_DIRECTORY)/projects/goharbor/harbor/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true "DO_NOT_EXCLUDE_FROM_BUILDSPEC"
 	build/lib/generate_staging_buildspec.sh $(BASE_DIRECTORY) "aws_upgrader" "$(BASE_DIRECTORY)/projects/aws/upgrader/buildspecs/batch-build.yml" "$(BASE_DIRECTORY)/buildspec.yml" true "DO_NOT_EXCLUDE_FROM_BUILDSPEC"

projects/fluxcd/kustomize-controller/CHECKSUMS

@@ -1,2 +1,2 @@
-6b6066e2a36b5ca2dcfed8f3e2b79e11b95122d6a097eb1fe4a664ca230972ba  _output/bin/kustomize-controller/linux-amd64/kustomize-controller
-bc8fd13e56b2f679a4ca3f6f6be86844396cc3ae46714a2cc8cef59ff15c869d  _output/bin/kustomize-controller/linux-arm64/kustomize-controller
+729511222cbab195a0396ba4d395b557600cc85aafdffe591050f2f532b79815  _output/bin/kustomize-controller/linux-amd64/kustomize-controller
+1c5cffb2ff1d4577218310bdc59fe3f88733392ab43196de20799a7dc5dc9c2f  _output/bin/kustomize-controller/linux-arm64/kustomize-controller

projects/fluxcd/kustomize-controller/Makefile

@@ -11,6 +11,9 @@ FIX_LICENSES_API_LICENSE_TARGET=$(REPO)/vendor/github.com/fluxcd/kustomize-contr
 
 BASE_IMAGE_NAME=eks-distro-minimal-base-git
 
+BUILDSPECS=$(BUILDSPECS_FOR_COMBINE_IMAGES)
+BUILDSPEC_1_COMPUTE_TYPE=BUILD_GENERAL1_SMALL
+
 include $(BASE_DIRECTORY)/Common.mk
 
 

projects/fluxcd/kustomize-controller/buildspecs/batch-build.yml

@@ -0,0 +1,51 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#      http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file was generated by running `make generate`. DO NOT EDIT
+
+batch:
+  fast-fail: true
+  build-graph:
+    - identifier: fluxcd_kustomize_controller_linux_amd64
+      env:
+        type: LINUX_CONTAINER
+        compute-type: BUILD_GENERAL1_SMALL
+        variables:
+          IMAGE_PLATFORMS: linux/amd64
+          BINARY_PLATFORMS: linux/amd64
+          IMAGE_TAG_SUFFIX: -amd64
+    - identifier: fluxcd_kustomize_controller_linux_arm64
+      env:
+        type: ARM_CONTAINER
+        compute-type: BUILD_GENERAL1_SMALL
+        variables:
+          IMAGE_PLATFORMS: linux/arm64
+          BINARY_PLATFORMS: linux/arm64
+          IMAGE_TAG_SUFFIX: -arm64
+    - identifier: fluxcd_kustomize_controller_combine_images
+      buildspec: buildspecs/combine-images.yml
+      depend-on:
+        - fluxcd_kustomize_controller_linux_amd64
+        - fluxcd_kustomize_controller_linux_arm64
+      env:
+        type: ARM_CONTAINER
+        compute-type: BUILD_GENERAL1_SMALL
+version: 0.2
+phases:
+  pre_build:
+    commands:
+      - ./build/lib/setup.sh
+  build:
+    commands:
+      - if $(make check-project-path-exists) && make check-for-release-branch-skip -C $PROJECT_PATH; then make release -C $PROJECT_PATH; fi

release/staging-build.yml

@@ -382,7 +382,31 @@ batch:
         variables:
           PROJECT_PATH: projects/fluxcd/helm-controller
           CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/fluxcd.helm-controller
-    - identifier: fluxcd_kustomize_controller
+    - identifier: fluxcd_kustomize_controller_linux_amd64
+      env:
+        type: LINUX_CONTAINER
+        compute-type: BUILD_GENERAL1_SMALL
+        variables:
+          PROJECT_PATH: projects/fluxcd/kustomize-controller
+          CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/fluxcd.kustomize-controller
+          IMAGE_PLATFORMS: linux/amd64
+          BINARY_PLATFORMS: linux/amd64
+          IMAGE_TAG_SUFFIX: -amd64
+    - identifier: fluxcd_kustomize_controller_linux_arm64
+      env:
+        type: ARM_CONTAINER
+        compute-type: BUILD_GENERAL1_SMALL
+        variables:
+          PROJECT_PATH: projects/fluxcd/kustomize-controller
+          CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/fluxcd.kustomize-controller
+          IMAGE_PLATFORMS: linux/arm64
+          BINARY_PLATFORMS: linux/arm64
+          IMAGE_TAG_SUFFIX: -arm64
+    - identifier: fluxcd_kustomize_controller_combine_images
+      buildspec: buildspecs/combine-images.yml
+      depend-on:
+        - fluxcd_kustomize_controller_linux_amd64
+        - fluxcd_kustomize_controller_linux_arm64
       env:
         type: ARM_CONTAINER
         compute-type: BUILD_GENERAL1_SMALL

tools/version-tracker/buildspecs/upgrade.yml

@@ -255,13 +255,26 @@ batch:
         variables:
           PROJECT_PATH: projects/fluxcd/helm-controller
           CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/fluxcd.helm-controller
-    - identifier: fluxcd_kustomize_controller
+    - identifier: fluxcd_kustomize_controller_linux_amd64
+      env:
+        type: LINUX_CONTAINER
+        compute-type: BUILD_GENERAL1_SMALL
+        variables:
+          PROJECT_PATH: projects/fluxcd/kustomize-controller
+          CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/fluxcd.kustomize-controller
+          IMAGE_PLATFORMS: linux/amd64
+          BINARY_PLATFORMS: linux/amd64
+          IMAGE_TAG_SUFFIX: -amd64
+    - identifier: fluxcd_kustomize_controller_linux_arm64
       env:
         type: ARM_CONTAINER
         compute-type: BUILD_GENERAL1_SMALL
         variables:
           PROJECT_PATH: projects/fluxcd/kustomize-controller
           CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/fluxcd.kustomize-controller
+          IMAGE_PLATFORMS: linux/arm64
+          BINARY_PLATFORMS: linux/arm64
+          IMAGE_TAG_SUFFIX: -arm64
     - identifier: fluxcd_notification_controller
       env:
         type: ARM_CONTAINER