From 6a6dec1cc51cdebb7402d894937738f9a6723270 Mon Sep 17 00:00:00 2001 From: Cameron Thornton Date: Tue, 1 Oct 2024 15:55:23 -0500 Subject: [PATCH] Upgrade dcl to 1.74.0 (#11883) --- GNUmakefile | 2 +- mmv1/provider/terraform.go | 2 +- mmv1/third_party/terraform/{go.mod.tmpl => go.mod} | 2 +- mmv1/third_party/terraform/go.sum | 4 ++++ tpgtools/go.mod | 2 +- tpgtools/go.sum | 4 ++-- .../overrides/containeraws/samples/nodepool/basic.tf.tmpl | 8 +++++++- .../containeraws/samples/nodepool/basic_update.tf.tmpl | 8 +++++++- .../containeraws/samples/nodepool/beta_basic.tf.tmpl | 8 +++++++- .../samples/nodepool/beta_basic_update.tf.tmpl | 8 +++++++- 10 files changed, 38 insertions(+), 10 deletions(-) rename mmv1/third_party/terraform/{go.mod.tmpl => go.mod} (99%) diff --git a/GNUmakefile b/GNUmakefile index 894d1a65ad34..da35083f2e58 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -114,7 +114,7 @@ upgrade-dcl: MOD_LINE=$$(grep declarative-resource-client-library go.mod);\ SUM_LINE=$$(grep declarative-resource-client-library go.sum);\ cd ../mmv1/third_party/terraform && \ - sed ${SED_I} "s!.*declarative-resource-client-library.*!$$MOD_LINE!" go.mod.erb; echo "$$SUM_LINE" >> go.sum + sed ${SED_I} "s!.*declarative-resource-client-library.*!$$MOD_LINE!" go.mod; echo "$$SUM_LINE" >> go.sum validate_environment: diff --git a/mmv1/provider/terraform.go b/mmv1/provider/terraform.go index b748adc908e9..a47477b8686c 100644 --- a/mmv1/provider/terraform.go +++ b/mmv1/provider/terraform.go @@ -316,7 +316,7 @@ func (t Terraform) getCommonCopyFiles(versionName string, generateCode, generate // Case 3: When copy a single file, save the target as key and source as value to the map singleFiles singleFiles := map[string]string{ "go.sum": "third_party/terraform/go.sum", - "go.mod": "third_party/terraform/go.mod.tmpl", + "go.mod": "third_party/terraform/go.mod", ".go-version": "third_party/terraform/.go-version", "terraform-registry-manifest.json": "third_party/terraform/terraform-registry-manifest.json.tmpl", } diff --git a/mmv1/third_party/terraform/go.mod.tmpl b/mmv1/third_party/terraform/go.mod similarity index 99% rename from mmv1/third_party/terraform/go.mod.tmpl rename to mmv1/third_party/terraform/go.mod index 57b44d578a12..6f4adfafb706 100644 --- a/mmv1/third_party/terraform/go.mod.tmpl +++ b/mmv1/third_party/terraform/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( cloud.google.com/go/bigtable v1.30.0 - github.com/GoogleCloudPlatform/declarative-resource-client-library v1.72.0 + github.com/GoogleCloudPlatform/declarative-resource-client-library v1.74.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 8213bad59ed5..8502771a0734 100644 --- a/mmv1/third_party/terraform/go.sum +++ b/mmv1/third_party/terraform/go.sum @@ -440,3 +440,7 @@ 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= +github.com/GoogleCloudPlatform/declarative-resource-client-library v1.74.0 h1:YV3eTXgDw3Zp8Mc12WE2Aa3+22twNd07xkFkEODrlOQ= +github.com/GoogleCloudPlatform/declarative-resource-client-library v1.74.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k= diff --git a/tpgtools/go.mod b/tpgtools/go.mod index 6e2919cc52ff..7a6a1b4204f9 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.72.0 + github.com/GoogleCloudPlatform/declarative-resource-client-library v1.74.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 d48d0baafa4c..95306e1d1396 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.72.0 h1:VodSRLhOrb8hhRbPre275EreP4vTiaejdBcvd2MCtX4= -github.com/GoogleCloudPlatform/declarative-resource-client-library v1.72.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k= +github.com/GoogleCloudPlatform/declarative-resource-client-library v1.74.0 h1:YV3eTXgDw3Zp8Mc12WE2Aa3+22twNd07xkFkEODrlOQ= +github.com/GoogleCloudPlatform/declarative-resource-client-library v1.74.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 fd11ead5739d..78e01cf015f8 100644 --- a/tpgtools/overrides/containeraws/samples/nodepool/basic.tf.tmpl +++ b/tpgtools/overrides/containeraws/samples/nodepool/basic.tf.tmpl @@ -150,6 +150,12 @@ 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 d7a2cb9aab28..22e471d3b8fa 100644 --- a/tpgtools/overrides/containeraws/samples/nodepool/basic_update.tf.tmpl +++ b/tpgtools/overrides/containeraws/samples/nodepool/basic_update.tf.tmpl @@ -149,6 +149,12 @@ 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 48e57734a938..e26129139e17 100644 --- a/tpgtools/overrides/containeraws/samples/nodepool/beta_basic.tf.tmpl +++ b/tpgtools/overrides/containeraws/samples/nodepool/beta_basic.tf.tmpl @@ -154,6 +154,13 @@ 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" @@ -168,4 +175,3 @@ resource "google_container_aws_node_pool" "primary" { project = "{{project}}" } - 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 1afdb2e909b1..078c7a93e29a 100644 --- a/tpgtools/overrides/containeraws/samples/nodepool/beta_basic_update.tf.tmpl +++ b/tpgtools/overrides/containeraws/samples/nodepool/beta_basic_update.tf.tmpl @@ -154,6 +154,13 @@ 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" } @@ -167,4 +174,3 @@ resource "google_container_aws_node_pool" "primary" { project = "{{project}}" } -