Skip to content

Add AtLatestKnown condition #1517

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add AtLatestKnown condition #1517

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
5 changes: 5 additions & 0 deletions apis/core/v1beta1/conditions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,8 @@ const (
OpenStackVersionMinorUpdateDataplane condition.Type = "MinorUpdateDataplane"

OpenStackVersionMinorUpdateAvailable condition.Type = "MinorUpdateAvailable"

OpenStackVersionAtLatestKnown condition.Type = "AtLatestKnown"
)

// Version Messages used by API objects.
Expand Down Expand Up @@ -540,4 +542,7 @@ const (

// OpenStackVersionMinorUpdateAvailableMessage
OpenStackVersionMinorUpdateAvailableMessage = "update available"

// OpenStackVersionMinorUpdateAtLatestKnownMessage
OpenStackVersionMinorUpdateAtLatestKnownMessage = "at latest known"
)
24 changes: 19 additions & 5 deletions controllers/core/openstackversion_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,12 +392,26 @@ func (r *OpenStackVersionReconciler) Reconcile(ctx context.Context, req ctrl.Req
Log.Info("Setting DeployedVersion")
instance.Status.DeployedVersion = &instance.Spec.TargetVersion
}
if instance.Status.DeployedVersion != nil &&
*instance.Status.AvailableVersion != *instance.Status.DeployedVersion {
instance.Status.Conditions.Set(condition.TrueCondition(
corev1beta1.OpenStackVersionMinorUpdateAvailable,
corev1beta1.OpenStackVersionMinorUpdateAvailableMessage))

if instance.Status.DeployedVersion != nil {

if *instance.Status.AvailableVersion != *instance.Status.DeployedVersion {
instance.Status.Conditions.Remove(corev1beta1.OpenStackVersionAtLatestKnown)

instance.Status.Conditions.Set(condition.TrueCondition(
corev1beta1.OpenStackVersionMinorUpdateAvailable,
corev1beta1.OpenStackVersionMinorUpdateAvailableMessage))

} else {
instance.Status.Conditions.Remove(corev1beta1.OpenStackVersionMinorUpdateAvailable)

instance.Status.Conditions.Set(condition.TrueCondition(
corev1beta1.OpenStackVersionAtLatestKnown,
corev1beta1.OpenStackVersionMinorUpdateAtLatestKnownMessage))
}

} else {
instance.Status.Conditions.Remove(corev1beta1.OpenStackVersionAtLatestKnown)
instance.Status.Conditions.Remove(corev1beta1.OpenStackVersionMinorUpdateAvailable)
}

Expand Down
17 changes: 14 additions & 3 deletions tests/functional/ctlplane/openstackversion_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,8 @@ var _ = Describe("OpenStackOperator controller", func() {
g.Expect(osversion.Generation).Should(Equal(osversion.Status.ObservedGeneration))

g.Expect(osversion.Status.DeployedVersion).Should(Equal(&initialVersion))
// Should not have OpenStackVersionAtLatestKnown
g.Expect(osversion.Status.Conditions.Has(corev1.OpenStackVersionAtLatestKnown)).To(BeFalse())

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

Expand Down Expand Up @@ -668,15 +670,24 @@ var _ = Describe("OpenStackOperator controller", func() {
osversion := GetOpenStackVersion(names.OpenStackVersionName)
g.Expect(osversion).Should(Not(BeNil()))
g.Expect(osversion.OwnerReferences).Should(HaveLen(1))
// The `AtLatestKnown` condition is True and MinorUpdateAvailable is not set
th.ExpectCondition(
names.OpenStackVersionName,
ConditionGetterFunc(OpenStackVersionConditionGetter),
condition.ReadyCondition,
corev1.OpenStackVersionAtLatestKnown,
k8s_corev1.ConditionTrue,
)
g.Expect(osversion.Status.DeployedVersion).Should(Equal(&updatedVersion)) // we're done here
// no condition which reflects an update is available
g.Expect(osversion.Status.Conditions.Has(corev1.OpenStackVersionMinorUpdateAvailable)).To(BeFalse())
g.Expect(osversion.Status.DeployedVersion).Should(Equal(&updatedVersion)) // we're done here

// Make sure the Ready condition is True, e.g. all conditions are True.
th.ExpectCondition(
names.OpenStackVersionName,
ConditionGetterFunc(OpenStackVersionConditionGetter),
condition.ReadyCondition,
k8s_corev1.ConditionTrue,
)

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

})
Expand Down