Skip to content

Commit 7b9b901

Browse files
committed
Add a test NAD to allow more code paths to run during testing
Adds a NAD so functionality such as predictable IPs and bind pool generation can be tested via kuttl. This NAD is not appropriate if kuttl tests use multiple openshift workers as the NAD is a bridge type.
1 parent ba17591 commit 7b9b901

File tree

7 files changed

+62
-2
lines changed

7 files changed

+62
-2
lines changed

config/samples/designate_v1beta1_designate.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ spec:
2222
designateBackendbind9:
2323
secret: osp-secret
2424
serviceUser: designate
25+
replicas: 1
2526
customServiceConfig: |
2627
[DEFAULT]
2728
debug = true
2829
databaseAccount: designate
2930
rabbitMqClusterName: rabbitmq
30-
storageRequest: 1G
31+
storageRequest: 10G
3132
storageClass: local-storage
3233
networkAttachments:
3334
- designate

config/samples/designate_v1beta1_designate_tls.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,13 @@ spec:
4343
caBundleSecretName: combined-ca-bundle
4444
designateBackendbind9:
4545
databaseAccount: designate
46+
replicas: 1
4647
serviceUser: designate
4748
secret: osp-secret
4849
customServiceConfig: |
4950
[DEFAULT]
5051
debug = true
51-
storageRequest: 1G
52+
storageRequest: 10G
5253
storageClass: local-storage
5354
networkAttachments:
5455
- designate
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Please edit the object below. Lines beginning with a '#' will be ignored,
2+
# and an empty file will abort the edit. If an error occurs while saving this file will be
3+
# reopened with the relevant failures.
4+
#
5+
apiVersion: k8s.cni.cncf.io/v1
6+
kind: NetworkAttachmentDefinition
7+
metadata:
8+
name: designate
9+
spec:
10+
config: |
11+
{
12+
"cniVersion": "0.3.1",
13+
"name": "designate",
14+
"type": "bridge",
15+
"ipam": {
16+
"type": "whereabouts",
17+
"range": "172.28.0.0/24",
18+
"range_start": "172.28.0.30",
19+
"range_end": "172.28.0.70"
20+
}
21+
}

tests/kuttl/tests/basic/01-deploy-designate.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,12 @@ kind: TestStep
33
commands:
44
- script: |
55
cp ../../../../config/samples/designate_v1beta1_designate.yaml deploy
6+
# Do not modify the designate network attachment if it already
7+
# exists.
8+
if ! (oc get -n $NAMESPACE net-attach-def | grep designate);
9+
then
10+
cp ../../common/designate_nad.yaml deploy
11+
else
12+
echo "" > deploy/designate_nad.yaml
13+
fi
614
oc kustomize deploy | oc apply -n $NAMESPACE -f -
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4+
- ./designate_nad.yaml
45
- ./designate_v1beta1_designate.yaml
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestStep
3+
commands:
4+
- script: |
5+
# Do not modify the designate network attachment if it already
6+
# exists.
7+
set -e
8+
if ! (oc get -n $NAMESPACE net-attach-def | grep designate);
9+
then
10+
cp ../../common/designate_nad.yaml .
11+
oc apply -n $NAMESPACE -f designate_nad.yaml
12+
fi

tests/kuttl/tests/designate_tls/02-deploy.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ spec:
2828
customServiceConfig: |
2929
[DEFAULT]
3030
debug = true
31+
networkAttachments:
32+
- designate
3133
tls:
3234
caBundleSecretName: combined-ca-bundle
3335
designateCentral:
@@ -39,13 +41,27 @@ spec:
3941
debug = true
4042
tls:
4143
caBundleSecretName: combined-ca-bundle
44+
designateBackendbind9:
45+
databaseAccount: designate
46+
replicas: 1
47+
serviceUser: designate
48+
secret: osp-secret
49+
customServiceConfig: |
50+
[DEFAULT]
51+
debug = true
52+
storageRequest: 10G
53+
storageClass: local-storage
54+
networkAttachments:
55+
- designate
4256
designateWorker:
4357
databaseAccount: designate
4458
serviceUser: designate
4559
secret: osp-secret
4660
customServiceConfig: |
4761
[DEFAULT]
4862
debug = true
63+
networkAttachments:
64+
- designate
4965
tls:
5066
caBundleSecretName: combined-ca-bundle
5167
designateAPI:

0 commit comments

Comments
 (0)