Skip to content

Commit

Permalink
Fix name of 'test-annotations-job' to avoid clashes
Browse files Browse the repository at this point in the history
  • Loading branch information
bsquizz committed Jan 24, 2025
1 parent 213b32a commit 9c40646
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion tests/kuttl/test-annotations-job/00-install.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Namespace
metadata:
name: test-clowder-jobs
name: test-annotations-job
spec:
finalizers:
- kubernetes
12 changes: 6 additions & 6 deletions tests/kuttl/test-annotations-job/01-assert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: v1
kind: Secret
metadata:
name: puptoo
namespace: test-clowder-jobs
namespace: test-annotations-job
labels:
app: puptoo
ownerReferences:
Expand All @@ -16,13 +16,13 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: puptoo-processor
namespace: test-clowder-jobs
namespace: test-annotations-job
---
apiVersion: batch/v1
kind: CronJob
metadata:
name: puptoo-standard-cron
namespace: test-clowder-jobs
namespace: test-annotations-job
annotations:
CustomAnnotation: "Much Annotate. Very inform."
spec:
Expand Down Expand Up @@ -55,7 +55,7 @@ apiVersion: batch/v1
kind: CronJob
metadata:
name: puptoo-suspend-cron
namespace: test-clowder-jobs
namespace: test-annotations-job
annotations:
CustomAnnotation: "Much Annotate. Very inform."
spec:
Expand All @@ -82,7 +82,7 @@ apiVersion: batch/v1
kind: CronJob
metadata:
name: puptoo-restart-on-failure
namespace: test-clowder-jobs
namespace: test-annotations-job
annotations:
CustomAnnotation: "Much Annotate. Very inform."
spec:
Expand All @@ -105,7 +105,7 @@ spec:
apiVersion: batch/v1
kind: Job
metadata:
namespace: test-clowder-jobs
namespace: test-annotations-job
labels:
job: puptoo-hello-cji
annotations:
Expand Down
14 changes: 7 additions & 7 deletions tests/kuttl/test-annotations-job/01-pods.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
apiVersion: cloud.redhat.com/v1alpha1
kind: ClowdEnvironment
metadata:
name: test-clowder-jobs
name: test-annotations-job
spec:
targetNamespace: test-clowder-jobs
targetNamespace: test-annotations-job
providers:
web:
port: 8000
Expand Down Expand Up @@ -37,19 +37,19 @@ apiVersion: cloud.redhat.com/v1alpha1
kind: ClowdApp
metadata:
name: puptoo
namespace: test-clowder-jobs
namespace: test-annotations-job
annotations:
CustomAnnotation: "Much Annotate. Very inform."
spec:
envName: test-clowder-jobs
envName: test-annotations-job
deployments:
- name: processor
podSpec:
image: quay.io/psav/clowder-hello
jobs:
- name: standard-cron
schedule: "*/1 * * * *"
suspend: false
suspend: false
successfulJobsHistoryLimit: 2
failedJobsHistoryLimit: 2
activeDeadlineSeconds: 6000
Expand All @@ -69,7 +69,7 @@ spec:
args:
- ./clowder-hello
- boo
- name: restart-on-failure
- name: restart-on-failure
schedule: "*/1 * * * *"
restartPolicy: OnFailure
podSpec:
Expand All @@ -95,7 +95,7 @@ apiVersion: cloud.redhat.com/v1alpha1
kind: ClowdJobInvocation
metadata:
name: runner
namespace: test-clowder-jobs
namespace: test-annotations-job
spec:
appName: puptoo
jobs:
Expand Down
12 changes: 6 additions & 6 deletions tests/kuttl/test-annotations-job/02-json-asserts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ apiVersion: kuttl.dev/v1alpha1
kind: TestStep
commands:
- script: sleep 90
- script: kubectl get pod -l app=puptoo -l pod=puptoo-standard-cron -n test-clowder-jobs -o json > /tmp/test-clowder-jobs
- script: kubectl logs `jq -r '.items[0].metadata.name' < /tmp/test-clowder-jobs` -n test-clowder-jobs > /tmp/test-clowder-jobs-output
- script: grep "Hi" /tmp/test-clowder-jobs-output
- script: kubectl get pod -l app=puptoo -l job=puptoo-hello-cji -n test-clowder-jobs -o json > /tmp/test-clowder-jobs
- script: kubectl logs `jq -r '.items[0].metadata.name' < /tmp/test-clowder-jobs` -n test-clowder-jobs > /tmp/test-clowder-jobs-output-hello-cji-runner
- script: grep "Hello!" /tmp/test-clowder-jobs-output-hello-cji-runner
- script: kubectl get pod -l app=puptoo -l pod=puptoo-standard-cron -n test-annotations-job -o json > /tmp/test-annotations-job
- script: kubectl logs `jq -r '.items[0].metadata.name' < /tmp/test-annotations-job` -n test-annotations-job > /tmp/test-annotations-job-output
- script: grep "Hi" /tmp/test-annotations-job-output
- script: kubectl get pod -l app=puptoo -l job=puptoo-hello-cji -n test-annotations-job -o json > /tmp/test-annotations-job
- script: kubectl logs `jq -r '.items[0].metadata.name' < /tmp/test-annotations-job` -n test-annotations-job > /tmp/test-annotations-job-output-hello-cji-runner
- script: grep "Hello!" /tmp/test-annotations-job-output-hello-cji-runner
4 changes: 2 additions & 2 deletions tests/kuttl/test-annotations-job/03-delete.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: TestStep
delete:
- apiVersion: v1
kind: Namespace
name: test-clowder-jobs
name: test-annotations-job
- apiVersion: cloud.redhat.com/v1alpha1
kind: ClowdEnvironment
name: test-clowder-jobs
name: test-annotations-job

0 comments on commit 9c40646

Please sign in to comment.