From ba095e1a3a44307fd54e7acaf0c61d31bf2883df Mon Sep 17 00:00:00 2001 From: Ryan Oaks Date: Fri, 27 Sep 2024 17:44:45 -0400 Subject: [PATCH] Revert "upgrade dcl version to v1.73.0 (#11804)" (#11862) --- mmv1/third_party/terraform/go.mod.tmpl | 2 +- mmv1/third_party/terraform/go.sum | 2 -- tpgtools/go.mod | 2 +- tpgtools/go.sum | 4 ++-- .../overrides/containeraws/samples/nodepool/basic.tf.tmpl | 7 ------- .../containeraws/samples/nodepool/basic_update.tf.tmpl | 7 ------- .../containeraws/samples/nodepool/beta_basic.tf.tmpl | 7 ------- .../samples/nodepool/beta_basic_update.tf.tmpl | 7 ------- 8 files changed, 4 insertions(+), 34 deletions(-) diff --git a/mmv1/third_party/terraform/go.mod.tmpl b/mmv1/third_party/terraform/go.mod.tmpl index 845f07500cff..57b44d578a12 100644 --- a/mmv1/third_party/terraform/go.mod.tmpl +++ b/mmv1/third_party/terraform/go.mod.tmpl @@ -4,7 +4,7 @@ go 1.21 require ( cloud.google.com/go/bigtable v1.30.0 - github.com/GoogleCloudPlatform/declarative-resource-client-library v1.73.0 + github.com/GoogleCloudPlatform/declarative-resource-client-library v1.72.0 github.com/apparentlymart/go-cidr v1.1.0 github.com/davecgh/go-spew v1.1.1 github.com/dnaeon/go-vcr v1.0.1 diff --git a/mmv1/third_party/terraform/go.sum b/mmv1/third_party/terraform/go.sum index bc32b1fdc53b..8213bad59ed5 100644 --- a/mmv1/third_party/terraform/go.sum +++ b/mmv1/third_party/terraform/go.sum @@ -440,5 +440,3 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -github.com/GoogleCloudPlatform/declarative-resource-client-library v1.73.0 h1:mVsrkdw7rJbmay3EE/KjHx7WbQcrfwLmxmzCFDXIl90= -github.com/GoogleCloudPlatform/declarative-resource-client-library v1.73.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k= diff --git a/tpgtools/go.mod b/tpgtools/go.mod index b33b60b6b3cf..6e2919cc52ff 100644 --- a/tpgtools/go.mod +++ b/tpgtools/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( bitbucket.org/creachadair/stringset v0.0.11 - github.com/GoogleCloudPlatform/declarative-resource-client-library v1.73.0 + github.com/GoogleCloudPlatform/declarative-resource-client-library v1.72.0 github.com/golang/glog v1.1.2 github.com/hashicorp/hcl v1.0.0 github.com/kylelemons/godebug v1.1.0 diff --git a/tpgtools/go.sum b/tpgtools/go.sum index e58c9e36a7ef..d48d0baafa4c 100644 --- a/tpgtools/go.sum +++ b/tpgtools/go.sum @@ -6,8 +6,8 @@ cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdi cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/GoogleCloudPlatform/declarative-resource-client-library v1.73.0 h1:mVsrkdw7rJbmay3EE/KjHx7WbQcrfwLmxmzCFDXIl90= -github.com/GoogleCloudPlatform/declarative-resource-client-library v1.73.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k= +github.com/GoogleCloudPlatform/declarative-resource-client-library v1.72.0 h1:VodSRLhOrb8hhRbPre275EreP4vTiaejdBcvd2MCtX4= +github.com/GoogleCloudPlatform/declarative-resource-client-library v1.72.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= diff --git a/tpgtools/overrides/containeraws/samples/nodepool/basic.tf.tmpl b/tpgtools/overrides/containeraws/samples/nodepool/basic.tf.tmpl index c901903c0a47..fd11ead5739d 100644 --- a/tpgtools/overrides/containeraws/samples/nodepool/basic.tf.tmpl +++ b/tpgtools/overrides/containeraws/samples/nodepool/basic.tf.tmpl @@ -150,13 +150,6 @@ resource "google_container_aws_node_pool" "primary" { auto_repair = true } - kubelet_config { - cpu_manager_policy = "none" - cpu_cfs_quota = true - cpu_cfs_quota_period = "100ms" - pod_pids_limit = 1024 - } - project = "{{project}}" } diff --git a/tpgtools/overrides/containeraws/samples/nodepool/basic_update.tf.tmpl b/tpgtools/overrides/containeraws/samples/nodepool/basic_update.tf.tmpl index 8669d8ff9b58..d7a2cb9aab28 100644 --- a/tpgtools/overrides/containeraws/samples/nodepool/basic_update.tf.tmpl +++ b/tpgtools/overrides/containeraws/samples/nodepool/basic_update.tf.tmpl @@ -149,13 +149,6 @@ resource "google_container_aws_node_pool" "primary" { auto_repair = false } - kubelet_config { - cpu_manager_policy = "none" - cpu_cfs_quota = true - cpu_cfs_quota_period = "100ms" - pod_pids_limit = 1024 - } - project = "{{project}}" } diff --git a/tpgtools/overrides/containeraws/samples/nodepool/beta_basic.tf.tmpl b/tpgtools/overrides/containeraws/samples/nodepool/beta_basic.tf.tmpl index e52ab57eda73..48e57734a938 100644 --- a/tpgtools/overrides/containeraws/samples/nodepool/beta_basic.tf.tmpl +++ b/tpgtools/overrides/containeraws/samples/nodepool/beta_basic.tf.tmpl @@ -154,13 +154,6 @@ resource "google_container_aws_node_pool" "primary" { management { auto_repair = true } - - kubelet_config { - cpu_manager_policy = "none" - cpu_cfs_quota = true - cpu_cfs_quota_period = "100ms" - pod_pids_limit = 1024 - } annotations = { label-one = "value-one" diff --git a/tpgtools/overrides/containeraws/samples/nodepool/beta_basic_update.tf.tmpl b/tpgtools/overrides/containeraws/samples/nodepool/beta_basic_update.tf.tmpl index 03a346196794..1afdb2e909b1 100644 --- a/tpgtools/overrides/containeraws/samples/nodepool/beta_basic_update.tf.tmpl +++ b/tpgtools/overrides/containeraws/samples/nodepool/beta_basic_update.tf.tmpl @@ -154,13 +154,6 @@ resource "google_container_aws_node_pool" "primary" { auto_repair = false } - kubelet_config { - cpu_manager_policy = "none" - cpu_cfs_quota = true - cpu_cfs_quota_period = "100ms" - pod_pids_limit = 1024 - } - annotations = { label-two = "value-two" }