fix the golden files

Author: shreyaskm623

pkg/migrate/testdata/helm/allInput/values.yaml.golden

@@ -86,6 +86,18 @@ cockroachdb:
                 requests:
                   cpu: "1"
                   memory: 2Gi
+            initContainers:
+            - command:
+              - /bin/sh
+              - -c
+              - echo "Custom init container setup"; sleep 2
+              image: alpine:latest
+              imagePullPolicy: IfNotPresent
+              name: custom-init
+              resources:
+                requests:
+                  cpu: 100m
+                  memory: 64Mi
             nodeSelector:
               cloud.google.com/gke-nodepool: default-pool
             priorityClassName: crdb-critical
@@ -103,6 +115,13 @@ cockroachdb:
               maxSkew: 1
               topologyKey: topology.kubernetes.io/zone
               whenUnsatisfiable: ScheduleAnyway
+            volumes:
+            - configMap:
+                items:
+                - key: config.yaml
+                  path: custom-config.yaml
+                name: custom-config-map
+              name: custom-config
         regions:
         - cloudProvider: gcp
           code: us-central1
@@ -164,133 +183,6 @@ cockroachdb:
         maxSkew: 1
         topologyKey: topology.kubernetes.io/zone
         whenUnsatisfiable: ScheduleAnyway
-    dataStore:
-      volumeClaimTemplate:
-        metadata:
-          name: datadir
-        spec:
-          accessModes:
-          - ReadWriteOnce
-          resources:
-            requests:
-              storage: 100Gi
-          volumeMode: Filesystem
-    image:
-      name: cockroachdb/cockroach:v25.1.5
-    localityLabels:
-    - country
-    - region
-    loggingConfigMapName: cockroachdb-log-config
-    podLabels:
-      app.kubernetes.io/component: cockroachdb
-      app.kubernetes.io/instance: cockroachdb
-      app.kubernetes.io/name: cockroachdb
-    podTemplate:
-      metadata:
-        annotations:
-          crdb: is-cool
-        labels:
-          app.kubernetes.io/component: cockroachdb
-          app.kubernetes.io/instance: cockroachdb
-          app.kubernetes.io/name: cockroachdb
-      spec:
-        affinity:
-          podAntiAffinity:
-            preferredDuringSchedulingIgnoredDuringExecution:
-            - podAffinityTerm:
-                labelSelector:
-                  matchLabels:
-                    app.kubernetes.io/component: cockroachdb
-                    app.kubernetes.io/instance: cockroachdb
-                    app.kubernetes.io/name: cockroachdb
-                topologyKey: kubernetes.io/hostname
-              weight: 100
-        containers:
-        - env:
-          - name: STATEFULSET_NAME
-            value: cockroachdb
-          - name: STATEFULSET_FQDN
-            value: cockroachdb.default.svc.cluster.local
-          - name: COCKROACH_CHANNEL
-            value: kubernetes-helm
-          - name: GODEBUG
-            value: disablethp=1
-          - name: HOST_IP
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: status.hostIP
-          - name: GODEBUG
-            value: disablethp=1
-          image: cockroachdb/cockroach:v25.1.5
-          name: cockroachdb
-          resources:
-            limits:
-              cpu: "2"
-              memory: 4Gi
-            requests:
-              cpu: "1"
-              memory: 2Gi
-        initContainers:
-        - command:
-          - /bin/sh
-          - -c
-          - echo "Custom init container setup"; sleep 2
-          image: alpine:latest
-          imagePullPolicy: IfNotPresent
-          name: custom-init
-          resources:
-            requests:
-              cpu: 100m
-              memory: 64Mi
-        nodeSelector:
-          cloud.google.com/gke-nodepool: default-pool
-        priorityClassName: crdb-critical
-        terminationGracePeriodSeconds: 300
-        tolerations:
-        - effect: NoSchedule
-          key: non-crdb
-          operator: Exists
-        topologySpreadConstraints:
-        - labelSelector:
-            matchLabels:
-              app.kubernetes.io/component: cockroachdb
-              app.kubernetes.io/instance: cockroachdb
-              app.kubernetes.io/name: cockroachdb
-          maxSkew: 1
-          topologyKey: topology.kubernetes.io/zone
-          whenUnsatisfiable: ScheduleAnyway
-        volumes:
-        - configMap:
-            items:
-            - key: config.yaml
-              path: custom-config.yaml
-            name: custom-config-map
-          name: custom-config
-    regions:
-    - cloudProvider: gcp
-      code: us-central1
-      domain: ""
-      namespace: default
-      nodes: 3
-    service:
-      ports:
-        grpc:
-          port: 26258
-        http:
-          port: 8080
-        sql:
-          port: 26257
-    startFlags:
-      omit: null
-      upsert:
-      - --join=${STATEFULSET_NAME}-0.${STATEFULSET_FQDN}:26257,${STATEFULSET_NAME}-1.${STATEFULSET_FQDN}:26257,${STATEFULSET_NAME}-2.${STATEFULSET_FQDN}:26257
-      - --advertise-host=$(hostname).${STATEFULSET_FQDN}
-      - --certs-dir=/cockroach/cockroach-certs/
-      - --cache=25%
-      - --max-sql-memory=25%
-    virtualCluster:
-      mode: primary
   tls:
     enabled: true
     externalCertificates:

tests/e2e/migrate/public_operator_to_cockroach_enterprise_operator_test.go

@@ -173,6 +173,11 @@ func (o *PublicOperatorToCockroachEnterpriseOperator) TestDefaultMigration(t *te
 	// Verify priority class migration
 	verifyOperatorMigration(t, kubectlOptions, o.CustomResourceBuilder.Cr())
 
+	// Wait for ingress controller to sync the updated ingress configuration
+	// after Helm install modified the ingress resources
+	t.Log("Waiting for ingress controller to sync after migration")
+	time.Sleep(20 * time.Second)
+
 	testutil.TestIngressRoutingDirect(t, "ui.local.com")
 }
 

tests/e2e/operator/region.go

@@ -440,7 +440,6 @@ func (r *Region) CleanupResources(t *testing.T) {
 			"delete": {
 				"--wait",
 				"--debug",
-				"--no-hooks",
 			},
 		}
 		helmOptions := &helm.Options{
@@ -560,6 +559,7 @@ func UninstallCockroachDBEnterpriseOperator(t *testing.T, kubectlOptions *k8s.Ku
 	helm.Delete(t, operatorOpts, operatorReleaseName, true)
 	k8s.RunKubectl(t, kubectlOptions, "delete", "service", "cockroach-webhook-service")
 	k8s.RunKubectl(t, kubectlOptions, "delete", "validatingwebhookconfiguration", "cockroach-webhook-config")
+	k8s.RunKubectl(t, kubectlOptions, "delete", "mutatingwebhookconfiguration", "cockroach-mutating-webhook-config")
 	k8s.DeleteNamespace(t, kubectlOptions, kubectlOptions.Namespace)
 }
 

tests/testutil/migration/operator.go

@@ -2,13 +2,11 @@ package migration
 
 import (
 	"context"
-	"fmt"
 	"testing"
 	"time"
 
 	"github.com/cockroachdb/helm-charts/tests/testutil"
 	"github.com/gruntwork-io/terratest/modules/k8s"
-	"github.com/gruntwork-io/terratest/modules/retry"
 	"github.com/stretchr/testify/require"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -36,26 +34,13 @@ func (o *PublicOperator) InstallOperator(t *testing.T) {
 	t.Logf("Installing cockroach-operator")
 	k8s.KubectlApply(t, kubectlOptions, "https://raw.githubusercontent.com/cockroachdb/cockroach-operator/master/install/operator.yaml")
 
+	t.Log("Waiting for cockroach-operator to be ready")
 	// Sleep for 10 seconds to check for the deployment to be ready
 	time.Sleep(10 * time.Second)
 	waitForOperatorToBeReady(t)
 
-	t.Log("Waiting for cockroach-operator to be ready")
-	
-	// Wait for webhook service to be available in the target namespace
-	// The operator creates this service dynamically, so we need to wait for it
-	t.Log("Waiting for cockroach-webhook-service to be ready in namespace:", o.Namespace)
-	webhookKubectlOptions := k8s.NewKubectlOptions("", "", o.Namespace)
-	
-	// Use retry logic to wait for the webhook service to be created
-	retry.DoWithRetry(t, "wait-for-webhook-service", 60, 5*time.Second, func() (string, error) {
-		_, err := k8s.GetServiceE(t, webhookKubectlOptions, "cockroach-webhook-service")
-		if err != nil {
-			return "", fmt.Errorf("waiting for cockroach-webhook-service to be created: %v", err)
-		}
-		return "cockroach-webhook-service is ready", nil
-	})
-	
+	k8s.WaitUntilServiceAvailable(t, kubectlOptions, "cockroach-operator-webhook-service", 10, 10*time.Second)
+
 	t.Log("Installing crdbcluster custom resource")
 	if _, err := k8s.GetNamespaceE(t, k8s.NewKubectlOptions("", "", o.Namespace), o.Namespace); err != nil && apierrors.IsNotFound(err) {
 		k8s.CreateNamespace(t, k8s.NewKubectlOptions("", "", o.Namespace), o.Namespace)