Skip to content

Commit 0620b8a

Browse files
committed
Enable dependency assert again to re-evaluate
1 parent 7385bd7 commit 0620b8a

3 files changed

Lines changed: 40 additions & 40 deletions

File tree

internal/controllers/applicationcredential/tests/applicationcredential-import-dependency/01-create-trap-resource.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ spec:
77
cloudCredentialsRef:
88
cloudName: openstack-admin
99
secretName: openstack-clouds
10-
managementPolicy: unmanaged
11-
import:
12-
filter:
13-
name: admin
10+
managementPolicy: managed
11+
resource:
12+
description: application-credential external user
13+
passwordRef: application-credential-user-password
1414
---
1515
# This `applicationcredential-import-dependency-not-this-one` should not be picked by the import filter
1616
apiVersion: openstack.k-orc.cloud/v1alpha1
Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
---
22
# FIXME: Need to be able to grant newly created external user permission to create application credentials
3-
# apiVersion: kuttl.dev/v1beta1
4-
# kind: TestAssert
5-
# resourceRefs:
6-
# - apiVersion: openstack.k-orc.cloud/v1alpha1
7-
# kind: ApplicationCredential
8-
# name: applicationcredential-import-dependency
9-
# ref: applicationcredential1
10-
# - apiVersion: openstack.k-orc.cloud/v1alpha1
11-
# kind: ApplicationCredential
12-
# name: applicationcredential-import-dependency-not-this-one
13-
# ref: applicationcredential2
14-
# - apiVersion: openstack.k-orc.cloud/v1alpha1
15-
# kind: User
16-
# name: applicationcredential-import-dependency
17-
# ref: user
18-
# assertAll:
19-
# - celExpr: "applicationcredential1.status.id != applicationcredential2.status.id"
20-
# # ---
21-
# apiVersion: openstack.k-orc.cloud/v1alpha1
22-
# kind: ApplicationCredential
23-
# metadata:
24-
# name: applicationcredential-import-dependency
25-
# status:
26-
# conditions:
27-
# - type: Available
28-
# message: OpenStack resource is available
29-
# status: "True"
30-
# reason: Success
31-
# - type: Progressing
32-
# message: OpenStack resource is up to date
33-
# status: "False"
34-
# reason: Success
3+
apiVersion: kuttl.dev/v1beta1
4+
kind: TestAssert
5+
resourceRefs:
6+
- apiVersion: openstack.k-orc.cloud/v1alpha1
7+
kind: ApplicationCredential
8+
name: applicationcredential-import-dependency
9+
ref: applicationcredential1
10+
- apiVersion: openstack.k-orc.cloud/v1alpha1
11+
kind: ApplicationCredential
12+
name: applicationcredential-import-dependency-not-this-one
13+
ref: applicationcredential2
14+
- apiVersion: openstack.k-orc.cloud/v1alpha1
15+
kind: User
16+
name: applicationcredential-import-dependency
17+
ref: user
18+
assertAll:
19+
- celExpr: "applicationcredential1.status.id != applicationcredential2.status.id"
20+
---
21+
apiVersion: openstack.k-orc.cloud/v1alpha1
22+
kind: ApplicationCredential
23+
metadata:
24+
name: applicationcredential-import-dependency
25+
status:
26+
conditions:
27+
- type: Available
28+
message: OpenStack resource is available
29+
status: "True"
30+
reason: Success
31+
- type: Progressing
32+
message: OpenStack resource is up to date
33+
status: "False"
34+
reason: Success

internal/controllers/applicationcredential/tests/applicationcredential-import-dependency/02-create-resource.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ spec:
77
cloudCredentialsRef:
88
cloudName: openstack-admin
99
secretName: openstack-clouds
10-
managementPolicy: managed
11-
resource:
12-
description: application-credential external user
13-
passwordRef: application-credential-user-password
10+
managementPolicy: unmanaged
11+
import:
12+
filter:
13+
name: admin
1414
---
1515
apiVersion: openstack.k-orc.cloud/v1alpha1
1616
kind: ApplicationCredential

0 commit comments

Comments
 (0)