Skip to content

[18.0-fr3] Check if OctaviaRsyslogImage is not nil #1504

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

Merged
openshift-merge-bot merged 1 commit into from
Jun 25, 2025
Merged

[18.0-fr3] Check if OctaviaRsyslogImage is not nil #1504

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
1 change: 0 additions & 1 deletion pkg/openstack/instanceha.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const (
)

func ReconcileInstanceHa(ctx context.Context, instance *corev1beta1.OpenStackControlPlane, version *corev1beta1.OpenStackVersion, helper *helper.Helper) (ctrl.Result, error) {
missingImageDefault := ""
customData := map[string]string{
InstanceHaImageKey: *getImg(version.Status.ContainerImages.OpenstackClientImage, &missingImageDefault),
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/openstack/octavia.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ func ReconcileOctavia(ctx context.Context, instance *corev1beta1.OpenStackContro
octavia.Spec.OctaviaHealthManager.ContainerImage = *version.Status.ContainerImages.OctaviaHealthmanagerImage
octavia.Spec.OctaviaHousekeeping.ContainerImage = *version.Status.ContainerImages.OctaviaHousekeepingImage
octavia.Spec.ApacheContainerImage = *version.Status.ContainerImages.OctaviaApacheImage
octavia.Spec.OctaviaRsyslog.ContainerImage = *version.Status.ContainerImages.OctaviaRsyslogImage
octavia.Spec.OctaviaRsyslog.ContainerImage = *getImg(version.Status.ContainerImages.OctaviaRsyslogImage, &missingImageDefault)
octavia.Spec.OctaviaRsyslog.InitContainerImage = *version.Status.ContainerImages.OctaviaHealthmanagerImage

if octavia.Spec.Secret == "" {
Expand Down
13 changes: 2 additions & 11 deletions pkg/openstack/telemetry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,17 +337,8 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
telemetry.Spec.Autoscaling.AutoscalingSpec.Aodh.NotifierImage = *version.Status.ContainerImages.AodhNotifierImage
telemetry.Spec.Autoscaling.AutoscalingSpec.Aodh.ListenerImage = *version.Status.ContainerImages.AodhListenerImage

if version.Status.ContainerImages.KsmImage != nil {
telemetry.Spec.Ceilometer.KSMImage = *version.Status.ContainerImages.KsmImage
} else {
telemetry.Spec.Ceilometer.KSMImage = ""
}

if version.Status.ContainerImages.CeilometerMysqldExporterImage != nil {
telemetry.Spec.Ceilometer.MysqldExporterImage = *version.Status.ContainerImages.CeilometerMysqldExporterImage
} else {
telemetry.Spec.Ceilometer.MysqldExporterImage = ""
}
telemetry.Spec.Ceilometer.KSMImage = *getImg(version.Status.ContainerImages.KsmImage, &missingImageDefault)
telemetry.Spec.Ceilometer.MysqldExporterImage = *getImg(version.Status.ContainerImages.CeilometerMysqldExporterImage, &missingImageDefault)

if telemetry.Spec.Ceilometer.Secret == "" {
telemetry.Spec.Ceilometer.Secret = instance.Spec.Secret
Expand Down
1 change: 0 additions & 1 deletion pkg/openstack/test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ const (
)

func ReconcileTest(ctx context.Context, instance *corev1beta1.OpenStackControlPlane, version *corev1beta1.OpenStackVersion, helper *helper.Helper) (ctrl.Result, error) {
missingImageDefault := ""
customData := map[string]string{
TempestImageKey: *getImg(version.Status.ContainerImages.TestTempestImage, &missingImageDefault),
TobikoImageKey: *getImg(version.Status.ContainerImages.TestTobikoImage, &missingImageDefault),
Expand Down
4 changes: 4 additions & 0 deletions pkg/openstack/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ import (
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
)

var (
missingImageDefault string
)

// InitializeOpenStackVersionImageDefaults - initializes OpenStackVersion CR with default container images
func InitializeOpenStackVersionImageDefaults(ctx context.Context, envImages map[string]*string) *corev1beta1.ContainerDefaults {
Log := GetLogger(ctx)
Expand Down