Merge branch 'GoogleCloudPlatform:master' into edgenetwork

GoogleCloudPlatform · Nov 1, 2023 · cf20b65 · cf20b65
2 parents ca55fc8 + 7ea6ab6
commit cf20b65
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/...urcefixture/testdata/basic/containerattached/v1beta1/containerattachedcluster/create.yaml b/...urcefixture/testdata/basic/containerattached/v1beta1/containerattachedcluster/create.yaml
@@ -18,15 +18,15 @@ metadata:
   name: containerattachedcluster-${uniqueId}
 spec:
   # The resourceID needs to match the name of the eks cluster to be attached
-  resourceID: kcc-attached-cluster
+  resourceID: kcc-attached-cluster-127
   location: us-west1
   projectRef:
     external: ${KCC_ATTACHED_CLUSTER_TEST_PROJECT}
   description: "Test attached cluster"
   distribution: "eks"
   oidcConfig:
-    issuerUrl: https://oidc.eks.us-west-2.amazonaws.com/id/17F5DD7A27C5CA2B2B626B94C0752B37
-  platformVersion: 1.25.0-gke.5
+    issuerUrl: https://oidc.eks.us-west-2.amazonaws.com/id/A115FE1C770C2452C75219524036FC0F
+  platformVersion: 1.27.0-gke.2
   fleet:
     projectRef:
       name: project-${uniqueId}

diff --git a/...xture/testdata/basic/containerattached/v1beta1/containerattachedcluster/dependencies.yaml b/...xture/testdata/basic/containerattached/v1beta1/containerattachedcluster/dependencies.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022 Google LLC
+# Copyright 2023 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/...urcefixture/testdata/basic/containerattached/v1beta1/containerattachedcluster/update.yaml b/...urcefixture/testdata/basic/containerattached/v1beta1/containerattachedcluster/update.yaml
@@ -18,15 +18,15 @@ metadata:
   name: containerattachedcluster-${uniqueId}
 spec:
   # The resourceID needs to match the name of the eks cluster to be attached
-  resourceID: kcc-attached-cluster
+  resourceID: kcc-attached-cluster-127
   location: us-west1
   projectRef:
     external: ${KCC_ATTACHED_CLUSTER_TEST_PROJECT}
   description: "Test attached cluster update"
   distribution: "eks"
   oidcConfig:
-    issuerUrl: https://oidc.eks.us-west-2.amazonaws.com/id/17F5DD7A27C5CA2B2B626B94C0752B37
-  platformVersion: 1.25.0-gke.5
+    issuerUrl: https://oidc.eks.us-west-2.amazonaws.com/id/A115FE1C770C2452C75219524036FC0F
+  platformVersion: 1.27.0-gke.2
   fleet:
     projectRef:
       name: project-${uniqueId}

diff --git a/...reference/generated/resource-docs/containerattached/containerattachedcluster.md b/...reference/generated/resource-docs/containerattached/containerattachedcluster.md
@@ -23,7 +23,7 @@ Note: Before using this resource, make sure you review and complete the steps in
 </tr>
 <tr>
 <td>{{gcp_name_short}} Service Documentation</td>
-<td><a href="/anthos/cluster/docs/multi-cloud/attached">/anthos/clusters/docs/multi-cloud/attached</a></td>
+<td><a href="/anthos/clusters/docs/multi-cloud/attached">/anthos/clusters/docs/multi-cloud/attached</a></td>
 </tr>
 <tr>
 <td>{{gcp_name_short}} REST Resource Name</td>

diff --git a/...google3-docs/resource-reference/templates/containerattached_containerattachedcluster.tmpl b/...google3-docs/resource-reference/templates/containerattached_containerattachedcluster.tmpl
@@ -22,7 +22,7 @@ Note: Before using this resource, make sure you review and complete the steps in
 </tr>
 <tr>
 <td>{{"{{gcp_name_short}}"}} Service Documentation</td>
-<td><a href="/anthos/cluster/docs/multi-cloud/attached">/anthos/clusters/docs/multi-cloud/attached</a></td>
+<td><a href="/anthos/clusters/docs/multi-cloud/attached">/anthos/clusters/docs/multi-cloud/attached</a></td>
 </tr>
 <tr>
 <td>{{"{{gcp_name_short}}"}} REST Resource Name</td>