Skip to content

Commit

Permalink
fix: validate packages using full resource name (#775)
Browse files Browse the repository at this point in the history
## Description

When deploying a uds package to a cluster that has an existing package
resource type (such as an eks-d management cluster with eks-anywhere
installed in it) that is higher priority than uds-packages, package
validation hangs forever since it is waiting on the wrong resource type.

This PR updates the onDeploy/after actions to wait for
`packages.uds.dev` instead of just `packages` to avoid this conflict.

## Type of change

- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Other (security config, docs update, etc)

## Checklist before merging

- [ ] Test, docs, adr added or updated as needed
- [ ] [Contributor
Guide](https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md)
followed

Co-authored-by: Micah Nagel <micah.nagel@defenseunicorns.com>
  • Loading branch information
jacobbmay and mjnagel authored Sep 18, 2024
1 parent 20656e6 commit 678ed44
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/authservice/common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ components:
maxTotalSeconds: 300
wait:
cluster:
kind: Packages
kind: packages.uds.dev
name: authservice
namespace: authservice
condition: "'{.status.phase}'=Ready"
2 changes: 1 addition & 1 deletion src/grafana/common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ components:
maxTotalSeconds: 300
wait:
cluster:
kind: Packages
kind: packages.uds.dev
name: grafana
namespace: grafana
condition: "'{.status.phase}'=Ready"
2 changes: 1 addition & 1 deletion src/keycloak/common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ components:
maxTotalSeconds: 300
wait:
cluster:
kind: Packages
kind: packages.uds.dev
name: keycloak
namespace: keycloak
condition: "'{.status.phase}'=Ready"
2 changes: 1 addition & 1 deletion src/loki/common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ components:
maxTotalSeconds: 300
wait:
cluster:
kind: Packages
kind: packages.uds.dev
name: loki
namespace: loki
condition: "'{.status.phase}'=Ready"
2 changes: 1 addition & 1 deletion src/metrics-server/common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ components:
maxTotalSeconds: 300
wait:
cluster:
kind: Packages
kind: packages.uds.dev
name: metrics-server
namespace: metrics-server
condition: "'{.status.phase}'=Ready"
2 changes: 1 addition & 1 deletion src/neuvector/common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ components:
maxTotalSeconds: 300
wait:
cluster:
kind: Packages
kind: packages.uds.dev
name: neuvector
namespace: neuvector
condition: "'{.status.phase}'=Ready"
Expand Down
2 changes: 1 addition & 1 deletion src/prometheus-stack/common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ components:
maxTotalSeconds: 300
wait:
cluster:
kind: Packages
kind: packages.uds.dev
name: prometheus-stack
namespace: monitoring
condition: "'{.status.phase}'=Ready"
2 changes: 1 addition & 1 deletion src/promtail/common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ components:
maxTotalSeconds: 300
wait:
cluster:
kind: Packages
kind: packages.uds.dev
name: promtail
namespace: promtail
condition: "'{.status.phase}'=Ready"

0 comments on commit 678ed44

Please sign in to comment.