Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,13 @@ tests:
steps:
cluster_profile: vsphere
workflow: openshift-e2e-vsphere
- as: e2e-aws-ovn-local-gateway
interval: 48h
steps:
cluster_profile: aws
env:
GATEWAY_MODE: local
workflow: openshift-e2e-aws-ovn
- as: e2e-vsphere-ovn
interval: 24h
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18530,6 +18530,81 @@ periodics:
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
cluster: build02
decorate: true
decoration_config:
skip_cloning: true
extra_refs:
- base_ref: master
org: openshift
repo: release
interval: 48h
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
ci-operator.openshift.io/variant: nightly-4.8
job-release: "4.8"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-release-master-nightly-4.8-e2e-aws-ovn-local-gateway
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --secret-dir=/usr/local/e2e-aws-ovn-local-gateway-cluster-profile
- --target=e2e-aws-ovn-local-gateway
- --variant=nightly-4.8
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /usr/local/e2e-aws-ovn-local-gateway-cluster-profile
name: cluster-profile
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: boskos
secret:
items:
- key: credentials
path: credentials
secretName: boskos-credentials
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-aws
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
cluster: build02
cron: 0 0 */2 * *
Expand Down
20 changes: 20 additions & 0 deletions ci-operator/step-registry/ovn/conf/ovn-conf-commands.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,23 @@ cat >> "${SHARED_DIR}/install-config.yaml" << EOF
networking:
networkType: OVNKubernetes
EOF
echo "install-config.yaml"
echo "-------------------"
cat ${SHARED_DIR}/install-config.yaml

if [[ ! -z "${GATEWAY_MODE}" ]]; then
echo "Overriding OVN gateway mode with \"${GATEWAY_MODE}\""
cat >> "${SHARED_DIR}/manifest_cluster-network-00-gateway-mode.yaml" << EOF
apiVersion: v1
kind: ConfigMap
metadata:
name: gateway-mode-config
namespace: openshift-network-operator
data:
mode: "${GATEWAY_MODE}"
immutable: true
EOF
echo "manifest_cluster-network-00-gateway-mode.yaml"
echo "---------------------------------------------"
cat ${SHARED_DIR}/manifest_cluster-network-00-gateway-mode.yaml
fi
4 changes: 4 additions & 0 deletions ci-operator/step-registry/ovn/conf/ovn-conf-ref.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,9 @@ ref:
requests:
cpu: 10m
memory: 100Mi
env:
- name: GATEWAY_MODE
default: ""
documentation: |-
The ovn configure step changes the networkType from OpenshiftSDN to OVNKubernetes in the install-config.yaml
It will also create a configMap with a gateway-mode config if ${GATEWAY_MODE} exists