From 3b278ec7767fa98d02d7c94a821858f5cd49673c Mon Sep 17 00:00:00 2001 From: Abhisek Purwar Date: Mon, 27 Jun 2022 03:59:11 +0000 Subject: [PATCH 1/4] Update version to 21.2 to fix the exception of node pool of terraform example --- examples/acm-terraform-blog-part1/terraform/gke.tf | 2 +- examples/acm-terraform-blog-part2/terraform/gke.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/acm-terraform-blog-part1/terraform/gke.tf b/examples/acm-terraform-blog-part1/terraform/gke.tf index 2b109fb20c..8a946355d9 100644 --- a/examples/acm-terraform-blog-part1/terraform/gke.tf +++ b/examples/acm-terraform-blog-part1/terraform/gke.tf @@ -31,7 +31,7 @@ module "enabled_google_apis" { module "gke" { source = "terraform-google-modules/kubernetes-engine/google" - version = "~> 16.0" + version = "~> 21.2" project_id = module.enabled_google_apis.project_id name = "sfl-acm-part1" region = var.region diff --git a/examples/acm-terraform-blog-part2/terraform/gke.tf b/examples/acm-terraform-blog-part2/terraform/gke.tf index dae795b4c6..bb5e27e5c0 100644 --- a/examples/acm-terraform-blog-part2/terraform/gke.tf +++ b/examples/acm-terraform-blog-part2/terraform/gke.tf @@ -31,7 +31,7 @@ module "enabled_google_apis" { module "gke" { source = "terraform-google-modules/kubernetes-engine/google" - version = "~> 16.0" + version = "~> 21.2" project_id = module.enabled_google_apis.project_id name = "sfl-acm-part2" region = var.region From 781b066c930d9a0f82cb191c7fc28a48438211ef Mon Sep 17 00:00:00 2001 From: Abhisek Purwar Date: Mon, 27 Jun 2022 18:07:18 +0000 Subject: [PATCH 2/4] Update the gke module version to latest in the examples --- examples/acm-terraform-blog-part3/terraform/gke.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/acm-terraform-blog-part3/terraform/gke.tf b/examples/acm-terraform-blog-part3/terraform/gke.tf index 2dcf171f51..77694dcaf2 100644 --- a/examples/acm-terraform-blog-part3/terraform/gke.tf +++ b/examples/acm-terraform-blog-part3/terraform/gke.tf @@ -33,7 +33,7 @@ module "enabled_google_apis" { module "gke" { source = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster" - version = "~> 16.0" + version = "~> 21.2" project_id = module.enabled_google_apis.project_id name = "sfl-acm-part3" region = var.region @@ -48,7 +48,7 @@ module "gke" { module "wi" { source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity" - version = "~> 16.0.1" + version = "~> 21.2" gcp_sa_name = "cnrmsa" cluster_name = module.gke.name name = "cnrm-controller-manager" From 21e7b75f09bb8b5338e19b02651dc12d33579975 Mon Sep 17 00:00:00 2001 From: Abhisek Purwar Date: Tue, 28 Jun 2022 07:04:26 +0000 Subject: [PATCH 3/4] Update the terraform provider version for google-beta --- examples/acm-terraform-blog-part3/terraform/providers.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/acm-terraform-blog-part3/terraform/providers.tf b/examples/acm-terraform-blog-part3/terraform/providers.tf index 6debb7dc12..388c0a261c 100644 --- a/examples/acm-terraform-blog-part3/terraform/providers.tf +++ b/examples/acm-terraform-blog-part3/terraform/providers.tf @@ -18,7 +18,7 @@ terraform { required_providers { google-beta = { source = "hashicorp/google-beta" - version = "3.73.0" + version = "4.27.0" } } } From 819d5df7312dcb3333100696f8e32f668a91f62a Mon Sep 17 00:00:00 2001 From: Abhisek Purwar Date: Wed, 13 Jul 2022 09:31:07 +0000 Subject: [PATCH 4/4] Remove old task_helpers related to ACM operator install --- build/int.cloudbuild.yaml | 3 --- test/task_helper_functions.sh | 20 -------------------- 2 files changed, 23 deletions(-) delete mode 100755 test/task_helper_functions.sh diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml index 8399652b69..6eaf99b506 100644 --- a/build/int.cloudbuild.yaml +++ b/build/int.cloudbuild.yaml @@ -14,9 +14,6 @@ timeout: 12600s steps: -- id: download acm - name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' - args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && download_acm'] - id: prepare name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && prepare_environment && chmod 600 /builder/home/.netrc && sleep 120'] diff --git a/test/task_helper_functions.sh b/test/task_helper_functions.sh deleted file mode 100755 index 49a530eb4e..0000000000 --- a/test/task_helper_functions.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2019 Google LLC -# -# 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. - -# Pre-download the Anthos Config Management operator -function download_acm() { - gsutil cp gs://config-management-release/released/latest/config-management-operator.yaml /workspace/acm.yaml -}