Add observed fields for ContainerCluster, ContainerNodepool and Redis…

…Instance

config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_containerclusters.container.cnrm.cloud.google.com.yaml

@@ -1808,6 +1808,24 @@ spec:
                   current reported status reflects the most recent desired state of
                   the resource.
                 type: integer
+              observedState:
+                description: The observed state of the underlying GCP resource.
+                properties:
+                  masterAuth:
+                    description: DEPRECATED. Basic authentication was removed for
+                      GKE cluster versions >= 1.19. The authentication information
+                      for accessing the Kubernetes master. Some values in this block
+                      are only returned by the API if your service account has permission
+                      to get credentials for your GKE cluster. If you see an unexpected
+                      diff unsetting your client cert, ensure you have the container.clusters.getCredentials
+                      permission.
+                    properties:
+                      clientCertificate:
+                        description: Base64 encoded public certificate used by clients
+                          to authenticate to the cluster endpoint.
+                        type: string
+                    type: object
+                type: object
               operation:
                 type: string
               selfLink:

config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_containernodepools.container.cnrm.cloud.google.com.yaml

@@ -898,6 +898,12 @@ spec:
                   current reported status reflects the most recent desired state of
                   the resource.
                 type: integer
+              observedState:
+                description: The observed state of the underlying GCP resource.
+                properties:
+                  version:
+                    type: string
+                type: object
               operation:
                 type: string
             type: object

config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_redisinstances.redis.cnrm.cloud.google.com.yaml

@@ -451,6 +451,14 @@ spec:
                   current reported status reflects the most recent desired state of
                   the resource.
                 type: integer
+              observedState:
+                description: The observed state of the underlying GCP resource.
+                properties:
+                  authString:
+                    description: Output only. AUTH String set on the instance. This
+                      field will only be populated if auth_enabled is true.
+                    type: string
+                type: object
               persistenceIamIdentity:
                 description: |-
                   Output only. Cloud IAM identity used by import / export operations

config/servicemappings/container.yaml

@@ -40,6 +40,8 @@ spec:
         - remove_default_node_pool
       mutableButUnreadableFields:
         - min_master_version
+      observedFields:
+        - master_auth.client_certificate
       containers:
         - type: project
           tfField: project
@@ -128,6 +130,8 @@ spec:
         name: name
       resourceID:
         targetField: name
+      observedFields:
+        - version
       resourceReferences:
         - key: clusterRef
           tfField: cluster

config/servicemappings/redis.yaml

@@ -32,6 +32,8 @@ spec:
         labels: labels
       resourceID:
         targetField: name
+      observedFields:
+        - auth_string
       resourceReferences:
         - tfField: authorized_network
           description: |-

go.mod

@@ -187,7 +187,7 @@ require (
 	golang.org/x/crypto v0.14.0 // indirect
 	golang.org/x/mod v0.9.0 // indirect
 	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/term v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/tools v0.7.0 // indirect

scripts/generate-google3-docs/resource-reference/generated/resource-docs/container/containercluster.md

@@ -3830,6 +3830,9 @@ endpoint: string
 labelFingerprint: string
 masterVersion: string
 observedGeneration: integer
+observedState:
+  masterAuth:
+    clientCertificate: string
 operation: string
 selfLink: string
 servicesIpv4Cidr: string
@@ -3920,6 +3923,27 @@ tpuIpv4CidrBlock: string
             <p>{% verbatim %}ObservedGeneration is the generation of the resource that was most recently observed by the Config Connector controller. If this is equal to metadata.generation, then that means that the current reported status reflects the most recent desired state of the resource.{% endverbatim %}</p>
         </td>
     </tr>
+    <tr>
+        <td><code>observedState</code></td>
+        <td>
+            <p><code class="apitype">object</code></p>
+            <p>{% verbatim %}The observed state of the underlying GCP resource.{% endverbatim %}</p>
+        </td>
+    </tr>
+    <tr>
+        <td><code>observedState.masterAuth</code></td>
+        <td>
+            <p><code class="apitype">object</code></p>
+            <p>{% verbatim %}DEPRECATED. Basic authentication was removed for GKE cluster versions >= 1.19. The authentication information for accessing the Kubernetes master. Some values in this block are only returned by the API if your service account has permission to get credentials for your GKE cluster. If you see an unexpected diff unsetting your client cert, ensure you have the container.clusters.getCredentials permission.{% endverbatim %}</p>
+        </td>
+    </tr>
+    <tr>
+        <td><code>observedState.masterAuth.clientCertificate</code></td>
+        <td>
+            <p><code class="apitype">string</code></p>
+            <p>{% verbatim %}Base64 encoded public certificate used by clients to authenticate to the cluster endpoint.{% endverbatim %}</p>
+        </td>
+    </tr>
     <tr>
         <td><code>operation</code></td>
         <td>

scripts/generate-google3-docs/resource-reference/generated/resource-docs/container/containernodepool.md

@@ -1794,6 +1794,8 @@ instanceGroupUrls:
 managedInstanceGroupUrls:
 - string
 observedGeneration: integer
+observedState:
+  version: string
 operation: string
 ```
 
@@ -1888,6 +1890,20 @@ operation: string
             <p>{% verbatim %}ObservedGeneration is the generation of the resource that was most recently observed by the Config Connector controller. If this is equal to metadata.generation, then that means that the current reported status reflects the most recent desired state of the resource.{% endverbatim %}</p>
         </td>
     </tr>
+    <tr>
+        <td><code>observedState</code></td>
+        <td>
+            <p><code class="apitype">object</code></p>
+            <p>{% verbatim %}The observed state of the underlying GCP resource.{% endverbatim %}</p>
+        </td>
+    </tr>
+    <tr>
+        <td><code>observedState.version</code></td>
+        <td>
+            <p><code class="apitype">string</code></p>
+            <p>{% verbatim %}{% endverbatim %}</p>
+        </td>
+    </tr>
     <tr>
         <td><code>operation</code></td>
         <td>