Merge pull request #849 from stlaz/cacm_volume_name

openshift-merge-bot[bot] · web-flow · commit 3682ec8f87ff · 2024-01-31T19:46:28.000Z
CONSOLE-3912: OIDC: setup the volume name properly when custom CA is configured
diff --git a/pkg/console/subresource/deployment/deployment.go b/pkg/console/subresource/deployment/deployment.go
@@ -245,7 +245,7 @@ func withConsoleVolumes(
 	}
 
 	if authServerCAConfigMap != nil {
-		volumeConfig = append(volumeConfig, authServerCAVolumeConfig())
+		volumeConfig = append(volumeConfig, authServerCAVolumeConfig(authServerCAConfigMap.Name))
 	}
 
 	if sessionSecret != nil {
@@ -507,9 +507,9 @@ func oauthServingCertVolumeConfig() volumeConfig {
 	}
 }
 
-func authServerCAVolumeConfig() volumeConfig {
+func authServerCAVolumeConfig(cmName string) volumeConfig {
 	return volumeConfig{
-		name:        api.AuthServerCAFileName,
+		name:        cmName,
 		path:        api.AuthServerCAMountDir,
 		readOnly:    true,
 		isConfigMap: true,

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ func withConsoleVolumes(`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`if authServerCAConfigMap != nil {`
`248`		`- volumeConfig = append(volumeConfig, authServerCAVolumeConfig())`
	`248`	`+ volumeConfig = append(volumeConfig, authServerCAVolumeConfig(authServerCAConfigMap.Name))`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`if sessionSecret != nil {`
`@@ -507,9 +507,9 @@ func oauthServingCertVolumeConfig() volumeConfig {`
`507`	`507`	`}`
`508`	`508`	`}`
`509`	`509`
`510`		`-func authServerCAVolumeConfig() volumeConfig {`
	`510`	`+func authServerCAVolumeConfig(cmName string) volumeConfig {`
`511`	`511`	`return volumeConfig{`
`512`		`- name: api.AuthServerCAFileName,`
	`512`	`+ name: cmName,`
`513`	`513`	`path: api.AuthServerCAMountDir,`
`514`	`514`	`readOnly: true,`
`515`	`515`	`isConfigMap: true,`