Skip to content

Commit 7484ea9

Browse files
pecameronpecameron
committed
Add support to the step registry for the openshift-sdn modes
https://issues.redhat.com/browse/SDN-858 Signed-off-by: Phil Cameron <[email protected]>
1 parent 089f4c5 commit 7484ea9

16 files changed

+346
-0
lines changed

‎ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,16 @@ tests:
5555
openshift_installer:
5656
cluster_profile: gcp
5757
upgrade: true
58+
- as: e2e-aws-sdn-single
59+
commands: ""
60+
steps:
61+
cluster_profile: aws
62+
workflow: origin-e2e-aws-sdn-single
63+
- as: e2e-aws-sdn-multi
64+
commands: ""
65+
steps:
66+
cluster_profile: aws
67+
workflow: origin-e2e-aws-sdn-multi
5868
- as: e2e-ovn-step-registry
5969
steps:
6070
cluster_profile: aws

‎ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml

+138
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,144 @@ presubmits:
192192
secret:
193193
secretName: sentry-dsn
194194
trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
195+
- agent: kubernetes
196+
always_run: true
197+
branches:
198+
- master
199+
cluster: api.ci
200+
context: ci/prow/e2e-aws-sdn-multi
201+
decorate: true
202+
decoration_config:
203+
skip_cloning: true
204+
labels:
205+
ci-operator.openshift.io/prowgen-controlled: "true"
206+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
207+
name: pull-ci-openshift-cluster-network-operator-master-e2e-aws-sdn-multi
208+
rerun_command: /test e2e-aws-sdn-multi
209+
spec:
210+
containers:
211+
- args:
212+
- --artifact-dir=$(ARTIFACTS)
213+
- --give-pr-author-access-to-namespace=true
214+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
215+
- --kubeconfig=/etc/apici/kubeconfig
216+
- --lease-server-password-file=/etc/boskos/password
217+
- --lease-server-username=ci
218+
- --lease-server=https://boskos-ci.svc.ci.openshift.org
219+
- --secret-dir=/usr/local/e2e-aws-sdn-multi-cluster-profile
220+
- --target=e2e-aws-sdn-multi
221+
command:
222+
- ci-operator
223+
image: ci-operator:latest
224+
imagePullPolicy: Always
225+
name: ""
226+
resources:
227+
requests:
228+
cpu: 10m
229+
volumeMounts:
230+
- mountPath: /etc/apici
231+
name: apici-ci-operator-credentials
232+
readOnly: true
233+
- mountPath: /etc/boskos
234+
name: boskos
235+
readOnly: true
236+
- mountPath: /usr/local/e2e-aws-sdn-multi-cluster-profile
237+
name: cluster-profile
238+
- mountPath: /etc/pull-secret
239+
name: pull-secret
240+
readOnly: true
241+
serviceAccountName: ci-operator
242+
volumes:
243+
- name: apici-ci-operator-credentials
244+
secret:
245+
items:
246+
- key: sa.ci-operator.apici.config
247+
path: kubeconfig
248+
secretName: apici-ci-operator-credentials
249+
- name: boskos
250+
secret:
251+
items:
252+
- key: password
253+
path: password
254+
secretName: boskos-credentials
255+
- name: cluster-profile
256+
projected:
257+
sources:
258+
- secret:
259+
name: cluster-secrets-aws
260+
- name: pull-secret
261+
secret:
262+
secretName: regcred
263+
trigger: (?m)^/test( | .* )e2e-aws-sdn-multi,?($|\s.*)
264+
- agent: kubernetes
265+
always_run: true
266+
branches:
267+
- master
268+
cluster: api.ci
269+
context: ci/prow/e2e-aws-sdn-single
270+
decorate: true
271+
decoration_config:
272+
skip_cloning: true
273+
labels:
274+
ci-operator.openshift.io/prowgen-controlled: "true"
275+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
276+
name: pull-ci-openshift-cluster-network-operator-master-e2e-aws-sdn-single
277+
rerun_command: /test e2e-aws-sdn-single
278+
spec:
279+
containers:
280+
- args:
281+
- --artifact-dir=$(ARTIFACTS)
282+
- --give-pr-author-access-to-namespace=true
283+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
284+
- --kubeconfig=/etc/apici/kubeconfig
285+
- --lease-server-password-file=/etc/boskos/password
286+
- --lease-server-username=ci
287+
- --lease-server=https://boskos-ci.svc.ci.openshift.org
288+
- --secret-dir=/usr/local/e2e-aws-sdn-single-cluster-profile
289+
- --target=e2e-aws-sdn-single
290+
command:
291+
- ci-operator
292+
image: ci-operator:latest
293+
imagePullPolicy: Always
294+
name: ""
295+
resources:
296+
requests:
297+
cpu: 10m
298+
volumeMounts:
299+
- mountPath: /etc/apici
300+
name: apici-ci-operator-credentials
301+
readOnly: true
302+
- mountPath: /etc/boskos
303+
name: boskos
304+
readOnly: true
305+
- mountPath: /usr/local/e2e-aws-sdn-single-cluster-profile
306+
name: cluster-profile
307+
- mountPath: /etc/pull-secret
308+
name: pull-secret
309+
readOnly: true
310+
serviceAccountName: ci-operator
311+
volumes:
312+
- name: apici-ci-operator-credentials
313+
secret:
314+
items:
315+
- key: sa.ci-operator.apici.config
316+
path: kubeconfig
317+
secretName: apici-ci-operator-credentials
318+
- name: boskos
319+
secret:
320+
items:
321+
- key: password
322+
path: password
323+
secretName: boskos-credentials
324+
- name: cluster-profile
325+
projected:
326+
sources:
327+
- secret:
328+
name: cluster-secrets-aws
329+
- name: pull-secret
330+
secret:
331+
secretName: regcred
332+
trigger: (?m)^/test( | .* )e2e-aws-sdn-single,?($|\s.*)
195333
- agent: kubernetes
196334
always_run: true
197335
branches:

‎ci-operator/step-registry/origin/e2e-aws-sdn-multi/OWNERS

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
approvers:
2+
- danwinship
3+
- dcbw
4+
- knobunc
5+
- pecameron
6+
- squeed
7+
reviewers:
8+
- alexanderconstantinescu
9+
- danwinship
10+
- dcbw
11+
- jacobtanenbaum
12+
- pecameron
13+
- rcarrillocruz
14+
- squeed

‎ci-operator/step-registry/origin/e2e-aws-sdn-multi/origin-e2e-aws-sdn-multi-workflow.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
workflow:
2+
as: origin-e2e-aws-sdn-multi
3+
steps:
4+
pre:
5+
- chain: ipi-conf-aws
6+
- ref: sdn-conf
7+
- ref: sdn-conf-multi-manifest
8+
- chain: ipi-install
9+
test:
10+
- ref: origin-e2e-test
11+
post:
12+
- chain: ipi-deprovision
13+
documentation: |-
14+
The Origin E2E SDN multi workflow executes the common end-to-end test suite with the OpenShiftSDN multitenant network plugin.

‎ci-operator/step-registry/origin/e2e-aws-sdn-single/OWNERS

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
approvers:
2+
- danwinship
3+
- dcbw
4+
- knobunc
5+
- pecameron
6+
- squeed
7+
reviewers:
8+
- alexanderconstantinescu
9+
- danwinship
10+
- dcbw
11+
- jacobtanenbaum
12+
- pecameron
13+
- rcarrillocruz
14+
- squeed

‎ci-operator/step-registry/origin/e2e-aws-sdn-single/origin-e2e-aws-sdn-single-workflow.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
workflow:
2+
as: origin-e2e-aws-sdn-single
3+
steps:
4+
pre:
5+
- chain: ipi-conf-aws
6+
- ref: sdn-conf
7+
- ref: sdn-conf-single-manifest
8+
- chain: ipi-install
9+
test:
10+
- ref: origin-e2e-test
11+
post:
12+
- chain: ipi-deprovision
13+
documentation: |-
14+
The Origin E2E SDN single workflow executes the common end-to-end test suite with the OpenShiftSDN single tenant network plugin.

‎ci-operator/step-registry/sdn/OWNERS

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
approvers:
2+
- danwinship
3+
- dcbw
4+
- knobunc
5+
- pecameron
6+
- squeed
7+
reviewers:
8+
- alexanderconstantinescu
9+
- danwinship
10+
- dcbw
11+
- jacobtanenbaum
12+
- pecameron
13+
- rcarrillocruz
14+
- squeed

‎ci-operator/step-registry/sdn/conf/OWNERS

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
approvers:
2+
- danwinship
3+
- dcbw
4+
- knobunc
5+
- pecameron
6+
- squeed
7+
options: {}
8+
reviewers:
9+
- alexanderconstantinescu
10+
- danwinship
11+
- dcbw
12+
- jacobtanenbaum
13+
- pecameron
14+
- rcarrillocruz
15+
- squeed

‎ci-operator/step-registry/sdn/conf/multi-manifest/OWNERS

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
approvers:
2+
- danwinship
3+
- dcbw
4+
- knobunc
5+
- pecameron
6+
- squeed
7+
reviewers:
8+
- alexanderconstantinescu
9+
- danwinship
10+
- dcbw
11+
- jacobtanenbaum
12+
- pecameron
13+
- rcarrillocruz
14+
- squeed

‎ci-operator/step-registry/sdn/conf/multi-manifest/sdn-conf-multi-manifest-commands.sh

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/bin/bash
2+
set -o errexit
3+
set -o nounset
4+
set -o pipefail
5+
6+
cat > "${SHARED_DIR}/manifest_cluster-network-03-config.yml" << EOF
7+
apiVersion: config.openshift.io/v1
8+
kind: Network
9+
metadata:
10+
name: cluster
11+
spec:
12+
serviceNetwork:
13+
- "172.30.0.0/16"
14+
clusterNetwork:
15+
- cidr: "10.128.0.0/14"
16+
hostPrefix: 23
17+
networkType: OpenShiftSDN
18+
openshiftSDNConfig:
19+
mode: Multitenant
20+
vxlanPort: 4789
21+
enableUnidling: true
22+
useExternalOpenvswitch: false
23+
EOF

‎ci-operator/step-registry/sdn/conf/multi-manifest/sdn-conf-multi-manifest-ref.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
ref:
2+
as: sdn-conf-multi-manifest
3+
from: base
4+
commands: sdn-conf-multi-manifest-commands.sh
5+
resources:
6+
requests:
7+
cpu: 10m
8+
memory: 100Mi
9+
documentation: |-
10+
The SDN multi-manifest step adds the configuration for SDN multi-tenant networking to set of manifests for installation. The script creates the manifest_cluster-network-03-config.yml file that is consumed by ipi-install-install.

‎ci-operator/step-registry/sdn/conf/sdn-conf-commands.sh

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
set -o errexit
3+
set -o nounset
4+
set -o pipefail
5+
6+
cat >> "${SHARED_DIR}/install-config.yaml" << EOF
7+
networking:
8+
networkType: OpenShiftSDN
9+
EOF

‎ci-operator/step-registry/sdn/conf/sdn-conf-ref.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
ref:
2+
as: sdn-conf
3+
from: base
4+
commands: sdn-conf-commands.sh
5+
resources:
6+
requests:
7+
cpu: 10m
8+
memory: 100Mi
9+
documentation: |-
10+
The sdn configure step sets the networkType to OpenShiftSDN in the install-config.yaml

‎ci-operator/step-registry/sdn/conf/single-manifest/OWNERS

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
approvers:
2+
- danwinship
3+
- dcbw
4+
- knobunc
5+
- pecameron
6+
- squeed
7+
reviewers:
8+
- alexanderconstantinescu
9+
- danwinship
10+
- dcbw
11+
- jacobtanenbaum
12+
- pecameron
13+
- rcarrillocruz
14+
- squeed

‎ci-operator/step-registry/sdn/conf/single-manifest/sdn-conf-single-manifest-commands.sh

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/bin/bash
2+
set -o errexit
3+
set -o nounset
4+
set -o pipefail
5+
6+
cat > "${SHARED_DIR}/manifest_cluster-network-03-config.yml" << EOF
7+
apiVersion: config.openshift.io/v1
8+
kind: Network
9+
metadata:
10+
name: cluster
11+
spec:
12+
serviceNetwork:
13+
- "172.30.0.0/16"
14+
clusterNetwork:
15+
- cidr: "10.128.0.0/14"
16+
hostPrefix: 23
17+
networkType: OpenShiftSDN
18+
openshiftSDNConfig:
19+
mode: Subnet
20+
vxlanPort: 4789
21+
enableUnidling: true
22+
useExternalOpenvswitch: false
23+
EOF

‎ci-operator/step-registry/sdn/conf/single-manifest/sdn-conf-single-manifest-ref.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
ref:
2+
as: sdn-conf-single-manifest
3+
from: base
4+
commands: sdn-conf-single-manifest-commands.sh
5+
resources:
6+
requests:
7+
cpu: 10m
8+
memory: 100Mi
9+
documentation: |-
10+
The SDN single-manifest step adds the configuration for SDN single-tenant networking to set of manifests for installation. The script creates the manifest_cluster-network-03-config.yml file that is consumed by ipi-install-install.

0 commit comments

Comments
 (0)