@@ -1048,7 +1048,7 @@ var _ = Describe("Keystone controller", func() {
10481048
10491049 j := th .GetJob (dbSyncJobName )
10501050 th .AssertVolumeExists (caBundleSecretName .Name , j .Spec .Template .Spec .Volumes )
1051- th .AssertVolumeMountExists (caBundleSecretName .Name , "tls-ca-bundle.pem" , j .Spec .Template .Spec .Containers [0 ].VolumeMounts )
1051+ th .AssertVolumeMountPathExists (caBundleSecretName .Name , "" , "tls-ca-bundle.pem" , j .Spec .Template .Spec .Containers [0 ].VolumeMounts )
10521052 })
10531053
10541054 It ("it creates bootstrap job with CA certs mounted" , func () {
@@ -1060,7 +1060,7 @@ var _ = Describe("Keystone controller", func() {
10601060
10611061 j := th .GetJob (bootstrapJobName )
10621062 th .AssertVolumeExists (caBundleSecretName .Name , j .Spec .Template .Spec .Volumes )
1063- th .AssertVolumeMountExists (caBundleSecretName .Name , "tls-ca-bundle.pem" , j .Spec .Template .Spec .Containers [0 ].VolumeMounts )
1063+ th .AssertVolumeMountPathExists (caBundleSecretName .Name , "" , "tls-ca-bundle.pem" , j .Spec .Template .Spec .Containers [0 ].VolumeMounts )
10641064 })
10651065
10661066 It ("should create a Secret for keystone.conf and my.cnf" , func () {
@@ -1099,15 +1099,15 @@ var _ = Describe("Keystone controller", func() {
10991099
11001100 // CA bundle
11011101 th .AssertVolumeExists (caBundleSecretName .Name , d .Spec .Template .Spec .Volumes )
1102- th .AssertVolumeMountExists (caBundleSecretName .Name , "tls-ca-bundle.pem" , container .VolumeMounts )
1102+ th .AssertVolumeMountPathExists (caBundleSecretName .Name , "" , "tls-ca-bundle.pem" , container .VolumeMounts )
11031103
11041104 // service certs
11051105 th .AssertVolumeExists (internalCertSecretName .Name , d .Spec .Template .Spec .Volumes )
11061106 th .AssertVolumeExists (publicCertSecretName .Name , d .Spec .Template .Spec .Volumes )
1107- th .AssertVolumeMountExists (publicCertSecretName .Name , "tls.key" , container .VolumeMounts )
1108- th .AssertVolumeMountExists (publicCertSecretName .Name , "tls.crt" , container .VolumeMounts )
1109- th .AssertVolumeMountExists (internalCertSecretName .Name , "tls.key" , container .VolumeMounts )
1110- th .AssertVolumeMountExists (internalCertSecretName .Name , "tls.crt" , container .VolumeMounts )
1107+ th .AssertVolumeMountPathExists (publicCertSecretName .Name , "" , "tls.key" , container .VolumeMounts )
1108+ th .AssertVolumeMountPathExists (publicCertSecretName .Name , "" , "tls.crt" , container .VolumeMounts )
1109+ th .AssertVolumeMountPathExists (internalCertSecretName .Name , "" , "tls.key" , container .VolumeMounts )
1110+ th .AssertVolumeMountPathExists (internalCertSecretName .Name , "" , "tls.crt" , container .VolumeMounts )
11111111
11121112 Expect (container .ReadinessProbe .HTTPGet .Scheme ).To (Equal (corev1 .URISchemeHTTPS ))
11131113 Expect (container .LivenessProbe .HTTPGet .Scheme ).To (Equal (corev1 .URISchemeHTTPS ))
@@ -1944,12 +1944,8 @@ OIDCRedirectURI "{{ .KeystoneEndpointPublic }}/v3/auth/OS-FEDERATION/websso/open
19441944 Expect (container .VolumeMounts ).To (HaveLen (6 ))
19451945 // Inspect VolumeMounts and make sure we have the Foo MountPath
19461946 // provided through extraMounts
1947- for _ , vm := range container .VolumeMounts {
1948- if vm .Name == "foo" {
1949- Expect (vm .MountPath ).To (
1950- ContainSubstring (keystoneExtraMountsPath ))
1951- }
1952- }
1947+ th .AssertVolumeMountPathExists ("foo" ,
1948+ keystoneExtraMountsPath , "" , container .VolumeMounts )
19531949 })
19541950 })
19551951 // Run MariaDBAccount suite tests. these are pre-packaged ginkgo tests
0 commit comments