Skip to content

Commit

Permalink
Merge branch 'GoogleCloudPlatform:main' into add-tags-field
Browse files Browse the repository at this point in the history
  • Loading branch information
BENY4M1N authored Oct 30, 2024
2 parents 36aa14a + 07118df commit aa6a65d
Showing 9 changed files with 289 additions and 215 deletions.
60 changes: 0 additions & 60 deletions mmv1/products/memorystore/Instance.yaml

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions mmv1/products/memorystore/product.yaml
Original file line number Diff line number Diff line change
@@ -12,10 +12,12 @@
# limitations under the License.

---
name: 'Memorystore'
display_name: 'Memorystore'
name: "Memorystore"
display_name: "Memorystore"
versions:
- name: 'beta'
base_url: 'https://memorystore.googleapis.com/v1beta/'
- name: "beta"
base_url: "https://memorystore.googleapis.com/v1beta/"
- name: "ga"
base_url: "https://memorystore.googleapis.com/v1/"
scopes:
- 'https://www.googleapis.com/auth/cloud-platform'
- "https://www.googleapis.com/auth/cloud-platform"
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
resource "google_memorystore_instance" "{{$.PrimaryResourceId}}" {
provider = google-beta
instance_id = "{{index $.Vars "instance_name"}}"
shard_count = 3
desired_psc_auto_connections {
@@ -18,7 +17,6 @@ resource "google_memorystore_instance" "{{$.PrimaryResourceId}}" {
}

resource "google_network_connectivity_service_connection_policy" "default" {
provider = google-beta
name = "{{index $.Vars "policy_name"}}"
location = "us-central1"
service_class = "gcp-memorystore"
@@ -30,19 +28,16 @@ resource "google_network_connectivity_service_connection_policy" "default" {
}

resource "google_compute_subnetwork" "producer_subnet" {
provider = google-beta
name = "{{index $.Vars "subnet_name"}}"
ip_cidr_range = "10.0.0.248/29"
region = "us-central1"
network = google_compute_network.producer_net.id
}

resource "google_compute_network" "producer_net" {
provider = google-beta
name = "{{index $.Vars "network_name"}}"
auto_create_subnetworks = false
}

data "google_project" "project" {
provider = google-beta
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
resource "google_memorystore_instance" "{{$.PrimaryResourceId}}" {
provider = google-beta
instance_id = "{{index $.Vars "instance_name"}}"
shard_count = 3
desired_psc_auto_connections {
@@ -41,7 +40,6 @@ resource "google_memorystore_instance" "{{$.PrimaryResourceId}}" {
}

resource "google_network_connectivity_service_connection_policy" "default" {
provider = google-beta
name = "{{index $.Vars "policy_name"}}"
location = "us-central1"
service_class = "gcp-memorystore"
@@ -53,19 +51,16 @@ resource "google_network_connectivity_service_connection_policy" "default" {
}

resource "google_compute_subnetwork" "producer_subnet" {
provider = google-beta
name = "{{index $.Vars "subnet_name"}}"
ip_cidr_range = "10.0.0.248/29"
region = "us-central1"
network = google_compute_network.producer_net.id
}

resource "google_compute_network" "producer_net" {
provider = google-beta
name = "{{index $.Vars "network_name"}}"
auto_create_subnetworks = false
}

data "google_project" "project" {
provider = google-beta
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
resource "google_memorystore_instance" "{{$.PrimaryResourceId}}" {
provider = google-beta
instance_id = "{{index $.Vars "instance_name"}}"
shard_count = 3
desired_psc_auto_connections {
@@ -23,7 +22,6 @@ resource "google_memorystore_instance" "{{$.PrimaryResourceId}}" {
}

resource "google_network_connectivity_service_connection_policy" "default" {
provider = google-beta
name = "{{index $.Vars "policy_name"}}"
location = "us-central1"
service_class = "gcp-memorystore"
@@ -35,19 +33,16 @@ resource "google_network_connectivity_service_connection_policy" "default" {
}

resource "google_compute_subnetwork" "producer_subnet" {
provider = google-beta
name = "{{index $.Vars "subnet_name"}}"
ip_cidr_range = "10.0.0.248/29"
region = "us-central1"
network = google_compute_network.producer_net.id
}

resource "google_compute_network" "producer_net" {
provider = google-beta
name = "{{index $.Vars "network_name"}}"
auto_create_subnetworks = false
}

data "google_project" "project" {
provider = google-beta
}
36 changes: 36 additions & 0 deletions mmv1/third_party/terraform/services/container/node_config.go.tmpl
Original file line number Diff line number Diff line change
@@ -2042,6 +2042,42 @@ func nodePoolNodeConfigUpdate(d *schema.ResourceData, config *transport_tpg.Conf
}
}

if d.HasChange(prefix + "node_config.0.containerd_config") {
if _, ok := d.GetOk(prefix + "node_config.0.containerd_config"); ok {
req := &container.UpdateNodePoolRequest{
Name: name,
ContainerdConfig: expandContainerdConfig(d.Get(prefix + "node_config.0.containerd_config")),
}
if req.ContainerdConfig == nil {
req.ContainerdConfig = &container.ContainerdConfig{}
req.ForceSendFields = []string{"ContainerdConfig"}
}
updateF := func() error {
clusterNodePoolsUpdateCall := config.NewContainerClient(userAgent).Projects.Locations.Clusters.NodePools.Update(nodePoolInfo.fullyQualifiedName(name), req)
if config.UserProjectOverride {
clusterNodePoolsUpdateCall.Header().Add("X-Goog-User-Project", nodePoolInfo.project)
}
op, err := clusterNodePoolsUpdateCall.Do()
if err != nil {
return err
}

// Wait until it's updated
return ContainerOperationWait(config, op,
nodePoolInfo.project,
nodePoolInfo.location,
"updating GKE node pool containerd_config", userAgent,
timeout)
}

if err := retryWhileIncompatibleOperation(timeout, npLockKey, updateF); err != nil {
return err
}

log.Printf("[INFO] Updated containerd_config for node pool %s", name)
}
}

if d.HasChange("node_config.0.disk_size_gb") ||
d.HasChange("node_config.0.disk_type") ||
d.HasChange("node_config.0.machine_type") ||
Loading

0 comments on commit aa6a65d

Please sign in to comment.