Skip to content

Commit 0d1a678

Browse files
stuggiabays
authored andcommitted
[kuttl] Add ctlplane NAD to kuttl deps
With openstack-k8s-operators/telemetry-operator@8a906d9 telemetry required the ctlplane nad to exist. This adds it to the kuttl job which failed with: ``` case.go:380: resource OpenStackControlPlane:openstack-kuttl-tests/openstack-collapsed-cell: .status.conditions.message: value mismatch, expected: Setup complete != actual: Telemetry: NetworkAttachment resources missing: ctlplane ``` Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
1 parent 541909c commit 0d1a678

9 files changed

Lines changed: 34 additions & 6 deletions

File tree

test/kuttl/common/00-deps.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestStep
3+
commands:
4+
- script: |
5+
oc apply -n $NAMESPACE -f ../../common/nad.yaml
6+
oc apply -f ../../common/rhobs.yaml
7+
until oc api-resources | grep -q rhobs; do sleep 1; done

test/kuttl/common/nad.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
apiVersion: k8s.cni.cncf.io/v1
2+
kind: NetworkAttachmentDefinition
3+
metadata:
4+
labels:
5+
osp/net: ctlplane
6+
name: ctlplane
7+
spec:
8+
config: |
9+
{
10+
"cniVersion": "0.3.1",
11+
"name": "ctlplane",
12+
"type": "macvlan",
13+
"master": "enp7s0",
14+
"ipam": {
15+
"type": "whereabouts",
16+
"range": "172.20.250.0/24",
17+
"range_start": "172.20.250.30",
18+
"range_end": "172.20.250.70"
19+
}
20+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../common/00-deps.yaml
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../common/00-deps.yaml
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../common/00-deps.yaml

test/kuttl/tests/ctlplane-collapsed/00-deps.yaml

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../common/00-deps.yaml
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../common/00-deps.yaml
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../common/00-deps.yaml
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../common/00-deps.yaml

0 commit comments

Comments
 (0)