Skip to content

Move from resourceCustomization to resourceHealthcheck #369

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
merged 2 commits into from
Sep 19, 2023
Merged

Move from resourceCustomization to resourceHealthcheck #369

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
5bdd554
Move from resourceCustomization to resourceHealthcheck
mbaldessari Sep 19, 2023
fe84601
Fix up common/ tests
mbaldessari Sep 19, 2023
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
37 changes: 19 additions & 18 deletions clustergroup/templates/plumbing/argocd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,27 @@ metadata:
spec:
# Adding health checks to argocd to prevent pvc resources
# that aren't bound state from blocking deployments
resourceCustomizations: |
PersistentVolumeClaim:
health.lua: |
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
resourceHealthChecks:
- 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
hs.status = "Progressing"
hs.message = "Waiting for PVC"
return hs
end
hs.status = "Progressing"
hs.message = "Waiting for PVC"
return hs

applicationInstanceLabelKey: argocd.argoproj.io/instance
# Not the greatest way to pass git/quay info to sub-applications, but it will do until
# we can support helmChart with kustomize
Expand Down
37 changes: 19 additions & 18 deletions tests/clustergroup-industrial-edge-factory.expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,26 +452,27 @@ metadata:
spec:
# Adding health checks to argocd to prevent pvc resources
# that aren't bound state from blocking deployments
resourceCustomizations: |
PersistentVolumeClaim:
health.lua: |
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
resourceHealthChecks:
- 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
hs.status = "Progressing"
hs.message = "Waiting for PVC"
return hs
end
hs.status = "Progressing"
hs.message = "Waiting for PVC"
return hs

applicationInstanceLabelKey: argocd.argoproj.io/instance
# Not the greatest way to pass git/quay info to sub-applications, but it will do until
# we can support helmChart with kustomize
Expand Down
37 changes: 19 additions & 18 deletions tests/clustergroup-industrial-edge-hub.expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,26 +1097,27 @@ metadata:
spec:
# Adding health checks to argocd to prevent pvc resources
# that aren't bound state from blocking deployments
resourceCustomizations: |
PersistentVolumeClaim:
health.lua: |
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
resourceHealthChecks:
- 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
hs.status = "Progressing"
hs.message = "Waiting for PVC"
return hs
end
hs.status = "Progressing"
hs.message = "Waiting for PVC"
return hs

applicationInstanceLabelKey: argocd.argoproj.io/instance
# Not the greatest way to pass git/quay info to sub-applications, but it will do until
# we can support helmChart with kustomize
Expand Down
37 changes: 19 additions & 18 deletions tests/clustergroup-medical-diagnosis-hub.expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,26 +1282,27 @@ metadata:
spec:
# Adding health checks to argocd to prevent pvc resources
# that aren't bound state from blocking deployments
resourceCustomizations: |
PersistentVolumeClaim:
health.lua: |
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
resourceHealthChecks:
- 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
hs.status = "Progressing"
hs.message = "Waiting for PVC"
return hs
end
hs.status = "Progressing"
hs.message = "Waiting for PVC"
return hs

applicationInstanceLabelKey: argocd.argoproj.io/instance
# Not the greatest way to pass git/quay info to sub-applications, but it will do until
# we can support helmChart with kustomize
Expand Down
37 changes: 19 additions & 18 deletions tests/clustergroup-naked.expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,26 +270,27 @@ metadata:
spec:
# Adding health checks to argocd to prevent pvc resources
# that aren't bound state from blocking deployments
resourceCustomizations: |
PersistentVolumeClaim:
health.lua: |
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
resourceHealthChecks:
- 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
hs.status = "Progressing"
hs.message = "Waiting for PVC"
return hs
end
hs.status = "Progressing"
hs.message = "Waiting for PVC"
return hs

applicationInstanceLabelKey: argocd.argoproj.io/instance
# Not the greatest way to pass git/quay info to sub-applications, but it will do until
# we can support helmChart with kustomize
Expand Down
37 changes: 19 additions & 18 deletions tests/clustergroup-normal.expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,26 +877,27 @@ metadata:
spec:
# Adding health checks to argocd to prevent pvc resources
# that aren't bound state from blocking deployments
resourceCustomizations: |
PersistentVolumeClaim:
health.lua: |
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
resourceHealthChecks:
- 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
hs.status = "Progressing"
hs.message = "Waiting for PVC"
return hs
end
hs.status = "Progressing"
hs.message = "Waiting for PVC"
return hs

applicationInstanceLabelKey: argocd.argoproj.io/instance
# Not the greatest way to pass git/quay info to sub-applications, but it will do until
# we can support helmChart with kustomize
Expand Down