Merge pull request #1902 from maqiuyujoyce/202405-update-accelerator-…

…type Change the accelerate type 'nvidia-tesla-k80' as it's no longer supported
GoogleCloudPlatform · May 29, 2024 · e2ca7bc · e2ca7bc
2 parents bbdd7e2 + 3a99017
commit e2ca7bc
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 22 deletions.
diff --git a/...ns.k8s.io_v1_customresourcedefinition_computeinstances.compute.cnrm.cloud.google.com.yaml b/...ns.k8s.io_v1_customresourcedefinition_computeinstances.compute.cnrm.cloud.google.com.yaml
@@ -412,7 +412,7 @@ spec:
                       type: integer
                     type:
                       description: Immutable. The accelerator type resource exposed
-                        to this instance. E.g. nvidia-tesla-k80.
+                        to this instance. E.g. nvidia-tesla-t4.
                       type: string
                   required:
                   - count

diff --git a/...o_v1_customresourcedefinition_computeinstancetemplates.compute.cnrm.cloud.google.com.yaml b/...o_v1_customresourcedefinition_computeinstancetemplates.compute.cnrm.cloud.google.com.yaml
@@ -474,7 +474,7 @@ spec:
                       type: integer
                     type:
                       description: Immutable. The accelerator type resource to expose
-                        to this instance. E.g. nvidia-tesla-k80.
+                        to this instance. E.g. nvidia-tesla-t4.
                       type: string
                   required:
                   - count

diff --git a/...ig/samples/resources/computeinstancetemplate/compute_v1beta1_computeinstancetemplate.yaml b/...ig/samples/resources/computeinstancetemplate/compute_v1beta1_computeinstancetemplate.yaml
@@ -64,7 +64,7 @@ spec:
       - compute-ro
       - storage-ro
   guestAccelerator:
-    - type: nvidia-tesla-k80
+    - type: nvidia-tesla-t4
       count: 1
   minCpuPlatform: "Intel Skylake"
   shieldedInstanceConfig:

diff --git a/...ples/resources/containernodepool/basic-node-pool/container_v1beta1_containernodepool.yaml b/...ples/resources/containernodepool/basic-node-pool/container_v1beta1_containernodepool.yaml
@@ -36,7 +36,7 @@ spec:
       - "https://www.googleapis.com/auth/logging.write"
       - "https://www.googleapis.com/auth/monitoring"
     guestAccelerator:
-      - type: "nvidia-tesla-k80"
+      - type: "nvidia-tesla-t4"
         count: 1
     metadata:
       disable-legacy-endpoints: "true"

diff --git a/pkg/clients/generated/apis/compute/v1beta1/computeinstance_types.go b/pkg/clients/generated/apis/compute/v1beta1/computeinstance_types.go
diff --git a/pkg/clients/generated/apis/compute/v1beta1/computeinstancetemplate_types.go b/pkg/clients/generated/apis/compute/v1beta1/computeinstancetemplate_types.go
diff --git a/...gle3-docs/resource-reference/generated/resource-docs/compute/computeinstance.md b/...gle3-docs/resource-reference/generated/resource-docs/compute/computeinstance.md
@@ -885,7 +885,7 @@ zone: string
         </td>
         <td>
             <p><code class="apitype">string</code></p>
-            <p>{% verbatim %}Immutable. The accelerator type resource exposed to this instance. E.g. nvidia-tesla-k80.{% endverbatim %}</p>
+            <p>{% verbatim %}Immutable. The accelerator type resource exposed to this instance. E.g. nvidia-tesla-t4.{% endverbatim %}</p>
         </td>
     </tr>
     <tr>

diff --git a/...s/resource-reference/generated/resource-docs/compute/computeinstancetemplate.md b/...s/resource-reference/generated/resource-docs/compute/computeinstancetemplate.md
@@ -912,7 +912,7 @@ local SSD.{% endverbatim %}</p>
         </td>
         <td>
             <p><code class="apitype">string</code></p>
-            <p>{% verbatim %}Immutable. The accelerator type resource to expose to this instance. E.g. nvidia-tesla-k80.{% endverbatim %}</p>
+            <p>{% verbatim %}Immutable. The accelerator type resource to expose to this instance. E.g. nvidia-tesla-t4.{% endverbatim %}</p>
         </td>
     </tr>
     <tr>
@@ -2053,7 +2053,7 @@ spec:
       - compute-ro
       - storage-ro
   guestAccelerator:
-    - type: nvidia-tesla-k80
+    - type: nvidia-tesla-t4
       count: 1
   minCpuPlatform: "Intel Skylake"
   shieldedInstanceConfig:

diff --git a/...-docs/resource-reference/generated/resource-docs/container/containernodepool.md b/...-docs/resource-reference/generated/resource-docs/container/containernodepool.md
@@ -1967,7 +1967,7 @@ spec:
       - "https://www.googleapis.com/auth/logging.write"
       - "https://www.googleapis.com/auth/monitoring"
     guestAccelerator:
-      - type: "nvidia-tesla-k80"
+      - type: "nvidia-tesla-t4"
         count: 1
     metadata:
       disable-legacy-endpoints: "true"

diff --git a/.../terraform-provider-google-beta/google-beta/services/compute/resource_compute_instance.go b/.../terraform-provider-google-beta/google-beta/services/compute/resource_compute_instance.go
@@ -579,7 +579,7 @@ func ResourceComputeInstance() *schema.Resource {
 							Required:         true,
 							ForceNew:         true,
 							DiffSuppressFunc: tpgresource.CompareSelfLinkOrResourceName,
-							Description:      `The accelerator type resource exposed to this instance. E.g. nvidia-tesla-k80.`,
+							Description:      `The accelerator type resource exposed to this instance. E.g. nvidia-tesla-t4.`,
 						},
 					},
 				},
@@ -2428,7 +2428,7 @@ func expandInstanceGuestAccelerators(d tpgresource.TerraformResourceData, config
 // After reconciling the desired and actual state, we would otherwise see a
 // perpetual diff resembling:
 //
-//	[] != [{"count":0, "type": "nvidia-tesla-k80"}]
+//	[] != [{"count":0, "type": "nvidia-tesla-t4"}]
 func suppressEmptyGuestAcceleratorDiff(_ context.Context, d *schema.ResourceDiff, meta interface{}) error {
 	oldi, newi := d.GetChange("guest_accelerator")
 

diff --git a/...m-provider-google-beta/google-beta/services/compute/resource_compute_instance_template.go b/...m-provider-google-beta/google-beta/services/compute/resource_compute_instance_template.go
@@ -873,7 +873,7 @@ be from 0 to 999,999,999 inclusive.`,
 							Required:         true,
 							ForceNew:         true,
 							DiffSuppressFunc: tpgresource.CompareSelfLinkOrResourceName,
-							Description:      `The accelerator type resource to expose to this instance. E.g. nvidia-tesla-k80.`,
+							Description:      `The accelerator type resource to expose to this instance. E.g. nvidia-tesla-t4.`,
 						},
 					},
 				},
@@ -1201,8 +1201,8 @@ func buildDisks(d *schema.ResourceData, config *transport_tpg.Config) ([]*comput
 //
 // Using a partial URL on an instance template results in:
 // Invalid value for field 'resource.properties.guestAccelerators[0].acceleratorType':
-// 'zones/us-east1-b/acceleratorTypes/nvidia-tesla-k80'.
-// Accelerator type 'zones/us-east1-b/acceleratorTypes/nvidia-tesla-k80'
+// 'zones/us-east1-b/acceleratorTypes/nvidia-tesla-t4'.
+// Accelerator type 'zones/us-east1-b/acceleratorTypes/nvidia-tesla-t4'
 // must be a valid resource name (not an url).
 func expandInstanceTemplateGuestAccelerators(d tpgresource.TerraformResourceData, config *transport_tpg.Config) []*compute.AcceleratorConfig {
 	configs, ok := d.GetOk("guest_accelerator")

diff --git a/...vider-google-beta/google-beta/services/compute/resource_compute_instance_template_test.go b/...vider-google-beta/google-beta/services/compute/resource_compute_instance_template_test.go
@@ -521,7 +521,7 @@ func TestAccComputeInstanceTemplate_guestAccelerator(t *testing.T) {
 				Config: testAccComputeInstanceTemplate_guestAccelerator(acctest.RandString(t, 10), 1),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckComputeInstanceTemplateExists(t, "google_compute_instance_template.foobar", &instanceTemplate),
-					testAccCheckComputeInstanceTemplateHasGuestAccelerator(&instanceTemplate, "nvidia-tesla-k80", 1),
+					testAccCheckComputeInstanceTemplateHasGuestAccelerator(&instanceTemplate, "nvidia-tesla-t4", 1),
 				),
 			},
 			{
@@ -2554,7 +2554,7 @@ resource "google_compute_instance_template" "foobar" {
 
   guest_accelerator {
     count = %d
-    type  = "nvidia-tesla-k80"
+    type  = "nvidia-tesla-t4"
   }
 }
 `, i, count)

diff --git a/...aform-provider-google-beta/google-beta/services/compute/resource_compute_instance_test.go b/...aform-provider-google-beta/google-beta/services/compute/resource_compute_instance_test.go
@@ -1497,7 +1497,7 @@ func TestAccComputeInstance_guestAccelerator(t *testing.T) {
 				Config: testAccComputeInstance_guestAccelerator(instanceName, 1),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckComputeInstanceExists(t, "google_compute_instance.foobar", &instance),
-					testAccCheckComputeInstanceHasGuestAccelerator(&instance, "nvidia-tesla-k80", 1),
+					testAccCheckComputeInstanceHasGuestAccelerator(&instance, "nvidia-tesla-t4", 1),
 				),
 			},
 			computeInstanceImportStep("us-east1-d", instanceName, []string{"metadata.baz", "metadata.foo"}),
@@ -5624,7 +5624,7 @@ resource "google_compute_instance" "foobar" {
 
   guest_accelerator {
     count = %d
-    type  = "nvidia-tesla-k80"
+    type  = "nvidia-tesla-t4"
   }
 }
 `, instance, count)

diff --git a/...der-google-beta/google-beta/services/compute/resource_compute_region_instance_template.go b/...der-google-beta/google-beta/services/compute/resource_compute_region_instance_template.go
@@ -833,7 +833,7 @@ be from 0 to 999,999,999 inclusive.`,
 							Required:         true,
 							ForceNew:         true,
 							DiffSuppressFunc: tpgresource.CompareSelfLinkOrResourceName,
-							Description:      `The accelerator type resource to expose to this instance. E.g. nvidia-tesla-k80.`,
+							Description:      `The accelerator type resource to expose to this instance. E.g. nvidia-tesla-t4.`,
 						},
 					},
 				},

diff --git a/...oogle-beta/google-beta/services/compute/resource_compute_region_instance_template_test.go b/...oogle-beta/google-beta/services/compute/resource_compute_region_instance_template_test.go
@@ -465,7 +465,7 @@ func TestAccComputeRegionInstanceTemplate_guestAccelerator(t *testing.T) {
 				Config: testAccComputeRegionInstanceTemplate_guestAccelerator(acctest.RandString(t, 10), 1),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckComputeRegionInstanceTemplateExists(t, "google_compute_region_instance_template.foobar", &instanceTemplate),
-					testAccCheckComputeRegionInstanceTemplateHasGuestAccelerator(&instanceTemplate, "nvidia-tesla-k80", 1),
+					testAccCheckComputeRegionInstanceTemplateHasGuestAccelerator(&instanceTemplate, "nvidia-tesla-t4", 1),
 				),
 			},
 			{
@@ -2458,7 +2458,7 @@ resource "google_compute_region_instance_template" "foobar" {
 
   guest_accelerator {
     count = %d
-    type  = "nvidia-tesla-k80"
+    type  = "nvidia-tesla-t4"
   }
 }
 `, i, count)
-Original file line number
+Diff line change
@@ Expand Up / @@ -885,7 +885,7 @@ zone: string @@
             </td>
             <td>
                 <p><code class="apitype">string</code></p>
-                <p>{% verbatim %}Immutable. The accelerator type resource exposed to this instance. E.g. nvidia-tesla-k80.{% endverbatim %}</p>
+                <p>{% verbatim %}Immutable. The accelerator type resource exposed to this instance. E.g. nvidia-tesla-t4.{% endverbatim %}</p>
             </td>
         </tr>
         <tr>
@@ Expand Down @@