Skip to content

Commit b294cce

Browse files
sangdammadSangeetha Madamanchi
andauthored
fix: adapt to the major helm controller upgrade 0.37.2 (#46)
Co-authored-by: Sangeetha Madamanchi <[email protected]>
1 parent 239e1e6 commit b294cce

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

.github/workflows/publish-latest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches: [master]
66
types: [completed]
77
env:
8-
VERSION: v0.0.10
8+
VERSION: v0.0.11
99
jobs:
1010
deploy:
1111
runs-on: ubuntu-latest

controllers/application_controller.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,13 @@ func (r *ApplicationReconciler) reconcileHelmReleaseStatus(ctx context.Context,
255255
}
256256
helmReadyStatusNotReconciled := true
257257
for _, condition := range hr.GetConditions() {
258-
apimeta.SetStatusCondition(&application.Status.Conditions, condition)
259-
if condition.Type == meta.ReadyCondition && condition.Reason == v2beta2.ReconciliationSucceededReason {
258+
if condition.Reason == meta.ProgressingReason || condition.Status == metav1.ConditionUnknown {
259+
v1.AppInProgressStatus(application)
260+
break
261+
} else {
262+
apimeta.SetStatusCondition(&application.Status.Conditions, condition)
263+
}
264+
if condition.Type == meta.ReadyCondition && condition.Status == metav1.ConditionTrue {
260265
apimeta.RemoveStatusCondition(&application.Status.Conditions, v1.PodReady)
261266
helmReadyStatusNotReconciled = false
262267
}

controllers/application_controller_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,15 +277,15 @@ var _ = Describe("Application controller", func() {
277277
return k8sClient.Get(ctx, client.ObjectKey{Name: a.Name, Namespace: a.Namespace}, hr)
278278
}
279279
}(ctx, hr), 5*time.Second, 300*time.Millisecond).Should(BeNil())
280-
hr.Status.ObservedGeneration = 1
281-
hr.Generation = hr.Status.ObservedGeneration
280+
hr.Status.LastAttemptedGeneration = 1
281+
hr.Generation = hr.Status.LastAttemptedGeneration
282282
conditions := []metav1.Condition{{
283283
Type: meta.ReadyCondition,
284284
Status: metav1.ConditionStatus(v1.ConditionTrue),
285285
ObservedGeneration: 1,
286286
LastTransitionTime: metav1.NewTime(time.Now()),
287-
Message: "Helm Release Reconciled",
288-
Reason: meta.SucceededReason,
287+
Message: "Helm Release Reconciliation in Progress",
288+
Reason: meta.ProgressingReason,
289289
}}
290290
hr.SetConditions(conditions)
291291
Expect(k8sClient.Status().Update(ctx, hr)).Should(BeNil())

0 commit comments

Comments
 (0)