Merge pull request #676 from openshift-bot/synchronize-upstream

OCPBUGS-76380: Synchronize From Upstream Repositories

Author: openshift-merge-bot[bot]

commitchecker.yaml

@@ -1,4 +1,4 @@
-expectedMergeBase: a307a6daf5c5b1bd78c75e0ed02aeaf5c7f9d94d
+expectedMergeBase: c16a97bc1853e36955b4e1825b8e8ecea565f69a
 upstreamBranch: main
 upstreamOrg: operator-framework
 upstreamRepo: operator-controller

go.mod

@@ -31,7 +31,7 @@ require (
 	github.com/stretchr/testify v1.11.1
 	go.podman.io/image/v5 v5.39.1
 	golang.org/x/exp v0.0.0-20260209203927-2842357ff358
-	golang.org/x/mod v0.33.0
+	golang.org/x/mod v0.34.0
 	golang.org/x/sync v0.20.0
 	golang.org/x/tools v0.42.0
 	helm.sh/helm/v3 v3.20.0

go.sum

@@ -610,8 +610,8 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
-golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
+golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
+golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

internal/operator-controller/rukpak/render/registryv1/generators/generators.go

@@ -671,19 +671,32 @@ func applyEnvironmentFromConfig(deployment *appsv1.Deployment, config *config.De
 	}
 }
 
-// applyVolumeConfig appends volumes to the deployment's pod spec.
-// This follows OLMv0 behavior:
+// applyVolumeConfig merges volumes into the deployment's pod spec.
+// Volumes from config override existing volumes with the same name.
+// This differs from OLMv0, which appends volumes without checking for duplicates:
 // https://github.com/operator-framework/operator-lifecycle-manager/blob/v0.39.0/pkg/controller/operators/olm/overrides/inject/inject.go#L104-L117
 func applyVolumeConfig(deployment *appsv1.Deployment, config *config.DeploymentConfig) {
 	if len(config.Volumes) == 0 {
 		return
 	}
 
-	deployment.Spec.Template.Spec.Volumes = append(deployment.Spec.Template.Spec.Volumes, config.Volumes...)
+	existingVolMap := make(map[string]int, len(deployment.Spec.Template.Spec.Volumes))
+	for i, vol := range deployment.Spec.Template.Spec.Volumes {
+		existingVolMap[vol.Name] = i
+	}
+
+	for _, configVol := range config.Volumes {
+		if idx, exists := existingVolMap[configVol.Name]; exists {
+			deployment.Spec.Template.Spec.Volumes[idx] = configVol
+		} else {
+			deployment.Spec.Template.Spec.Volumes = append(deployment.Spec.Template.Spec.Volumes, configVol)
+		}
+	}
 }
 
-// applyVolumeMountConfig appends volume mounts to all containers in the deployment.
-// This follows OLMv0 behavior:
+// applyVolumeMountConfig merges volume mounts into all containers in the deployment.
+// Volume mounts from config override existing volume mounts with the same name.
+// This differs from OLMv0, which appends volume mounts without checking for duplicates:
 // https://github.com/operator-framework/operator-lifecycle-manager/blob/v0.39.0/pkg/controller/operators/olm/overrides/inject/inject.go#L149-L165
 func applyVolumeMountConfig(deployment *appsv1.Deployment, config *config.DeploymentConfig) {
 	if len(config.VolumeMounts) == 0 {
@@ -692,7 +705,19 @@ func applyVolumeMountConfig(deployment *appsv1.Deployment, config *config.Deploy
 
 	for i := range deployment.Spec.Template.Spec.Containers {
 		container := &deployment.Spec.Template.Spec.Containers[i]
-		container.VolumeMounts = append(container.VolumeMounts, config.VolumeMounts...)
+
+		existingMountMap := make(map[string]int, len(container.VolumeMounts))
+		for idx, mount := range container.VolumeMounts {
+			existingMountMap[mount.Name] = idx
+		}
+
+		for _, configMount := range config.VolumeMounts {
+			if idx, exists := existingMountMap[configMount.Name]; exists {
+				container.VolumeMounts[idx] = configMount
+			} else {
+				container.VolumeMounts = append(container.VolumeMounts, configMount)
+			}
+		}
 	}
 }
 

internal/operator-controller/rukpak/render/registryv1/generators/generators_test.go

@@ -3085,6 +3085,205 @@ func Test_BundleCSVDeploymentGenerator_WithDeploymentConfig(t *testing.T) {
 				require.Equal(t, "existing_value", dep.Spec.Template.Spec.Containers[0].Env[0].Value)
 			},
 		},
+		{
+			name: "merges volumes from deployment config - overrides matching names",
+			bundle: &bundle.RegistryV1{
+				CSV: clusterserviceversion.Builder().
+					WithStrategyDeploymentSpecs(
+						v1alpha1.StrategyDeploymentSpec{
+							Name: "test-deployment",
+							Spec: appsv1.DeploymentSpec{
+								Template: corev1.PodTemplateSpec{
+									Spec: corev1.PodSpec{
+										Containers: []corev1.Container{
+											{Name: "manager"},
+										},
+										Volumes: []corev1.Volume{
+											{
+												Name: "bundle-emptydir-vol",
+												VolumeSource: corev1.VolumeSource{
+													EmptyDir: &corev1.EmptyDirVolumeSource{},
+												},
+											},
+											{
+												Name: "existing-vol",
+												VolumeSource: corev1.VolumeSource{
+													EmptyDir: &corev1.EmptyDirVolumeSource{},
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+					).Build(),
+			},
+			opts: render.Options{
+				InstallNamespace: "test-ns",
+				TargetNamespaces: []string{"test-ns"},
+				DeploymentConfig: &config.DeploymentConfig{
+					Volumes: []corev1.Volume{
+						{
+							Name: "bundle-emptydir-vol",
+							VolumeSource: corev1.VolumeSource{
+								ConfigMap: &corev1.ConfigMapVolumeSource{
+									LocalObjectReference: corev1.LocalObjectReference{
+										Name: "test-cm-vol",
+									},
+								},
+							},
+						},
+						{
+							Name: "config-secret-vol",
+							VolumeSource: corev1.VolumeSource{
+								Secret: &corev1.SecretVolumeSource{
+									SecretName: "test-secret-vol",
+								},
+							},
+						},
+					},
+				},
+			},
+			verify: func(t *testing.T, objs []client.Object) {
+				require.Len(t, objs, 1)
+				dep := objs[0].(*appsv1.Deployment)
+				volumes := dep.Spec.Template.Spec.Volumes
+
+				// Should have 3 volumes total:
+				// - bundle-emptydir-vol (overridden to ConfigMap)
+				// - existing-vol (unchanged)
+				// - config-secret-vol (new)
+				require.Len(t, volumes, 3)
+
+				// Verify bundle-emptydir-vol was overridden (now ConfigMap, not EmptyDir)
+				var bundleVol *corev1.Volume
+				for i := range volumes {
+					if volumes[i].Name == "bundle-emptydir-vol" {
+						bundleVol = &volumes[i]
+						break
+					}
+				}
+				require.NotNil(t, bundleVol, "bundle-emptydir-vol should exist")
+				require.NotNil(t, bundleVol.ConfigMap, "bundle-emptydir-vol should be ConfigMap")
+				require.Equal(t, "test-cm-vol", bundleVol.ConfigMap.Name)
+				require.Nil(t, bundleVol.EmptyDir, "bundle-emptydir-vol should not be EmptyDir")
+
+				// Verify existing-vol remains unchanged
+				var existingVol *corev1.Volume
+				for i := range volumes {
+					if volumes[i].Name == "existing-vol" {
+						existingVol = &volumes[i]
+						break
+					}
+				}
+				require.NotNil(t, existingVol, "existing-vol should exist")
+				require.NotNil(t, existingVol.EmptyDir, "existing-vol should still be EmptyDir")
+
+				// Verify config-secret-vol was added
+				var secretVol *corev1.Volume
+				for i := range volumes {
+					if volumes[i].Name == "config-secret-vol" {
+						secretVol = &volumes[i]
+						break
+					}
+				}
+				require.NotNil(t, secretVol, "config-secret-vol should exist")
+				require.NotNil(t, secretVol.Secret, "config-secret-vol should be Secret")
+				require.Equal(t, "test-secret-vol", secretVol.Secret.SecretName)
+			},
+		},
+		{
+			name: "merges volumeMounts from deployment config - overrides matching names",
+			bundle: &bundle.RegistryV1{
+				CSV: clusterserviceversion.Builder().
+					WithStrategyDeploymentSpecs(
+						v1alpha1.StrategyDeploymentSpec{
+							Name: "test-deployment",
+							Spec: appsv1.DeploymentSpec{
+								Template: corev1.PodTemplateSpec{
+									Spec: corev1.PodSpec{
+										Containers: []corev1.Container{
+											{
+												Name: "manager",
+												VolumeMounts: []corev1.VolumeMount{
+													{
+														Name:      "bundle-vol",
+														MountPath: "/old/path",
+													},
+													{
+														Name:      "existing-vol",
+														MountPath: "/existing/path",
+													},
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+					).Build(),
+			},
+			opts: render.Options{
+				InstallNamespace: "test-ns",
+				TargetNamespaces: []string{"test-ns"},
+				DeploymentConfig: &config.DeploymentConfig{
+					VolumeMounts: []corev1.VolumeMount{
+						{
+							Name:      "bundle-vol",
+							MountPath: "/new/path",
+						},
+						{
+							Name:      "config-vol",
+							MountPath: "/config/path",
+						},
+					},
+				},
+			},
+			verify: func(t *testing.T, objs []client.Object) {
+				require.Len(t, objs, 1)
+				dep := objs[0].(*appsv1.Deployment)
+				volumeMounts := dep.Spec.Template.Spec.Containers[0].VolumeMounts
+
+				// Should have 3 volume mounts total:
+				// - bundle-vol (overridden to /new/path)
+				// - existing-vol (unchanged)
+				// - config-vol (new)
+				require.Len(t, volumeMounts, 3)
+
+				// Verify bundle-vol was overridden
+				var bundleMount *corev1.VolumeMount
+				for i := range volumeMounts {
+					if volumeMounts[i].Name == "bundle-vol" {
+						bundleMount = &volumeMounts[i]
+						break
+					}
+				}
+				require.NotNil(t, bundleMount, "bundle-vol should exist")
+				require.Equal(t, "/new/path", bundleMount.MountPath, "bundle-vol mount path should be overridden")
+
+				// Verify existing-vol remains unchanged
+				var existingMount *corev1.VolumeMount
+				for i := range volumeMounts {
+					if volumeMounts[i].Name == "existing-vol" {
+						existingMount = &volumeMounts[i]
+						break
+					}
+				}
+				require.NotNil(t, existingMount, "existing-vol should exist")
+				require.Equal(t, "/existing/path", existingMount.MountPath)
+
+				// Verify config-vol was added
+				var configMount *corev1.VolumeMount
+				for i := range volumeMounts {
+					if volumeMounts[i].Name == "config-vol" {
+						configMount = &volumeMounts[i]
+						break
+					}
+				}
+				require.NotNil(t, configMount, "config-vol should exist")
+				require.Equal(t, "/config/path", configMount.MountPath)
+			},
+		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			objs, err := generators.BundleCSVDeploymentGenerator(tc.bundle, tc.opts)

vendor/modules.txt

@@ -1008,8 +1008,8 @@ golang.org/x/crypto/scrypt
 ## explicit; go 1.24.0
 golang.org/x/exp/maps
 golang.org/x/exp/slices
-# golang.org/x/mod v0.33.0
-## explicit; go 1.24.0
+# golang.org/x/mod v0.34.0
+## explicit; go 1.25.0
 golang.org/x/mod/internal/lazyregexp
 golang.org/x/mod/modfile
 golang.org/x/mod/module