Skip to content

Commit 117fccd

Browse files
adrianfuscosdatko
authored andcommitted
Decouple uni02beta network from control plane and add definitions for adoption
1 parent e70bd73 commit 117fccd

File tree

12 files changed

+868
-7
lines changed

12 files changed

+868
-7
lines changed

automation/net-env/uni02beta-adoption.yaml

Lines changed: 776 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
vas:
3+
uni02beta-adoption:
4+
stages:
5+
- name: nncp-configuration
6+
path: examples/dt/uni02beta/control-plane/networking/nncp
7+
wait_conditions:
8+
- >-
9+
oc -n openstack wait nncp
10+
-l osp/nncm-config-type=standard
11+
--for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured
12+
--timeout=5m
13+
values:
14+
- name: network-values
15+
src_file: values.yaml
16+
build_output: nncp.yaml
17+
18+
- name: network-configuration
19+
path: examples/dt/uni02beta/control-plane/networking
20+
wait_conditions:
21+
- >-
22+
oc -n metallb-system wait pod
23+
-l app=metallb -l component=speaker
24+
--for condition=Ready
25+
--timeout=5m
26+
values:
27+
- name: network-values
28+
src_file: nncp/values.yaml
29+
build_output: network.yaml

automation/vars/uni02beta.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ vas:
33
uni02beta:
44
stages:
55
- name: nncp-configuration
6-
path: examples/dt/uni02beta/control-plane/nncp
6+
path: examples/dt/uni02beta/control-plane/networking/nncp
77
wait_conditions:
88
- >-
99
oc -n openstack wait nncp
@@ -15,6 +15,19 @@ vas:
1515
src_file: values.yaml
1616
build_output: nncp.yaml
1717

18+
- name: network-configuration
19+
path: examples/dt/uni02beta/control-plane/networking
20+
wait_conditions:
21+
- >-
22+
oc -n metallb-system wait pod
23+
-l app=metallb -l component=speaker
24+
--for condition=Ready
25+
--timeout=5m
26+
values:
27+
- name: network-values
28+
src_file: nncp/values.yaml
29+
build_output: network.yaml
30+
1831
- name: control-plane
1932
path: examples/dt/uni02beta/control-plane
2033
wait_conditions:
@@ -25,7 +38,7 @@ vas:
2538
--timeout=60m
2639
values:
2740
- name: network-values
28-
src_file: nncp/values.yaml
41+
src_file: networking/nncp/values.yaml
2942
- name: service-values
3043
src_file: service-values.yaml
3144
build_output: control-plane.yaml
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1alpha1
3+
kind: Component
4+
5+
transformers:
6+
- |-
7+
apiVersion: builtin
8+
kind: NamespaceTransformer
9+
metadata:
10+
name: _ignored_
11+
namespace: openstack
12+
setRoleBindingSubjects: none
13+
unsetOnly: true
14+
fieldSpecs:
15+
- path: metadata/name
16+
kind: Namespace
17+
create: true
18+
components:
19+
- ../../../lib/networking/metallb
20+
- ../../../lib/networking/netconfig
21+
- ../../../lib/networking/nad

examples/dt/uni02beta/control-plane.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ cd architecture/examples/dt/uni02beta
1919
```
2020

2121
Edit [control-plane/service-values.yaml](control-plane/service-values.yaml) and
22-
[control-plane/nncp/values.yaml](control-plane/nncp/values.yaml).
22+
[control-plane/networking/nncp/values.yaml](control-plane/networking/nncp/values.yaml).
2323

2424
Apply node network configuration
2525

2626
```bash
27-
pushd control-plane/nncp
27+
pushd control-plane/networking/nncp
2828
kustomize build > nncp.yaml
2929
oc apply -f nncp.yaml
3030
oc wait nncp \

examples/dt/uni02beta/control-plane/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ components:
99
- ../../../../dt/uni02beta
1010

1111
resources:
12-
- nncp/values.yaml
12+
- networking/nncp/values.yaml
1313
- service-values.yaml
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
5+
components:
6+
- ../../../../../dt/uni02beta/networking/
7+
8+
resources:
9+
- nncp/values.yaml

examples/dt/uni02beta/control-plane/nncp/kustomization.yaml renamed to examples/dt/uni02beta/control-plane/networking/nncp/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ transformers:
1717
create: true
1818
1919
components:
20-
- ../../../../../lib/nncp
20+
- ../../../../../../lib/nncp
2121

2222
resources:
2323
- values.yaml

0 commit comments

Comments
 (0)