Merge pull request #374 from hakman/fix-cloudbuild

Update cloud build config for v1.21

cloudbuild.yaml

@@ -1,14 +1,22 @@
-images:
-  - 'gcr.io/$PROJECT_ID/cloud-controller-manager:$_GIT_TAG'
-  - 'gcr.io/$PROJECT_ID/cloud-controller-manager:latest'
+# See https://cloud.google.com/cloud-build/docs/build-config
 options:
+  dynamic_substitutions: true
   substitution_option: ALLOW_LOOSE
+  machineType: 'N1_HIGHCPU_8'
 steps:
-  - name: gcr.io/cloud-builders/docker
+  - name: gcr.io/k8s-testimages/gcb-docker-gcloud
+    entrypoint: /buildx-entrypoint
     args:
     - build
-    - --tag=gcr.io/$PROJECT_ID/cloud-controller-manager:$_GIT_TAG
+    - --tag=gcr.io/$PROJECT_ID/cloud-controller-manager:$_SHORT_TAG
     - --tag=gcr.io/$PROJECT_ID/cloud-controller-manager:latest
-    - --build-arg=VERSION=$_GIT_TAG
+    - --build-arg=VERSION=$_SHORT_TAG
+    - --output=type=registry
+    - --platform=linux/amd64,linux/arm64
     - .
+substitutions:
+  _GIT_TAG: 'v99999999-v12345'
+  # Remove date prefix (first 10 characters) to create valid semver version:
+  # v20220510-v1.24.0-alpha.0-15-g09bd268 => v1.24.0-alpha.0-15-g09bd268
+  _SHORT_TAG: '${_GIT_TAG:10}'
 timeout: 1200s