Skip to content

Commit e97e69c

Browse files
committed
Add versioned OVS security context defaults
Propagate the OVN hardened OVS security context annotation from OpenStackVersion service defaults to OVNController. This defers the security context transition until the normal minor update workflow. Depends-On: openstack-k8s-operators/ovn-operator#616 Related: OSPRH-34172 Assisted-By: GPT-5.6 Terra Signed-off-by: Slawek Kaplonski <skaplons@redhat.com>
1 parent 58a1de8 commit e97e69c

8 files changed

Lines changed: 47 additions & 0 deletions

File tree

‎api/bases/core.openstack.org_openstackversions.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,8 @@ spec:
266266
type: string
267267
neutronWsgi:
268268
type: string
269+
ovnHardenedOVSSecurityContext:
270+
type: string
269271
rabbitmqVersion:
270272
type: string
271273
type: object
@@ -717,6 +719,8 @@ spec:
717719
type: string
718720
neutronWsgi:
719721
type: string
722+
ovnHardenedOVSSecurityContext:
723+
type: string
720724
rabbitmqVersion:
721725
type: string
722726
type: object

‎api/core/v1beta1/openstackversion_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ type ServiceDefaults struct {
308308
ManilaSharev1 *string `json:"manilaSharev1,omitempty"`
309309
NeutronWsgi *string `json:"neutronWsgi,omitempty"`
310310
IronicInspectInterface *string `json:"ironicInspectInterface,omitempty"`
311+
OVNHardenedOVSSecurityContext *string `json:"ovnHardenedOVSSecurityContext,omitempty"`
311312
}
312313

313314
// OpenStackVersionStatus defines the observed state of OpenStackVersion

‎api/core/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bindata/crds/crds.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23152,6 +23152,8 @@ spec:
2315223152
type: string
2315323153
neutronWsgi:
2315423154
type: string
23155+
ovnHardenedOVSSecurityContext:
23156+
type: string
2315523157
rabbitmqVersion:
2315623158
type: string
2315723159
type: object
@@ -23603,6 +23605,8 @@ spec:
2360323605
type: string
2360423606
neutronWsgi:
2360523607
type: string
23608+
ovnHardenedOVSSecurityContext:
23609+
type: string
2360623610
rabbitmqVersion:
2360723611
type: string
2360823612
type: object

‎config/crd/bases/core.openstack.org_openstackversions.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,8 @@ spec:
266266
type: string
267267
neutronWsgi:
268268
type: string
269+
ovnHardenedOVSSecurityContext:
270+
type: string
269271
rabbitmqVersion:
270272
type: string
271273
type: object
@@ -717,6 +719,8 @@ spec:
717719
type: string
718720
neutronWsgi:
719721
type: string
722+
ovnHardenedOVSSecurityContext:
723+
type: string
720724
rabbitmqVersion:
721725
type: string
722726
type: object

‎internal/openstack/ovn.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,15 @@ func ReconcileOVNController(ctx context.Context, instance *corev1beta1.OpenStack
514514
OVNController.Spec.OvsContainerImage = *version.Status.ContainerImages.OvnControllerOvsImage
515515
OVNController.Spec.ExporterImage = *getImg(version.Status.ContainerImages.OpenstackNetworkExporterImage, &missingImageDefault)
516516

517+
if OVNController.GetAnnotations() == nil {
518+
OVNController.SetAnnotations(make(map[string]string))
519+
}
520+
if version.Status.ServiceDefaults.OVNHardenedOVSSecurityContext != nil && *version.Status.ServiceDefaults.OVNHardenedOVSSecurityContext == "true" {
521+
OVNController.GetAnnotations()[ovnv1.OVNHardenedOVSSecurityContextLabel] = "true"
522+
} else {
523+
OVNController.GetAnnotations()[ovnv1.OVNHardenedOVSSecurityContextLabel] = "false"
524+
}
525+
517526
err := controllerutil.SetControllerReference(helper.GetBeforeObject(), OVNController, helper.GetScheme())
518527
if err != nil {
519528
return err

‎internal/openstack/version.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ func InitializeOpenStackVersionServiceDefaults(ctx context.Context) *corev1beta1
239239
// NOTE: In 18 Manila creates sharev1 service and endpoints. From 19 do not create sharev1 anymore
240240
// https://review.opendev.org/q/topic:%22remove-v1%22+and+project:openstack/manila
241241
defaults.ManilaSharev1 = ptr.To("false")
242+
defaults.OVNHardenedOVSSecurityContext = &trueString
242243

243244
versionString := "4.2"
244245
defaults.RabbitmqVersion = &versionString // all new rabbitmq deployments will have rabbitmq-server 4.2 (FR5)

‎test/functional/ctlplane/openstackversion_controller_test.go‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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

Comments
 (0)