Skip to content

Commit f47d2d8

Browse files
jlarribajlarriba
committed
Fix errors with image names
1 parent 52f4f07 commit f47d2d8

File tree

8 files changed

+17
-16
lines changed

8 files changed

+17
-16
lines changed

‎apis/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16435,7 +16435,7 @@ spec:
1643516435
type: object
1643616436
cloudkittyAPIImage:
1643716437
type: string
16438-
cloudkittyProcImage:
16438+
cloudkittyProcessorImage:
1643916439
type: string
1644016440
designateAPIImage:
1644116441
type: string

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ spec:
8585
type: object
8686
cloudkittyAPIImage:
8787
type: string
88-
cloudkittyProcImage:
88+
cloudkittyProcessorImage:
8989
type: string
9090
designateAPIImage:
9191
type: string
@@ -321,7 +321,7 @@ spec:
321321
type: string
322322
cloudkittyAPIImage:
323323
type: string
324-
cloudkittyProcImage:
324+
cloudkittyProcessorImage:
325325
type: string
326326
designateAPIImage:
327327
type: string
@@ -521,7 +521,7 @@ spec:
521521
type: object
522522
cloudkittyAPIImage:
523523
type: string
524-
cloudkittyProcImage:
524+
cloudkittyProcessorImage:
525525
type: string
526526
designateAPIImage:
527527
type: string

‎apis/core/v1beta1/openstackversion_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ type ContainerTemplate struct {
9696
CinderBackupImage *string `json:"cinderBackupImage,omitempty"`
9797
CinderSchedulerImage *string `json:"cinderSchedulerImage,omitempty"`
9898
CloudKittyAPIImage *string `json:"cloudkittyAPIImage,omitempty"`
99-
CloudKittyProcImage *string `json:"cloudkittyProcImage,omitempty"`
99+
CloudKittyProcessorImage *string `json:"cloudkittyProcessorImage,omitempty"`
100100
DesignateAPIImage *string `json:"designateAPIImage,omitempty"`
101101
DesignateBackendbind9Image *string `json:"designateBackendbind9Image,omitempty"`
102102
DesignateCentralImage *string `json:"designateCentralImage,omitempty"`

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16435,7 +16435,7 @@ spec:
1643516435
type: object
1643616436
cloudkittyAPIImage:
1643716437
type: string
16438-
cloudkittyProcImage:
16438+
cloudkittyProcessorImage:
1643916439
type: string
1644016440
designateAPIImage:
1644116441
type: string

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ spec:
8585
type: object
8686
cloudkittyAPIImage:
8787
type: string
88-
cloudkittyProcImage:
88+
cloudkittyProcessorImage:
8989
type: string
9090
designateAPIImage:
9191
type: string
@@ -321,7 +321,7 @@ spec:
321321
type: string
322322
cloudkittyAPIImage:
323323
type: string
324-
cloudkittyProcImage:
324+
cloudkittyProcessorImage:
325325
type: string
326326
designateAPIImage:
327327
type: string
@@ -521,7 +521,7 @@ spec:
521521
type: object
522522
cloudkittyAPIImage:
523523
type: string
524-
cloudkittyProcImage:
524+
cloudkittyProcessorImage:
525525
type: string
526526
designateAPIImage:
527527
type: string

‎pkg/openstack/telemetry.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
5353
instance.Status.ContainerImages.AodhNotifierImage = nil
5454
instance.Status.ContainerImages.AodhListenerImage = nil
5555
instance.Status.ContainerImages.CloudKittyAPIImage = nil
56-
instance.Status.ContainerImages.CloudKittyProcImage = nil
56+
instance.Status.ContainerImages.CloudKittyProcessorImage = nil
5757
return ctrl.Result{}, nil
5858
}
5959

@@ -383,6 +383,7 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
383383

384384
telemetry.Spec.Ceilometer.Enabled = ptr.To(*instance.Spec.Telemetry.Template.Ceilometer.Enabled)
385385
telemetry.Spec.Autoscaling.Enabled = ptr.To(*instance.Spec.Telemetry.Template.Autoscaling.Enabled)
386+
telemetry.Spec.CloudKitty.Enabled = ptr.To(*instance.Spec.Telemetry.Template.CloudKitty.Enabled)
386387

387388
telemetry.Spec.Ceilometer.CentralImage = *version.Status.ContainerImages.CeilometerCentralImage
388389
telemetry.Spec.Ceilometer.ComputeImage = *version.Status.ContainerImages.CeilometerComputeImage
@@ -398,7 +399,7 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
398399
telemetry.Spec.Ceilometer.KSMImage = *getImg(version.Status.ContainerImages.KsmImage, &missingImageDefault)
399400
telemetry.Spec.Ceilometer.MysqldExporterImage = *getImg(version.Status.ContainerImages.CeilometerMysqldExporterImage, &missingImageDefault)
400401
telemetry.Spec.CloudKitty.CloudKittyAPI.ContainerImage = *getImg(version.Status.ContainerImages.CloudKittyAPIImage, &missingImageDefault)
401-
telemetry.Spec.CloudKitty.CloudKittyProc.ContainerImage = *getImg(version.Status.ContainerImages.CloudKittyProcImage, &missingImageDefault)
402+
telemetry.Spec.CloudKitty.CloudKittyProc.ContainerImage = *getImg(version.Status.ContainerImages.CloudKittyProcessorImage, &missingImageDefault)
402403

403404
if telemetry.Spec.Ceilometer.Secret == "" {
404405
telemetry.Spec.Ceilometer.Secret = instance.Spec.Secret
@@ -450,7 +451,7 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
450451
instance.Status.ContainerImages.AodhNotifierImage = version.Status.ContainerImages.AodhNotifierImage
451452
instance.Status.ContainerImages.AodhListenerImage = version.Status.ContainerImages.AodhListenerImage
452453
instance.Status.ContainerImages.CloudKittyAPIImage = version.Status.ContainerImages.CloudKittyAPIImage
453-
instance.Status.ContainerImages.CloudKittyProcImage = version.Status.ContainerImages.CloudKittyProcImage
454+
instance.Status.ContainerImages.CloudKittyProcessorImage = version.Status.ContainerImages.CloudKittyProcessorImage
454455
instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneTelemetryReadyCondition, corev1beta1.OpenStackControlPlaneTelemetryReadyMessage)
455456
} else {
456457
// We want to mirror the condition of the highest priority from the Telemetry resource into the instance
@@ -491,7 +492,7 @@ func TelemetryImageMatch(ctx context.Context, controlPlane *corev1beta1.OpenStac
491492
!stringPointersEqual(controlPlane.Status.ContainerImages.AodhNotifierImage, version.Status.ContainerImages.AodhNotifierImage) ||
492493
!stringPointersEqual(controlPlane.Status.ContainerImages.AodhListenerImage, version.Status.ContainerImages.AodhListenerImage) ||
493494
!stringPointersEqual(controlPlane.Status.ContainerImages.CloudKittyAPIImage, version.Status.ContainerImages.CloudKittyAPIImage) ||
494-
!stringPointersEqual(controlPlane.Status.ContainerImages.CloudKittyProcImage, version.Status.ContainerImages.CloudKittyProcImage) {
495+
!stringPointersEqual(controlPlane.Status.ContainerImages.CloudKittyProcessorImage, version.Status.ContainerImages.CloudKittyProcessorImage) {
495496
Log.Info("Telemetry images do not match")
496497
return false
497498
}

‎pkg/openstack/version.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1
132132
CinderBackupImage: getImg(instance.Spec.CustomContainerImages.CinderBackupImage, defaults.CinderBackupImage),
133133
CinderSchedulerImage: getImg(instance.Spec.CustomContainerImages.CinderSchedulerImage, defaults.CinderSchedulerImage),
134134
CloudKittyAPIImage: getImg(instance.Spec.CustomContainerImages.CloudKittyAPIImage, defaults.CloudKittyAPIImage),
135-
CloudKittyProcImage: getImg(instance.Spec.CustomContainerImages.CloudKittyProcImage, defaults.CloudKittyProcImage),
135+
CloudKittyProcessorImage: getImg(instance.Spec.CustomContainerImages.CloudKittyProcessorImage, defaults.CloudKittyProcessorImage),
136136
DesignateAPIImage: getImg(instance.Spec.CustomContainerImages.DesignateAPIImage, defaults.DesignateAPIImage),
137137
DesignateBackendbind9Image: getImg(instance.Spec.CustomContainerImages.DesignateBackendbind9Image, defaults.DesignateBackendbind9Image),
138138
DesignateCentralImage: getImg(instance.Spec.CustomContainerImages.DesignateCentralImage, defaults.DesignateCentralImage),

0 commit comments

Comments
 (0)