Skip to content

Commit 1529611

Browse files
committed
Get orc resources via their full names
This avoids issues when the resource name conflicts with existing resources and we can't use shortcuts in kubectl commands (e.g. service or role).
1 parent b8d62d3 commit 1529611

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

cmd/scaffold-controller/data/tests/dependency/02-delete-dependencies.yaml.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: TestStep
55
commands:
66
# We expect the deletion to hang due to the finalizer, so use --wait=false
77
{{- range .AllCreateDependencies }}
8-
- command: kubectl delete {{ . | lower }} {{ $packageName }}-dependency --wait=false
8+
- command: kubectl delete {{ . | lower }}.openstack.k-orc.cloud {{ $packageName }}-dependency --wait=false
99
namespaced: true
1010
{{- end }}
1111
- command: kubectl delete secret {{ $packageName }}-dependency --wait=false

cmd/scaffold-controller/data/tests/dependency/03-assert.yaml.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: TestAssert
55
commands:
66
# Dependencies that were prevented deletion before should now be gone
77
{{- range .AllCreateDependencies }}
8-
- script: "! kubectl get {{ . | lower }} {{ $packageName }}-dependency --namespace $NAMESPACE"
8+
- script: "! kubectl get {{ . | lower }}.openstack.k-orc.cloud {{ $packageName }}-dependency --namespace $NAMESPACE"
99
skipLogOutput: true
1010
{{- end }}
1111
- script: "! kubectl get secret {{ $packageName }}-dependency --namespace $NAMESPACE"

cmd/scaffold-controller/data/tests/import-dependency/03-assert.yaml.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ apiVersion: kuttl.dev/v1beta1
44
kind: TestAssert
55
commands:
66
{{- range .ImportDependencies }}
7-
- script: "! kubectl get {{ . | lower }} {{ $packageName }}-import-dependency --namespace $NAMESPACE"
7+
- script: "! kubectl get {{ . | lower }}.openstack.k-orc.cloud {{ $packageName }}-import-dependency --namespace $NAMESPACE"
88
skipLogOutput: true
99
{{- end }}

cmd/scaffold-controller/data/tests/import-dependency/03-delete-import-dependencies.yaml.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ kind: TestStep
55
commands:
66
# We should be able to delete the import dependencies
77
{{- range .ImportDependencies }}
8-
- command: kubectl delete {{ . | lower }} {{ $packageName }}-import-dependency
8+
- command: kubectl delete {{ . | lower }}.openstack.k-orc.cloud {{ $packageName }}-import-dependency
99
namespaced: true
1010
{{- end }}

cmd/scaffold-controller/data/tests/import-dependency/04-assert.yaml.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
apiVersion: kuttl.dev/v1beta1
33
kind: TestAssert
44
commands:
5-
- script: "! kubectl get {{ .PackageName }} {{ .PackageName }}-import-dependency --namespace $NAMESPACE"
5+
- script: "! kubectl get {{ .PackageName }}.openstack.k-orc.cloud {{ .PackageName }}-import-dependency --namespace $NAMESPACE"
66
skipLogOutput: true

0 commit comments

Comments
 (0)