Skip to content

Align custom healthcheck with clustergroup #659

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

Merged
openshift-merge-bot merged 2 commits into from
Jun 3, 2026
Merged

Align custom healthcheck with clustergroup #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0fbce6
Align custom healthcheck with clustergroup
mbaldessari Jun 3, 2026
2e1c072
Fix up unit tests after adding a healthcheck
mbaldessari Jun 3, 2026
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
21 changes: 21 additions & 0 deletions internal/controller/argo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,27 @@ func newArgoCD(name, namespace string, patternsOperatorConfig PatternsOperatorCo
argoScopes := "[groups,email]"

resourceHealthChecks := []argooperator.ResourceHealthCheck{
{
// https://www.github.com/argoproj/argo-cd/issues/12840 is related
Kind: "PersistentVolumeClaim",
Check: `hs = {}
if obj.status ~= nil then
if obj.status.phase ~= nil then
if obj.status.phase == "Pending" then
hs.status = "Healthy"
hs.message = obj.status.phase
return hs
elseif obj.status.phase == "Bound" then
hs.status = "Healthy"
hs.message = obj.status.phase
return hs
end
end
end
hs.status = "Progressing"
hs.message = "Waiting for PVC"
return hs`,
},
{
// We can drop this custom Subscription healthcheck once https://www.github.com/argoproj/argo-cd/issues/25921 is fixed
Group: "operators.coreos.com",
Expand Down
53 changes: 29 additions & 24 deletions internal/controller/argo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2199,11 +2199,12 @@ var _ = Describe("newArgoCD", func() {
Expect(argo.Spec.ResourceExclusions).To(ContainSubstring("PipelineRun"))
})

It("should have resource health checks for Subscription", func() {
It("should have resource health checks for PersistentVolumeClaim and Subscription", func() {
argo = newArgoCD("test-argo", "test-ns", DefaultPatternsOperatorConfig)
Expect(argo.Spec.ResourceHealthChecks).To(HaveLen(1))
Expect(argo.Spec.ResourceHealthChecks[0].Group).To(Equal("operators.coreos.com"))
Expect(argo.Spec.ResourceHealthChecks[0].Kind).To(Equal("Subscription"))
Expect(argo.Spec.ResourceHealthChecks).To(HaveLen(2))
Expect(argo.Spec.ResourceHealthChecks[0].Kind).To(Equal("PersistentVolumeClaim"))
Expect(argo.Spec.ResourceHealthChecks[1].Group).To(Equal("operators.coreos.com"))
Expect(argo.Spec.ResourceHealthChecks[1].Kind).To(Equal("Subscription"))
})

It("should have init containers for CA cert fetching", func() {
Expand All @@ -2225,20 +2226,21 @@ var _ = Describe("newArgoCD", func() {
Expect(*argo.Spec.RBAC.Policy).To(ContainSubstring("test-admins"))
})

It("should have only Subscription ResourceHealthChecks", func() {
It("should have PersistentVolumeClaim and Subscription ResourceHealthChecks", func() {
argo = newArgoCD("test-argo", "test-ns", DefaultPatternsOperatorConfig)
Expect(argo.Spec.ResourceHealthChecks).ToNot(BeNil())
Expect(argo.Spec.ResourceHealthChecks).To(HaveLen(1))
Expect(argo.Spec.ResourceHealthChecks[0].Group).To(Equal("operators.coreos.com"))
Expect(argo.Spec.ResourceHealthChecks[0].Kind).To(Equal("Subscription"))
Expect(argo.Spec.ResourceHealthChecks).To(HaveLen(2))
Expect(argo.Spec.ResourceHealthChecks[0].Kind).To(Equal("PersistentVolumeClaim"))
Expect(argo.Spec.ResourceHealthChecks[1].Group).To(Equal("operators.coreos.com"))
Expect(argo.Spec.ResourceHealthChecks[1].Kind).To(Equal("Subscription"))
})

It("should have also Application ResourceHealthChecks when gitops.applicationHealthCheckEnabled is set to true", func() {
argo = newArgoCD("test-argo", "test-ns", PatternsOperatorConfig{"gitops.applicationHealthCheckEnabled": "true"})
Expect(argo.Spec.ResourceHealthChecks).ToNot(BeNil())
Expect(argo.Spec.ResourceHealthChecks).To(HaveLen(2))
Expect(argo.Spec.ResourceHealthChecks[1].Group).To(Equal("argoproj.io"))
Expect(argo.Spec.ResourceHealthChecks[1].Kind).To(Equal("Application"))
Expect(argo.Spec.ResourceHealthChecks).To(HaveLen(3))
Expect(argo.Spec.ResourceHealthChecks[2].Group).To(Equal("argoproj.io"))
Expect(argo.Spec.ResourceHealthChecks[2].Kind).To(Equal("Application"))
})

It("should append custom health checks from gitops.customHealthChecks", func() {
Expand All @@ -2255,12 +2257,13 @@ var _ = Describe("newArgoCD", func() {
hs.status = "Progressing"
return hs`
argo = newArgoCD("test-argo", "test-ns", PatternsOperatorConfig{"gitops.customHealthChecks": customYAML})
Expect(argo.Spec.ResourceHealthChecks).To(HaveLen(3))
Expect(argo.Spec.ResourceHealthChecks[0].Group).To(Equal("operators.coreos.com"))
Expect(argo.Spec.ResourceHealthChecks[1].Group).To(Equal("apps"))
Expect(argo.Spec.ResourceHealthChecks[1].Kind).To(Equal("Deployment"))
Expect(argo.Spec.ResourceHealthChecks[2].Group).To(Equal("batch"))
Expect(argo.Spec.ResourceHealthChecks[2].Kind).To(Equal("Job"))
Expect(argo.Spec.ResourceHealthChecks).To(HaveLen(4))
Expect(argo.Spec.ResourceHealthChecks[0].Kind).To(Equal("PersistentVolumeClaim"))
Expect(argo.Spec.ResourceHealthChecks[1].Group).To(Equal("operators.coreos.com"))
Expect(argo.Spec.ResourceHealthChecks[2].Group).To(Equal("apps"))
Expect(argo.Spec.ResourceHealthChecks[2].Kind).To(Equal("Deployment"))
Expect(argo.Spec.ResourceHealthChecks[3].Group).To(Equal("batch"))
Expect(argo.Spec.ResourceHealthChecks[3].Kind).To(Equal("Job"))
})

It("should append custom health checks alongside Application health check when both are enabled", func() {
Expand All @@ -2274,21 +2277,23 @@ var _ = Describe("newArgoCD", func() {
"gitops.applicationHealthCheckEnabled": "true",
"gitops.customHealthChecks": customYAML,
})
Expect(argo.Spec.ResourceHealthChecks).To(HaveLen(3))
Expect(argo.Spec.ResourceHealthChecks[0].Group).To(Equal("operators.coreos.com"))
Expect(argo.Spec.ResourceHealthChecks[1].Group).To(Equal("argoproj.io"))
Expect(argo.Spec.ResourceHealthChecks[2].Group).To(Equal("apps"))
Expect(argo.Spec.ResourceHealthChecks).To(HaveLen(4))
Expect(argo.Spec.ResourceHealthChecks[0].Kind).To(Equal("PersistentVolumeClaim"))
Expect(argo.Spec.ResourceHealthChecks[1].Group).To(Equal("operators.coreos.com"))
Expect(argo.Spec.ResourceHealthChecks[2].Group).To(Equal("argoproj.io"))
Expect(argo.Spec.ResourceHealthChecks[3].Group).To(Equal("apps"))
})

It("should handle invalid YAML in gitops.customHealthChecks gracefully", func() {
argo = newArgoCD("test-argo", "test-ns", PatternsOperatorConfig{"gitops.customHealthChecks": "not: valid: yaml: list"})
Expect(argo.Spec.ResourceHealthChecks).To(HaveLen(1))
Expect(argo.Spec.ResourceHealthChecks[0].Group).To(Equal("operators.coreos.com"))
Expect(argo.Spec.ResourceHealthChecks).To(HaveLen(2))
Expect(argo.Spec.ResourceHealthChecks[0].Kind).To(Equal("PersistentVolumeClaim"))
Expect(argo.Spec.ResourceHealthChecks[1].Group).To(Equal("operators.coreos.com"))
})

It("should not add custom health checks when gitops.customHealthChecks is empty", func() {
argo = newArgoCD("test-argo", "test-ns", PatternsOperatorConfig{"gitops.customHealthChecks": ""})
Expect(argo.Spec.ResourceHealthChecks).To(HaveLen(1))
Expect(argo.Spec.ResourceHealthChecks).To(HaveLen(2))
})

})
Expand Down