Skip to content

Add versioned OVS security context defaults #2056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
slawqo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add versioned OVS security context defaults #2056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions api/bases/core.openstack.org_openstackversions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,8 @@ spec:
type: string
manilaSharev1:
type: string
ovnHardenedOVSSecurityContext:
type: string
rabbitmqVersion:
type: string
type: object
Expand Down Expand Up @@ -699,6 +701,8 @@ spec:
type: string
manilaSharev1:
type: string
ovnHardenedOVSSecurityContext:
type: string
rabbitmqVersion:
type: string
type: object
Expand Down
1 change: 1 addition & 0 deletions api/core/v1beta1/openstackversion_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ type ServiceDefaults struct {
RabbitmqVersion *string `json:"rabbitmqVersion,omitempty"`
GlanceLocationAPI *string `json:"glanceLocationAPI,omitempty"`
ManilaSharev1 *string `json:"manilaSharev1,omitempty"`
OVNHardenedOVSSecurityContext *string `json:"ovnHardenedOVSSecurityContext,omitempty"`
}

// OpenStackVersionStatus defines the observed state of OpenStackVersion
Expand Down
5 changes: 5 additions & 0 deletions api/core/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions config/crd/bases/core.openstack.org_openstackversions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,8 @@ spec:
type: string
manilaSharev1:
type: string
ovnHardenedOVSSecurityContext:
type: string
rabbitmqVersion:
type: string
type: object
Expand Down Expand Up @@ -699,6 +701,8 @@ spec:
type: string
manilaSharev1:
type: string
ovnHardenedOVSSecurityContext:
type: string
rabbitmqVersion:
type: string
type: object
Expand Down
9 changes: 9 additions & 0 deletions internal/openstack/ovn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,15 @@ func ReconcileOVNController(ctx context.Context, instance *corev1beta1.OpenStack
OVNController.Spec.OvsContainerImage = *version.Status.ContainerImages.OvnControllerOvsImage
OVNController.Spec.ExporterImage = *getImg(version.Status.ContainerImages.OpenstackNetworkExporterImage, &missingImageDefault)

if OVNController.GetAnnotations() == nil {
OVNController.SetAnnotations(make(map[string]string))
}
if version.Status.ServiceDefaults.OVNHardenedOVSSecurityContext != nil && *version.Status.ServiceDefaults.OVNHardenedOVSSecurityContext == "true" {
OVNController.GetAnnotations()[ovnv1.OVNHardenedOVSSecurityContextLabel] = "true"
} else {
OVNController.GetAnnotations()[ovnv1.OVNHardenedOVSSecurityContextLabel] = "false"
}

err := controllerutil.SetControllerReference(helper.GetBeforeObject(), OVNController, helper.GetScheme())
if err != nil {
return err
Expand Down
1 change: 1 addition & 0 deletions internal/openstack/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ func InitializeOpenStackVersionServiceDefaults(ctx context.Context) *corev1beta1
// NOTE: In 18 Manila creates sharev1 service and endpoints. From 19 do not create sharev1 anymore
// https://review.opendev.org/q/topic:%22remove-v1%22+and+project:openstack/manila
defaults.ManilaSharev1 = &trueString // all Manila deployments create sharev1 endpoints by default
defaults.OVNHardenedOVSSecurityContext = &trueString

versionString := "4.2"
defaults.RabbitmqVersion = &versionString // all new rabbitmq deployments will have rabbitmq-server 4.2 (FR5)
Expand Down
19 changes: 19 additions & 0 deletions test/functional/ctlplane/openstackversion_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (

corev1 "github.com/openstack-k8s-operators/openstack-operator/api/core/v1beta1"
dataplanev1 "github.com/openstack-k8s-operators/openstack-operator/api/dataplane/v1beta1"
ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1"
k8s_corev1 "k8s.io/api/core/v1"
k8s_errors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/types"
Expand Down Expand Up @@ -212,6 +213,7 @@ var _ = Describe("OpenStackOperator controller", func() {
testMariaDBImage := "foo/maria:0.0.2"
testMemcachedImage := "foo/memcached:0.0.2"
testKeystoneAPIImage := "foo/keystone:0.0.2"
legacyOVSHardenedSecurityContext := "false"

// a lightweight controlplane spec we'll use for minor update testing
// we are missing some test helpers to simulate ready state so once we have
Expand Down Expand Up @@ -330,6 +332,9 @@ var _ = Describe("OpenStackOperator controller", func() {
version.Status.ContainerImageVersionDefaults[initialVersion].MariadbImage = &testMariaDBImage
version.Status.ContainerImageVersionDefaults[initialVersion].InfraMemcachedImage = &testMemcachedImage
version.Status.ContainerImageVersionDefaults[initialVersion].KeystoneAPIImage = &testKeystoneAPIImage
version.Status.AvailableServiceDefaults[initialVersion] = &corev1.ServiceDefaults{
OVNHardenedOVSSecurityContext: &legacyOVSHardenedSecurityContext,
}
g.Expect(th.K8sClient.Status().Update(th.Ctx, version)).To(Succeed())

th.Logger.Info("Version injected", "on", names.OpenStackVersionName)
Expand Down Expand Up @@ -363,6 +368,7 @@ var _ = Describe("OpenStackOperator controller", func() {
g.Expect(*osversion.Status.ContainerImages.MariadbImage).Should(Equal(testMariaDBImage))
g.Expect(*osversion.Status.ContainerImages.InfraMemcachedImage).Should(Equal(testMemcachedImage))
g.Expect(*osversion.Status.ContainerImages.KeystoneAPIImage).Should(Equal(testKeystoneAPIImage))
g.Expect(*osversion.Status.ServiceDefaults.OVNHardenedOVSSecurityContext).Should(Equal("false"))

}, timeout, interval).Should(Succeed())

Expand All @@ -389,6 +395,13 @@ var _ = Describe("OpenStackOperator controller", func() {

SimulateControlplaneReady()

Eventually(func(g Gomega) {
ovnController := &ovnv1.OVNController{}
g.Expect(k8sClient.Get(ctx, names.OVNControllerName, ovnController)).To(Succeed())
g.Expect(ovnController.GetAnnotations()).To(HaveKeyWithValue(
ovnv1.OVNHardenedOVSSecurityContextLabel, "false"))
}, timeout, interval).Should(Succeed())

// verify that DeployedVersion is set on the OpenStackControlplane to the initialversion
Eventually(func(g Gomega) {
th.ExpectCondition(
Expand Down Expand Up @@ -468,6 +481,12 @@ var _ = Describe("OpenStackOperator controller", func() {
g.Expect(*osversion.Status.ContainerImages.MariadbImage).Should(Equal(targetMariaDBVersion))
g.Expect(*osversion.Status.ContainerImages.InfraMemcachedImage).Should(Equal(targetMemcachedVersion))
g.Expect(*osversion.Status.ContainerImages.KeystoneAPIImage).Should(Equal(targetKeystoneAPIVersion))
g.Expect(*osversion.Status.ServiceDefaults.OVNHardenedOVSSecurityContext).Should(Equal("true"))

ovnController := &ovnv1.OVNController{}
g.Expect(k8sClient.Get(ctx, names.OVNControllerName, ovnController)).To(Succeed())
g.Expect(ovnController.GetAnnotations()).To(HaveKeyWithValue(
ovnv1.OVNHardenedOVSSecurityContextLabel, "true"))

}, timeout, interval).Should(Succeed())

Expand Down