Refactor example and override doc to not require container field

Author: jhlodin

src/current/v26.1/cockroachdb-operator-performance.md

@@ -179,12 +179,10 @@ cockroachdb:
   crdbCluster:
     podTemplate:
       spec:
-        containers:
-        - name: cockroachdb
-          resources:
-            requests:
-              cpu: 3500m
-              memory: 12300Mi
+        resources:
+          requests:
+            cpu: 3500m
+            memory: 12300Mi
 ~~~
 
 When you initialize the cluster, check that all the CockroachDB pods are scheduled successfully. If you see any get stuck in the pending state, run `kubectl describe pod {podname}` and check the `Events` for information about why they're still pending. You may need to manually preempt pods on one or more nodes by running `kubectl delete pod` on them to make room for the CockroachDB pods. As long as the pods you delete were created by a higher-level Kubernetes object such as a `Deployment`, they'll be safely recreated on another node.
@@ -200,14 +198,12 @@ cockroachdb:
   crdbCluster:
     podTemplate:
       spec:
-        containers:
-        - name: cockroachdb
-          resources:
-            requests:
-              cpu: 3500m
-              memory: 12300Mi
-            limits:
-              memory: 12300Mi
+        resources:
+          requests:
+            cpu: 3500m
+            memory: 12300Mi
+          limits:
+            memory: 12300Mi
 ~~~
 
 Pods will be limited to their reserved resources and are unlikely to be preempted, except in rare cases. This will not improve performance on an underutilized Kubernetes cluster, but provides more predictable performance as other workloads run.

src/current/v26.1/configure-cockroachdb-operator.md

@@ -27,22 +27,20 @@ You can set the CPU and memory resources allocated to the CockroachDB container
 1 CPU in Kubernetes is equivalent to 1 vCPU or 1 hyperthread. For best practices on provisioning CPU and memory for CockroachDB, refer to the [Production Checklist]({% link {{ page.version.version }}/recommended-production-settings.md %}#hardware).
 {{site.data.alerts.end}}
 
-Specify CPU and memory values in `cockroachdb.crdbCluster.podTemplate.spec.containers.resources.limits` and `cockroachdb.crdbCluster.podTemplate.spec.containers.resources.requests` in the values file used to [deploy the cluster]({% link {{ page.version.version }}/deploy-cockroachdb-with-cockroachdb-operator.md %}#initialize-the-cluster):
+Specify CPU and memory values in `cockroachdb.crdbCluster.podTemplate.spec.resources.limits` and `cockroachdb.crdbCluster.podTemplate.spec.resources.requests` in the values file used to [deploy the cluster]({% link {{ page.version.version }}/deploy-cockroachdb-with-cockroachdb-operator.md %}#initialize-the-cluster):
 
 ~~~ yaml
 cockroachdb:
   crdbCluster:
     podTemplate:
       spec:
-        containers:
-        - name: cockroachdb
-          resources:
-            limits:
-              cpu: 4000m
-              memory: 16Gi
-            requests:
-              cpu: 4000m
-              memory: 16gi
+        resources:
+          limits:
+            cpu: 4000m
+            memory: 16Gi
+          requests:
+            cpu: 4000m
+            memory: 16gi
 ~~~
 
 Apply the new settings to the cluster:

src/current/v26.1/deploy-cockroachdb-with-cockroachdb-operator.md

@@ -252,22 +252,20 @@ For bare metal deployments, the specific Kubernetes infrastructure deployment st
     If you intend to deploy CockroachDB nodes across multiple different regions, follow the additional steps described in [Deploy across multiple regions](#deploy-across-multiple-regions).
     {{site.data.alerts.callout_end}}
 
-1. Modify `cockroachdb.crdbCluster.podTemplate.spec.containers.resources` in the values file with the CPU and memory limits and requests for each node to use. For example, to define default values of 4vCPU and 16GiB of memory:
+1. Modify `cockroachdb.crdbCluster.podTemplate.spec.resources` in the values file with the CPU and memory limits and requests for each node to use. For example, to define default values of 4vCPU and 16GiB of memory:
 
     ~~~ yaml
     cockroachdb:
       crdbCluster:
         podTemplate:
           spec:
-            containers:
-            - name: cockroachdb
-              resources:
-                limits:
-                  cpu: 4000m
-                  memory: 16Gi
-                requests:
-                  cpu: 4000m
-                  memory: 16gi
+            resources:
+              limits:
+                cpu: 4000m
+                memory: 16Gi
+              requests:
+                cpu: 4000m
+                memory: 16gi
     ~~~
 
     For more information on configuring node resource allocation, refer to [Resource management]({% link {{ page.version.version }}/configure-cockroachdb-operator.md %})

src/current/v26.1/override-templates-cockroachdb-operator.md

@@ -24,6 +24,8 @@ This page describes advanced configurations that override the supported default
 
 The `cockroachdb.crdbCluster.podTemplate` field allows you to override the default pod metadata and specification configured by the {{ site.data.products.cockroachdb-operator }}. The values in this field are merged with the default pod specification, where settings in `podTemplate` override any values in the default.
 
+The `podTemplate` field includes a `containers` field that specifies the container name and image that the template is applied to. By default, this resolves to the `cockroachdb` container name and can be excluded from modifications to the CockroachDB pod template YAML. For advanced configurations, you may need to provide specific images for the `containers` and `initContainers`. For example, the following `podTemplate` configuration specifies a default `cockroachdb/cockroach:v25.4.0` container image:
+
 ~~~ yaml
 cockroachdb:
   crdbCluster:
@@ -35,7 +37,7 @@ cockroachdb:
         # initContainers captures the list of init containers for CockroachDB pods.
         initContainers:
           - name : cockroachdb-init
-            image: us-docker.pkg.dev/cockroach-cloud-images/data-plane/init-container@sha256:c3e4ba851802a429c7f76c639a64b9152d206cebb31162c1760f05e98f7c4254
+            image: us-docker.pkg.dev/cockroach-cloud-images/data-plane/init-container@sha256:example1234567890abcdefghijklmnopqrstuvwxyz
         # containers captures the list of containers for CockroachDB pods.
         containers:
           - name: cockroachdb
@@ -44,30 +46,6 @@ cockroachdb:
         imagePullSecrets: []
 ~~~
 
-At least one value for `containers` must be specified if any part of `podTemplate` is being modified. For example, the following `podTemplate` configuration specifies a default `cockroachdb/cockroach:v25.4.0` container image:
-
-~~~ yaml
-cockroachdb:
-  crdbCluster:
-    podTemplate:
-       spec:
-         affinity:
-           podAntiAffinity: 
-               preferredDuringSchedulingIgnoredDuringExecution:
-               - weight: 100
-                 podAffinityTerm:
-                   labelSelector:
-                     matchExpressions:
-                       - key: app.kubernetes.io/component
-                         operator: In
-                         values:
-                           - cockroachdb
-                   topologyKey: kubernetes.io/hostname
-         containers:
-           - name: cockroachdb
-             image: cockroachdb/cockroach:v25.4.0
-~~~
-
 ## Override the default `cockroach start` flags
 
 The `cockroachdb.crdbCluster.startFlags` field allows you to customize the [`cockroach start` flags]({% link {{ page.version.version }}/cockroach-start.md %}#flags) used when initializing the CockroachDB cluster.