Skip to content

Commit

Permalink
Merge branch 'main' into better-conditions
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathan-innis committed Jun 14, 2021
2 parents 9f69894 + c0f319c commit b905adb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions controllers/appgroup_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ var _ = Describe("ApplicationGroup Controller", func() {
if readyCondition == nil {
return false
}
return readyCondition.Reason == meta.FailedReason
return readyCondition.Reason == meta.ChartPullFailedReason
}, time.Second*30, time.Second).Should(BeTrue())
})

Expand Down Expand Up @@ -223,7 +223,7 @@ var _ = Describe("ApplicationGroup Controller", func() {
if readyCondition == nil {
return false
}
return readyCondition.Reason == meta.FailedReason
return readyCondition.Reason == meta.ChartPullFailedReason
}, time.Second*30, time.Second).Should(BeTrue())

patch := client.MergeFrom(applicationGroup.DeepCopy())
Expand Down Expand Up @@ -299,7 +299,7 @@ var _ = Describe("ApplicationGroup Controller", func() {
}, DefaultTimeout, time.Second).Should(BeTrue())
})

FIt("should succeed to rollback helm chart versions on failure", func() {
It("should succeed to rollback helm chart versions on failure", func() {
applicationGroup := defaultAppGroup(name)
applicationGroup.Namespace = DefaultNamespace
applicationGroup.Spec.Applications[1].Spec.Chart.Version = ambassadorOldChartVersion
Expand Down
2 changes: 1 addition & 1 deletion examples/simple/bookinfo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
dependencies: []
spec:
chart:
url: "https://www.getambassador.io/helm"
url: "https://nitishm.github.io/charts"
name: ambassador
version: 6.6.0
# Authorization Object Reference (Kind: Secret)
Expand Down

0 comments on commit b905adb

Please sign in to comment.