Add private_registry_config to VMware user and admin cluster resources. (#14165) (#10150)

[upstream:620b6d4de644cde24a2389dd317d620082a7d640]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/14165.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+gkeonprem: added `private_registry_config` field to `google_gkeonprem_vmware_admin_cluster` resource (beta)
+```

google-beta/services/gkeonprem/resource_gkeonprem_vmware_admin_cluster.go

@@ -676,6 +676,26 @@ indicate real problems requiring user intervention.`,
 					},
 				},
 			},
+			"private_registry_config": {
+				Type:        schema.TypeList,
+				Optional:    true,
+				Description: `Configuration for private registry.`,
+				MaxItems:    1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"address": {
+							Type:        schema.TypeString,
+							Optional:    true,
+							Description: `The registry address.`,
+						},
+						"ca_cert": {
+							Type:        schema.TypeString,
+							Optional:    true,
+							Description: `The CA certificate public key for private registry.`,
+						},
+					},
+				},
+			},
 			"vcenter": {
 				Type:        schema.TypeList,
 				Optional:    true,
@@ -961,6 +981,12 @@ func resourceGkeonpremVmwareAdminClusterCreate(d *schema.ResourceData, meta inte
 	} else if v, ok := d.GetOkExists("platform_config"); !tpgresource.IsEmptyValue(reflect.ValueOf(platformConfigProp)) && (ok || !reflect.DeepEqual(v, platformConfigProp)) {
 		obj["platformConfig"] = platformConfigProp
 	}
+	privateRegistryConfigProp, err := expandGkeonpremVmwareAdminClusterPrivateRegistryConfig(d.Get("private_registry_config"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("private_registry_config"); !tpgresource.IsEmptyValue(reflect.ValueOf(privateRegistryConfigProp)) && (ok || !reflect.DeepEqual(v, privateRegistryConfigProp)) {
+		obj["privateRegistryConfig"] = privateRegistryConfigProp
+	}
 	annotationsProp, err := expandGkeonpremVmwareAdminClusterEffectiveAnnotations(d.Get("effective_annotations"), d, config)
 	if err != nil {
 		return err
@@ -1140,6 +1166,9 @@ func resourceGkeonpremVmwareAdminClusterRead(d *schema.ResourceData, meta interf
 	if err := d.Set("enable_advanced_cluster", flattenGkeonpremVmwareAdminClusterEnableAdvancedCluster(res["enableAdvancedCluster"], d, config)); err != nil {
 		return fmt.Errorf("Error reading VmwareAdminCluster: %s", err)
 	}
+	if err := d.Set("private_registry_config", flattenGkeonpremVmwareAdminClusterPrivateRegistryConfig(res["privateRegistryConfig"], d, config)); err != nil {
+		return fmt.Errorf("Error reading VmwareAdminCluster: %s", err)
+	}
 	if err := d.Set("effective_annotations", flattenGkeonpremVmwareAdminClusterEffectiveAnnotations(res["annotations"], d, config)); err != nil {
 		return fmt.Errorf("Error reading VmwareAdminCluster: %s", err)
 	}
@@ -1241,6 +1270,12 @@ func resourceGkeonpremVmwareAdminClusterUpdate(d *schema.ResourceData, meta inte
 	} else if v, ok := d.GetOkExists("platform_config"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, platformConfigProp)) {
 		obj["platformConfig"] = platformConfigProp
 	}
+	privateRegistryConfigProp, err := expandGkeonpremVmwareAdminClusterPrivateRegistryConfig(d.Get("private_registry_config"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("private_registry_config"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, privateRegistryConfigProp)) {
+		obj["privateRegistryConfig"] = privateRegistryConfigProp
+	}
 	annotationsProp, err := expandGkeonpremVmwareAdminClusterEffectiveAnnotations(d.Get("effective_annotations"), d, config)
 	if err != nil {
 		return err
@@ -1309,6 +1344,10 @@ func resourceGkeonpremVmwareAdminClusterUpdate(d *schema.ResourceData, meta inte
 		updateMask = append(updateMask, "platformConfig")
 	}
 
+	if d.HasChange("private_registry_config") {
+		updateMask = append(updateMask, "privateRegistryConfig")
+	}
+
 	if d.HasChange("effective_annotations") {
 		updateMask = append(updateMask, "annotations")
 	}
@@ -2343,6 +2382,29 @@ func flattenGkeonpremVmwareAdminClusterEnableAdvancedCluster(v interface{}, d *s
 	return v
 }
 
+func flattenGkeonpremVmwareAdminClusterPrivateRegistryConfig(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	if v == nil {
+		return nil
+	}
+	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
+	transformed := make(map[string]interface{})
+	transformed["address"] =
+		flattenGkeonpremVmwareAdminClusterPrivateRegistryConfigAddress(original["address"], d, config)
+	transformed["ca_cert"] =
+		flattenGkeonpremVmwareAdminClusterPrivateRegistryConfigCaCert(original["caCert"], d, config)
+	return []interface{}{transformed}
+}
+func flattenGkeonpremVmwareAdminClusterPrivateRegistryConfigAddress(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenGkeonpremVmwareAdminClusterPrivateRegistryConfigCaCert(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenGkeonpremVmwareAdminClusterEffectiveAnnotations(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	return v
 }
@@ -3480,6 +3542,40 @@ func expandGkeonpremVmwareAdminClusterPlatformConfigStatusConditionsState(v inte
 	return v, nil
 }
 
+func expandGkeonpremVmwareAdminClusterPrivateRegistryConfig(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	l := v.([]interface{})
+	if len(l) == 0 || l[0] == nil {
+		return nil, nil
+	}
+	raw := l[0]
+	original := raw.(map[string]interface{})
+	transformed := make(map[string]interface{})
+
+	transformedAddress, err := expandGkeonpremVmwareAdminClusterPrivateRegistryConfigAddress(original["address"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedAddress); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["address"] = transformedAddress
+	}
+
+	transformedCaCert, err := expandGkeonpremVmwareAdminClusterPrivateRegistryConfigCaCert(original["ca_cert"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedCaCert); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["caCert"] = transformedCaCert
+	}
+
+	return transformed, nil
+}
+
+func expandGkeonpremVmwareAdminClusterPrivateRegistryConfigAddress(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandGkeonpremVmwareAdminClusterPrivateRegistryConfigCaCert(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandGkeonpremVmwareAdminClusterEffectiveAnnotations(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
 	if v == nil {
 		return map[string]string{}, nil

google-beta/services/gkeonprem/resource_gkeonprem_vmware_admin_cluster_generated_meta.yaml

@@ -70,6 +70,8 @@ fields:
   - field: 'platform_config.status.conditions.state'
   - field: 'platform_config.status.conditions.type'
   - field: 'platform_config.status.error_message'
+  - field: 'private_registry_config.address'
+  - field: 'private_registry_config.ca_cert'
   - field: 'reconciling'
   - field: 'state'
   - field: 'status.conditions.last_transition_time'

google-beta/services/gkeonprem/resource_gkeonprem_vmware_admin_cluster_generated_test.go

@@ -91,6 +91,10 @@ resource "google_gkeonprem_vmware_admin_cluster" "admin-cluster-basic" {
       snat_pool = "test-snat-pool"
     }
   }
+  private_registry_config {
+    address = "test-address"
+    ca_cert = "test-ca-cert"
+  }
 }
 `, context)
 }
@@ -208,6 +212,10 @@ resource "google_gkeonprem_vmware_admin_cluster" "admin-cluster-full" {
   platform_config {
     required_platform_version = "1.31.0"
   }
+  private_registry_config {
+    address = "test-address"
+    ca_cert = "test-ca-cert"
+  }
 }
 `, context)
 }
@@ -276,6 +284,10 @@ resource "google_gkeonprem_vmware_admin_cluster" "admin-cluster-metallb" {
       enabled = true
     }
   }
+  private_registry_config {
+    address = "test-address"
+    ca_cert = "test-ca-cert"
+  }
 }
 `, context)
 }

website/docs/r/gkeonprem_vmware_admin_cluster.html.markdown

@@ -71,6 +71,10 @@ resource "google_gkeonprem_vmware_admin_cluster" "admin-cluster-basic" {
       snat_pool = "test-snat-pool"
     }
   }
+  private_registry_config {
+    address = "test-address"
+    ca_cert = "test-ca-cert"
+  }
 }
 ```
 ## Example Usage - Gkeonprem Vmware Admin Cluster Full
@@ -164,6 +168,10 @@ resource "google_gkeonprem_vmware_admin_cluster" "admin-cluster-full" {
   platform_config {
     required_platform_version = "1.31.0"
   }
+  private_registry_config {
+    address = "test-address"
+    ca_cert = "test-ca-cert"
+  }
 }
 ```
 ## Example Usage - Gkeonprem Vmware Admin Cluster Metallb
@@ -208,6 +216,10 @@ resource "google_gkeonprem_vmware_admin_cluster" "admin-cluster-metallb" {
       enabled = true
     }
   }
+  private_registry_config {
+    address = "test-address"
+    ca_cert = "test-ca-cert"
+  }
 }
 ```
 
@@ -431,6 +443,11 @@ The following arguments are supported:
   The VMware platform configuration.
   Structure is [documented below](#nested_platform_config).
 
+* `private_registry_config` -
+  (Optional)
+  Configuration for private registry.
+  Structure is [documented below](#nested_private_registry_config).
+
 * `project` - (Optional) The ID of the project in which the resource belongs.
     If it is not provided, the provider project is used.
 
@@ -727,6 +744,16 @@ The following arguments are supported:
   (Output)
   The lifecycle state of the condition.
 
+<a name="nested_private_registry_config"></a>The `private_registry_config` block supports:
+
+* `address` -
+  (Optional)
+  The registry address.
+
+* `ca_cert` -
+  (Optional)
+  The CA certificate public key for private registry.
+
 ## Attributes Reference
 
 In addition to the arguments listed above, the following computed attributes are exported: