Merge pull request #787 from dprince/missing_observed_generation_checks

openshift-merge-bot[bot] · web-flow · commit 84bbcef70073 · 2024-05-22T21:23:12.000Z
sub resource ready condition updates/fixes
diff --git a/apis/client/v1beta1/openstackclient_types.go b/apis/client/v1beta1/openstackclient_types.go
@@ -92,6 +92,11 @@ func init() {
 	SchemeBuilder.Register(&OpenStackClient{}, &OpenStackClientList{})
 }
 
+// IsReady - returns true if OpenStackClient is reconciled successfully
+func (instance OpenStackClient) IsReady() bool {
+	return instance.Status.Conditions.IsTrue(OpenStackClientReadyCondition)
+}
+
 // RbacConditionsSet - set the conditions for the rbac object
 func (instance OpenStackClient) RbacConditionsSet(c *condition.Condition) {
 	instance.Status.Conditions.Set(c)
diff --git a/pkg/openstack/designate.go b/pkg/openstack/designate.go
@@ -149,7 +149,7 @@ func ReconcileDesignate(ctx context.Context, instance *corev1beta1.OpenStackCont
 		helper.GetLogger().Info(fmt.Sprintf("Designate %s - %s", designate.Name, op))
 	}
 
-	if designate.IsReady() { //FIXME ObservedGeneration
+	if designate.Status.ObservedGeneration == designate.Generation && designate.IsReady() {
 		instance.Status.ContainerImages.DesignateAPIImage = version.Status.ContainerImages.DesignateAPIImage
 		instance.Status.ContainerImages.DesignateCentralImage = version.Status.ContainerImages.DesignateCentralImage
 		instance.Status.ContainerImages.DesignateMdnsImage = version.Status.ContainerImages.DesignateMdnsImage
diff --git a/pkg/openstack/dnsmasq.go b/pkg/openstack/dnsmasq.go
@@ -62,7 +62,7 @@ func ReconcileDNSMasqs(ctx context.Context, instance *corev1beta1.OpenStackContr
 		Log.Info(fmt.Sprintf("dnsmasq %s - %s", dnsmasq.Name, op))
 	}
 
-	if dnsmasq.IsReady() { // FIXME ObservedGeneration
+	if dnsmasq.Status.ObservedGeneration == dnsmasq.Generation && dnsmasq.IsReady() {
 		instance.Status.ContainerImages.InfraDnsmasqImage = version.Status.ContainerImages.InfraDnsmasqImage
 		instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneDNSReadyCondition, corev1beta1.OpenStackControlPlaneDNSReadyMessage)
 	} else {
diff --git a/pkg/openstack/galera.go b/pkg/openstack/galera.go
@@ -174,7 +174,7 @@ func reconcileGalera(
 		Log.Info(fmt.Sprintf("Galera %s - %s", galera.Name, op))
 	}
 
-	if galera.IsReady() { //FIXME ObservedGeneration
+	if galera.Status.ObservedGeneration == galera.Generation && galera.IsReady() {
 		instance.Status.ContainerImages.MariadbImage = version.Status.ContainerImages.MariadbImage
 		return galeraReady, nil
 	}
diff --git a/pkg/openstack/heat.go b/pkg/openstack/heat.go
@@ -178,7 +178,7 @@ func ReconcileHeat(ctx context.Context, instance *corev1beta1.OpenStackControlPl
 		Log.Info(fmt.Sprintf("heat %s - %s", heat.Name, op))
 	}
 
-	if heat.IsReady() { //FIXME ObservedGeneration
+	if heat.Status.ObservedGeneration == heat.Generation && heat.IsReady() {
 		instance.Status.ContainerImages.HeatAPIImage = version.Status.ContainerImages.HeatAPIImage
 		instance.Status.ContainerImages.HeatCfnapiImage = version.Status.ContainerImages.HeatCfnapiImage
 		instance.Status.ContainerImages.HeatEngineImage = version.Status.ContainerImages.HeatEngineImage
diff --git a/pkg/openstack/horizon.go b/pkg/openstack/horizon.go
@@ -131,7 +131,7 @@ func ReconcileHorizon(ctx context.Context, instance *corev1beta1.OpenStackContro
 		Log.Info(fmt.Sprintf("Horizon %s - %s", horizon.Name, op))
 	}
 
-	if horizon.IsReady() { //FIXME ObservedGeneration
+	if horizon.Status.ObservedGeneration == horizon.Generation && horizon.IsReady() {
 		instance.Status.ContainerImages.HorizonImage = version.Status.ContainerImages.HorizonImage
 		instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneHorizonReadyCondition, corev1beta1.OpenStackControlPlaneHorizonReadyMessage)
 	} else {
diff --git a/pkg/openstack/ironic.go b/pkg/openstack/ironic.go
@@ -176,7 +176,7 @@ func ReconcileIronic(ctx context.Context, instance *corev1beta1.OpenStackControl
 		Log.Info(fmt.Sprintf("ironic %s - %s", ironic.Name, op))
 	}
 
-	if ironic.IsReady() { //FIXME ObservedGeneration
+	if ironic.Status.ObservedGeneration == ironic.Generation && ironic.IsReady() {
 		instance.Status.ContainerImages.IronicAPIImage = version.Status.ContainerImages.IronicAPIImage
 		instance.Status.ContainerImages.IronicConductorImage = version.Status.ContainerImages.IronicConductorImage
 		instance.Status.ContainerImages.IronicInspectorImage = version.Status.ContainerImages.IronicInspectorImage
diff --git a/pkg/openstack/memcached.go b/pkg/openstack/memcached.go
@@ -214,7 +214,7 @@ func reconcileMemcached(
 		Log.Info(fmt.Sprintf("Memcached %s - %s", memcached.Name, op))
 	}
 
-	if memcached.IsReady() { //FIXME ObservedGeneration
+	if memcached.Status.ObservedGeneration == memcached.Generation && memcached.IsReady() {
 		instance.Status.ContainerImages.InfraMemcachedImage = version.Status.ContainerImages.InfraMemcachedImage
 		return memcachedReady, ctrl.Result{}, nil
 	}
diff --git a/pkg/openstack/neutron.go b/pkg/openstack/neutron.go
@@ -178,7 +178,7 @@ func ReconcileNeutron(ctx context.Context, instance *corev1beta1.OpenStackContro
 		Log.Info(fmt.Sprintf("neutronAPI %s - %s", neutronAPI.Name, op))
 	}
 
-	if neutronAPI.IsReady() { //FIXME ObservedGeneration
+	if neutronAPI.Status.ObservedGeneration == neutronAPI.Generation && neutronAPI.IsReady() {
 		instance.Status.ContainerImages.NeutronAPIImage = version.Status.ContainerImages.NeutronAPIImage
 		instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneNeutronReadyCondition, corev1beta1.OpenStackControlPlaneNeutronReadyMessage)
 	} else {
diff --git a/pkg/openstack/nova.go b/pkg/openstack/nova.go
@@ -347,7 +347,7 @@ func ReconcileNova(ctx context.Context, instance *corev1beta1.OpenStackControlPl
 		Log.Info(fmt.Sprintf("Nova %s - %s", nova.Name, op))
 	}
 
-	if nova.IsReady() { //FIXME ObservedGeneration
+	if nova.Status.ObservedGeneration == nova.Generation && nova.IsReady() {
 		instance.Status.ContainerImages.NovaAPIImage = version.Status.ContainerImages.NovaAPIImage
 		instance.Status.ContainerImages.NovaComputeImage = version.Status.ContainerImages.NovaComputeImage
 		instance.Status.ContainerImages.NovaConductorImage = version.Status.ContainerImages.NovaConductorImage
diff --git a/pkg/openstack/octavia.go b/pkg/openstack/octavia.go
@@ -186,7 +186,7 @@ func ReconcileOctavia(ctx context.Context, instance *corev1beta1.OpenStackContro
 		helper.GetLogger().Info(fmt.Sprintf("Octavia %s - %s", octavia.Name, op))
 	}
 
-	if octavia.IsReady() { //FIXME ObservedGeneration
+	if octavia.Status.ObservedGeneration == octavia.Generation && octavia.IsReady() {
 		instance.Status.ContainerImages.OctaviaAPIImage = version.Status.ContainerImages.OctaviaAPIImage
 		instance.Status.ContainerImages.OctaviaWorkerImage = version.Status.ContainerImages.OctaviaWorkerImage
 		instance.Status.ContainerImages.OctaviaHealthmanagerImage = version.Status.ContainerImages.OctaviaHealthmanagerImage
diff --git a/pkg/openstack/openstackclient.go b/pkg/openstack/openstackclient.go
@@ -73,7 +73,7 @@ func ReconcileOpenStackClient(ctx context.Context, instance *corev1.OpenStackCon
 		Log.Info(fmt.Sprintf("OpenStackClient %s - %s", openstackclient.Name, op))
 	}
 
-	if openstackclient.Status.Conditions.IsTrue(clientv1.OpenStackClientReadyCondition) { //FIXME ObservedGeneration
+	if openstackclient.Status.ObservedGeneration == openstackclient.Generation && openstackclient.IsReady() {
 		Log.Info("OpenStackClient ready condition is true")
 		instance.Status.ContainerImages.OpenstackClientImage = version.Status.ContainerImages.OpenstackClientImage
 		instance.Status.Conditions.MarkTrue(corev1.OpenStackControlPlaneClientReadyCondition, corev1.OpenStackControlPlaneClientReadyMessage)
diff --git a/pkg/openstack/placement.go b/pkg/openstack/placement.go
@@ -130,7 +130,7 @@ func ReconcilePlacementAPI(ctx context.Context, instance *corev1beta1.OpenStackC
 		Log.Info(fmt.Sprintf("placementAPI %s - %s", placementAPI.Name, op))
 	}
 
-	if placementAPI.IsReady() {
+	if placementAPI.Status.ObservedGeneration == placementAPI.Generation && placementAPI.IsReady() {
 		instance.Status.ContainerImages.PlacementAPIImage = version.Status.ContainerImages.PlacementAPIImage
 		instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlanePlacementAPIReadyCondition, corev1beta1.OpenStackControlPlanePlacementAPIReadyMessage)
 	} else {
diff --git a/pkg/openstack/telemetry.go b/pkg/openstack/telemetry.go
@@ -279,7 +279,7 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
 		helper.GetLogger().Info(fmt.Sprintf("%s %s - %s", telemetryName, telemetry.Name, op))
 	}
 
-	if telemetry.IsReady() { //FIXME ObservedGeneration
+	if telemetry.Status.ObservedGeneration == telemetry.Generation && telemetry.IsReady() {
 		instance.Status.ContainerImages.CeilometerCentralImage = version.Status.ContainerImages.CeilometerCentralImage
 		instance.Status.ContainerImages.CeilometerComputeImage = version.Status.ContainerImages.CeilometerComputeImage
 		instance.Status.ContainerImages.CeilometerIpmiImage = version.Status.ContainerImages.CeilometerIpmiImage

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ func ReconcileDesignate(ctx context.Context, instance *corev1beta1.OpenStackCont`
`149`	`149`	`helper.GetLogger().Info(fmt.Sprintf("Designate %s - %s", designate.Name, op))`
`150`	`150`	`}`
`151`	`151`
`152`		`- if designate.IsReady() { //FIXME ObservedGeneration`
	`152`	`+ if designate.Status.ObservedGeneration == designate.Generation && designate.IsReady() {`
`153`	`153`	`instance.Status.ContainerImages.DesignateAPIImage = version.Status.ContainerImages.DesignateAPIImage`
`154`	`154`	`instance.Status.ContainerImages.DesignateCentralImage = version.Status.ContainerImages.DesignateCentralImage`
`155`	`155`	`instance.Status.ContainerImages.DesignateMdnsImage = version.Status.ContainerImages.DesignateMdnsImage`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func ReconcileDNSMasqs(ctx context.Context, instance *corev1beta1.OpenStackContr`
`62`	`62`	`Log.Info(fmt.Sprintf("dnsmasq %s - %s", dnsmasq.Name, op))`
`63`	`63`	`}`
`64`	`64`
`65`		`- if dnsmasq.IsReady() { // FIXME ObservedGeneration`
	`65`	`+ if dnsmasq.Status.ObservedGeneration == dnsmasq.Generation && dnsmasq.IsReady() {`
`66`	`66`	`instance.Status.ContainerImages.InfraDnsmasqImage = version.Status.ContainerImages.InfraDnsmasqImage`
`67`	`67`	`instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneDNSReadyCondition, corev1beta1.OpenStackControlPlaneDNSReadyMessage)`
`68`	`68`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ func reconcileGalera(`
`174`	`174`	`Log.Info(fmt.Sprintf("Galera %s - %s", galera.Name, op))`
`175`	`175`	`}`
`176`	`176`
`177`		`- if galera.IsReady() { //FIXME ObservedGeneration`
	`177`	`+ if galera.Status.ObservedGeneration == galera.Generation && galera.IsReady() {`
`178`	`178`	`instance.Status.ContainerImages.MariadbImage = version.Status.ContainerImages.MariadbImage`
`179`	`179`	`return galeraReady, nil`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ func ReconcileHeat(ctx context.Context, instance *corev1beta1.OpenStackControlPl`
`178`	`178`	`Log.Info(fmt.Sprintf("heat %s - %s", heat.Name, op))`
`179`	`179`	`}`
`180`	`180`
`181`		`- if heat.IsReady() { //FIXME ObservedGeneration`
	`181`	`+ if heat.Status.ObservedGeneration == heat.Generation && heat.IsReady() {`
`182`	`182`	`instance.Status.ContainerImages.HeatAPIImage = version.Status.ContainerImages.HeatAPIImage`
`183`	`183`	`instance.Status.ContainerImages.HeatCfnapiImage = version.Status.ContainerImages.HeatCfnapiImage`
`184`	`184`	`instance.Status.ContainerImages.HeatEngineImage = version.Status.ContainerImages.HeatEngineImage`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ func ReconcileHorizon(ctx context.Context, instance *corev1beta1.OpenStackContro`
`131`	`131`	`Log.Info(fmt.Sprintf("Horizon %s - %s", horizon.Name, op))`
`132`	`132`	`}`
`133`	`133`
`134`		`- if horizon.IsReady() { //FIXME ObservedGeneration`
	`134`	`+ if horizon.Status.ObservedGeneration == horizon.Generation && horizon.IsReady() {`
`135`	`135`	`instance.Status.ContainerImages.HorizonImage = version.Status.ContainerImages.HorizonImage`
`136`	`136`	`instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneHorizonReadyCondition, corev1beta1.OpenStackControlPlaneHorizonReadyMessage)`
`137`	`137`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ func ReconcileIronic(ctx context.Context, instance *corev1beta1.OpenStackControl`
`176`	`176`	`Log.Info(fmt.Sprintf("ironic %s - %s", ironic.Name, op))`
`177`	`177`	`}`
`178`	`178`
`179`		`- if ironic.IsReady() { //FIXME ObservedGeneration`
	`179`	`+ if ironic.Status.ObservedGeneration == ironic.Generation && ironic.IsReady() {`
`180`	`180`	`instance.Status.ContainerImages.IronicAPIImage = version.Status.ContainerImages.IronicAPIImage`
`181`	`181`	`instance.Status.ContainerImages.IronicConductorImage = version.Status.ContainerImages.IronicConductorImage`
`182`	`182`	`instance.Status.ContainerImages.IronicInspectorImage = version.Status.ContainerImages.IronicInspectorImage`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ func reconcileMemcached(`
`214`	`214`	`Log.Info(fmt.Sprintf("Memcached %s - %s", memcached.Name, op))`
`215`	`215`	`}`
`216`	`216`
`217`		`- if memcached.IsReady() { //FIXME ObservedGeneration`
	`217`	`+ if memcached.Status.ObservedGeneration == memcached.Generation && memcached.IsReady() {`
`218`	`218`	`instance.Status.ContainerImages.InfraMemcachedImage = version.Status.ContainerImages.InfraMemcachedImage`
`219`	`219`	`return memcachedReady, ctrl.Result{}, nil`
`220`	`220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ func ReconcileNeutron(ctx context.Context, instance *corev1beta1.OpenStackContro`
`178`	`178`	`Log.Info(fmt.Sprintf("neutronAPI %s - %s", neutronAPI.Name, op))`
`179`	`179`	`}`
`180`	`180`
`181`		`- if neutronAPI.IsReady() { //FIXME ObservedGeneration`
	`181`	`+ if neutronAPI.Status.ObservedGeneration == neutronAPI.Generation && neutronAPI.IsReady() {`
`182`	`182`	`instance.Status.ContainerImages.NeutronAPIImage = version.Status.ContainerImages.NeutronAPIImage`
`183`	`183`	`instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneNeutronReadyCondition, corev1beta1.OpenStackControlPlaneNeutronReadyMessage)`
`184`	`184`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ func ReconcileNova(ctx context.Context, instance *corev1beta1.OpenStackControlPl`
`347`	`347`	`Log.Info(fmt.Sprintf("Nova %s - %s", nova.Name, op))`
`348`	`348`	`}`
`349`	`349`
`350`		`- if nova.IsReady() { //FIXME ObservedGeneration`
	`350`	`+ if nova.Status.ObservedGeneration == nova.Generation && nova.IsReady() {`
`351`	`351`	`instance.Status.ContainerImages.NovaAPIImage = version.Status.ContainerImages.NovaAPIImage`
`352`	`352`	`instance.Status.ContainerImages.NovaComputeImage = version.Status.ContainerImages.NovaComputeImage`
`353`	`353`	`instance.Status.ContainerImages.NovaConductorImage = version.Status.ContainerImages.NovaConductorImage`