Skip to content

Commit

Permalink
chore: refactor validate.yaml file name and task name (#62)
Browse files Browse the repository at this point in the history
## Description

...

## Related Issue

Fixes #
<!-- or -->
Relates to #

## Type of change

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

## Checklist before merging

- [ ] Test, docs, adr added or updated as needed
- [ ] [Contributor Guide
Steps](https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md)(https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md#submitting-a-pull-request)
followed
  • Loading branch information
zachariahmiller authored Dec 11, 2023
1 parent ca28e7b commit 92a04ea
Show file tree
Hide file tree
Showing 18 changed files with 29 additions and 30 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tasks:
- name: run
- name: validate
actions:
- description: Validate...
cmd: "echo Replace Me"
Expand Down
2 changes: 1 addition & 1 deletion src/grafana/validate.yaml → src/grafana/tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tasks:
- name: run
- name: validate
actions:
- description: Validate grafana is up
wait:
Expand Down
3 changes: 1 addition & 2 deletions src/istio/pepr/istio-job-termination.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@ When(a.Pod)
.WithLabel("batch.kubernetes.io/job-name")
.WithLabel("service.istio.io/canonical-name")
.Watch(async pod => {
if (!pod.metadata?.name || !pod.metadata.namespace ) {
if (!pod.metadata?.name || !pod.metadata.namespace) {
Log.error(pod, `Invalid Pod definition`);
return;
}


const { name, namespace } = pod.metadata;
const key = `${namespace}/${name}`;

Expand Down
2 changes: 1 addition & 1 deletion src/istio/validate.yaml → src/istio/tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tasks:
- name: run
- name: validate
actions:
- description: Validate the Istio Admin Gateway
wait:
Expand Down
2 changes: 1 addition & 1 deletion src/neuvector/validate.yaml → src/keycloak/tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tasks:
- name: run
- name: validate
actions:
- description: Validate...
cmd: "echo Replace Me"
Expand Down
2 changes: 1 addition & 1 deletion src/kiali/validate.yaml → src/kiali/tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tasks:
- name: run
- name: validate
actions:
- description: Validate...
cmd: "echo Replace Me"
Expand Down
2 changes: 1 addition & 1 deletion src/loki/validate.yaml → src/loki/tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tasks:
- name: run
- name: validate
actions:
- description: Validate loki
wait:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tasks:
- name: run
- name: validate
actions:
- description: Wait for metrics-server pod(s) to be ready
wait:
Expand Down
2 changes: 1 addition & 1 deletion src/keycloak/validate.yaml → src/neuvector/tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tasks:
- name: run
- name: validate
actions:
- description: Validate...
cmd: "echo Replace Me"
Expand Down
2 changes: 1 addition & 1 deletion src/policies/validate.yaml → src/policies/tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tasks:
- name: run
- name: validate
actions:
- cmd: "npx jest src/policies/**/*.spec.ts"
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tasks:
- name: run
- name: validate
actions:
- description: Validate alert manager
wait:
Expand Down
2 changes: 1 addition & 1 deletion src/promtail/validate.yaml → src/promtail/tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tasks:
- name: run
- name: validate
actions:
- description: Validate promail
wait:
Expand Down
7 changes: 7 additions & 0 deletions src/tempo/tasks.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
tasks:
- name: validate
actions:
- description: Validate...
cmd: "echo Replace Me"
# wait:
# cluster:
7 changes: 0 additions & 7 deletions src/tempo/validate.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion src/test/validate.yaml → src/test/tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tasks:
- name: run
- name: validate
description: Test app used for UDS Core validation
actions:
- description: Apply the test resources
Expand Down
7 changes: 7 additions & 0 deletions src/velero/tasks.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
tasks:
- name: validate
actions:
- description: Validate...
cmd: "echo Replace Me"
# wait:
# cluster:
7 changes: 0 additions & 7 deletions src/velero/validate.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions tasks/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ tasks:
- task: deploy:single-package

- description: "Validate the package"
cmd: uds run -f src/${UDS_PKG}/validate.yaml run --no-progress
cmd: uds run -f src/${UDS_PKG}/tasks.yaml validate --no-progress

- name: uds-core
description: "Build and test UDS Core"
Expand All @@ -27,5 +27,5 @@ tasks:
cmd: |
set -e
for package in src/*; do
uds run -f ${package}/validate.yaml run --no-progress
uds run -f ${package}/tasks.yaml validate --no-progress
done

0 comments on commit 92a04ea

Please sign in to comment.