Skip to content

Commit db71b32

Browse files
committed
[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> # Please enter the commit message for your changes. Lines starting # with '#' will be kept; you may remove them yourself if you want to. # An empty message aborts the commit. # # HEAD detached at upstream/openstack-dependency-bump/main # Changes to be committed: # new file: ../common/nad.yaml # modified: ctlplane-collapsed/00-deps.yaml # # Untracked files: # ../../../1 # ../../../2 # ../../../IMPLEMENTATION_SUMMARY.md # ../../../TEST1_IMPROVEMENTS.md # ../../../TEST2_FIXES_TODO.md # ../../../TEST2_WEBHOOK_FIX.md # ../../../api/core/v1beta1/SERVICE_NAME_CACHING.md # ../../../building-test-catalog-for-upgrades.md # ../../../docs/dev/ # ../../../galerabackup-cell1.yaml # ../../../galerabackup.yaml # ../../../galerarestore-cell1.yaml # ../../../galerarestore.yaml # ../../../hack/pin-bundle-images.sh.bk # ../../../openstack-catalog-clean.Dockerfile # ../../../openstack-catalog-clean/ # ../../../openstack-catalog.Dockerfile # ../../../t.yaml # ../../../tt.yaml # ../../../webhook-backup.yaml # ../../../webhook-backup2.yaml #
1 parent 22f86fa commit db71b32

2 files changed

Lines changed: 21 additions & 0 deletions

File tree

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+
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ apiVersion: kuttl.dev/v1beta1
22
kind: TestStep
33
commands:
44
- script: |
5+
oc apply -f ../../common/nad.yaml
56
oc apply -f ../../common/rhobs.yaml
67
until oc api-resources | grep -q rhobs; do sleep 1; done

0 commit comments

Comments
 (0)