From 59ee294b0049b422e0d089ba44fd9e858f0efb35 Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Sat, 7 Sep 2019 15:02:07 +0200 Subject: [PATCH] Re-sync controller implementation with CAPA, Fix cloud config indent bug, also copy addons to examples output folder, Re-sync makefile --- cloudbuild.yaml | 14 ++++++++++++++ examples/generate.sh | 3 +++ 2 files changed, 17 insertions(+) create mode 100644 cloudbuild.yaml diff --git a/cloudbuild.yaml b/cloudbuild.yaml new file mode 100644 index 0000000000..82a00e30ab --- /dev/null +++ b/cloudbuild.yaml @@ -0,0 +1,14 @@ +# See https://cloud.google.com/cloud-build/docs/build-config +timeout: 1200s +steps: + - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20190906-745fed4' + entrypoint: make + env: + - DOCKER_CLI_EXPERIMENTAL=enabled + - TAG=$_GIT_TAG + args: + - release-staging +substitutions: + # _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and + # can be used as a substitution + _GIT_TAG: '12345' diff --git a/examples/generate.sh b/examples/generate.sh index 5ced287936..8689d8e00f 100755 --- a/examples/generate.sh +++ b/examples/generate.sh @@ -213,6 +213,9 @@ echo "Generated ${MACHINEDEPLOYMENT_GENERATED_FILE}" cp ${SOURCE_DIR}/addons.yaml "${ADDONS_GENERATED_FILE}" echo "Generated ${ADDONS_GENERATED_FILE}" +cp ${SOURCE_DIR}/addons.yaml "${ADDONS_GENERATED_FILE}" +echo "Generated ${ADDONS_GENERATED_FILE}" + # Generate Cluster API provider components file. kustomize build "github.com/kubernetes-sigs/cluster-api/config/default/?ref=master" > "${COMPONENTS_CLUSTER_API_GENERATED_FILE}" echo "Generated ${COMPONENTS_CLUSTER_API_GENERATED_FILE}"