@@ -30,6 +30,7 @@ import (
3030
3131 corev1 "github.com/openstack-k8s-operators/openstack-operator/api/core/v1beta1"
3232 dataplanev1 "github.com/openstack-k8s-operators/openstack-operator/api/dataplane/v1beta1"
33+ ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1"
3334 k8s_corev1 "k8s.io/api/core/v1"
3435 k8s_errors "k8s.io/apimachinery/pkg/api/errors"
3536 "k8s.io/apimachinery/pkg/types"
@@ -212,6 +213,7 @@ var _ = Describe("OpenStackVersion controller", func() {
212213 testMariaDBImage := "foo/maria:0.0.2"
213214 testMemcachedImage := "foo/memcached:0.0.2"
214215 testKeystoneAPIImage := "foo/keystone:0.0.2"
216+ legacyOVSHardenedSecurityContext := "false"
215217
216218 // a lightweight controlplane spec we'll use for minor update testing
217219 // we are missing some test helpers to simulate ready state so once we have
@@ -330,6 +332,9 @@ var _ = Describe("OpenStackVersion controller", func() {
330332 version .Status .ContainerImageVersionDefaults [initialVersion ].MariadbImage = & testMariaDBImage
331333 version .Status .ContainerImageVersionDefaults [initialVersion ].InfraMemcachedImage = & testMemcachedImage
332334 version .Status .ContainerImageVersionDefaults [initialVersion ].KeystoneAPIImage = & testKeystoneAPIImage
335+ version .Status .AvailableServiceDefaults [initialVersion ] = & corev1.ServiceDefaults {
336+ OVNHardenedOVSSecurityContext : & legacyOVSHardenedSecurityContext ,
337+ }
333338 g .Expect (th .K8sClient .Status ().Update (th .Ctx , version )).To (Succeed ())
334339
335340 th .Logger .Info ("Version injected" , "on" , names .OpenStackVersionName )
@@ -363,6 +368,7 @@ var _ = Describe("OpenStackVersion controller", func() {
363368 g .Expect (* osversion .Status .ContainerImages .MariadbImage ).Should (Equal (testMariaDBImage ))
364369 g .Expect (* osversion .Status .ContainerImages .InfraMemcachedImage ).Should (Equal (testMemcachedImage ))
365370 g .Expect (* osversion .Status .ContainerImages .KeystoneAPIImage ).Should (Equal (testKeystoneAPIImage ))
371+ g .Expect (* osversion .Status .ServiceDefaults .OVNHardenedOVSSecurityContext ).Should (Equal ("false" ))
366372
367373 }, timeout , interval ).Should (Succeed ())
368374
@@ -389,6 +395,13 @@ var _ = Describe("OpenStackVersion controller", func() {
389395
390396 SimulateControlplaneReady ()
391397
398+ Eventually (func (g Gomega ) {
399+ ovnController := & ovnv1.OVNController {}
400+ g .Expect (k8sClient .Get (ctx , names .OVNControllerName , ovnController )).To (Succeed ())
401+ g .Expect (ovnController .GetAnnotations ()).To (HaveKeyWithValue (
402+ ovnv1 .OVNHardenedOVSSecurityContextLabel , "false" ))
403+ }, timeout , interval ).Should (Succeed ())
404+
392405 // verify that DeployedVersion is set on the OpenStackControlplane to the initialversion
393406 Eventually (func (g Gomega ) {
394407 th .ExpectCondition (
@@ -468,6 +481,12 @@ var _ = Describe("OpenStackVersion controller", func() {
468481 g .Expect (* osversion .Status .ContainerImages .MariadbImage ).Should (Equal (targetMariaDBVersion ))
469482 g .Expect (* osversion .Status .ContainerImages .InfraMemcachedImage ).Should (Equal (targetMemcachedVersion ))
470483 g .Expect (* osversion .Status .ContainerImages .KeystoneAPIImage ).Should (Equal (targetKeystoneAPIVersion ))
484+ g .Expect (* osversion .Status .ServiceDefaults .OVNHardenedOVSSecurityContext ).Should (Equal ("true" ))
485+
486+ ovnController := & ovnv1.OVNController {}
487+ g .Expect (k8sClient .Get (ctx , names .OVNControllerName , ovnController )).To (Succeed ())
488+ g .Expect (ovnController .GetAnnotations ()).To (HaveKeyWithValue (
489+ ovnv1 .OVNHardenedOVSSecurityContextLabel , "true" ))
471490
472491 }, timeout , interval ).Should (Succeed ())
473492
0 commit comments