-
Notifications
You must be signed in to change notification settings - Fork 2k
Add support to the step registry for the openshift-sdn modes #8157
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| approvers: | ||
| - danwinship | ||
| - dcbw | ||
| - knobunc | ||
| - pecameron | ||
| - squeed | ||
| reviewers: | ||
| - alexanderconstantinescu | ||
| - danwinship | ||
| - dcbw | ||
| - jacobtanenbaum | ||
| - pecameron | ||
| - rcarrillocruz | ||
| - squeed |
14 changes: 14 additions & 0 deletions
14
ci-operator/step-registry/origin/e2e-aws-sdn-multi/origin-e2e-aws-sdn-multi-workflow.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| workflow: | ||
| as: origin-e2e-aws-sdn-multi | ||
| steps: | ||
| pre: | ||
| - chain: ipi-conf-aws | ||
| - ref: sdn-conf | ||
| - ref: sdn-conf-multi-manifest | ||
| - chain: ipi-install | ||
| test: | ||
| - ref: origin-e2e-test | ||
| post: | ||
| - chain: ipi-deprovision | ||
| documentation: |- | ||
| The Origin E2E SDN multi workflow executes the common end-to-end test suite with the OpenShiftSDN multitenant network plugin. |
14 changes: 14 additions & 0 deletions
14
ci-operator/step-registry/origin/e2e-aws-sdn-single/OWNERS
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| approvers: | ||
| - danwinship | ||
| - dcbw | ||
| - knobunc | ||
| - pecameron | ||
| - squeed | ||
| reviewers: | ||
| - alexanderconstantinescu | ||
| - danwinship | ||
| - dcbw | ||
| - jacobtanenbaum | ||
| - pecameron | ||
| - rcarrillocruz | ||
| - squeed |
14 changes: 14 additions & 0 deletions
14
ci-operator/step-registry/origin/e2e-aws-sdn-single/origin-e2e-aws-sdn-single-workflow.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| workflow: | ||
| as: origin-e2e-aws-sdn-single | ||
| steps: | ||
| pre: | ||
| - chain: ipi-conf-aws | ||
| - ref: sdn-conf | ||
| - ref: sdn-conf-single-manifest | ||
| - chain: ipi-install | ||
| test: | ||
| - ref: origin-e2e-test | ||
| post: | ||
| - chain: ipi-deprovision | ||
| documentation: |- | ||
| The Origin E2E SDN single workflow executes the common end-to-end test suite with the OpenShiftSDN single tenant network plugin. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| approvers: | ||
| - danwinship | ||
| - dcbw | ||
| - knobunc | ||
| - pecameron | ||
| - squeed | ||
| reviewers: | ||
| - alexanderconstantinescu | ||
| - danwinship | ||
| - dcbw | ||
| - jacobtanenbaum | ||
| - pecameron | ||
| - rcarrillocruz | ||
| - squeed |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| approvers: | ||
| - danwinship | ||
| - dcbw | ||
| - knobunc | ||
| - pecameron | ||
| - squeed | ||
| options: {} | ||
| reviewers: | ||
| - alexanderconstantinescu | ||
| - danwinship | ||
| - dcbw | ||
| - jacobtanenbaum | ||
| - pecameron | ||
| - rcarrillocruz | ||
| - squeed |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| approvers: | ||
| - danwinship | ||
| - dcbw | ||
| - knobunc | ||
| - pecameron | ||
| - squeed | ||
| reviewers: | ||
| - alexanderconstantinescu | ||
| - danwinship | ||
| - dcbw | ||
| - jacobtanenbaum | ||
| - pecameron | ||
| - rcarrillocruz | ||
| - squeed |
23 changes: 23 additions & 0 deletions
23
ci-operator/step-registry/sdn/conf/multi-manifest/sdn-conf-multi-manifest-commands.sh
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #!/bin/bash | ||
| set -o errexit | ||
| set -o nounset | ||
| set -o pipefail | ||
|
|
||
| cat > "${SHARED_DIR}/manifest_cluster-network-03-config.yml" << EOF | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Network | ||
| metadata: | ||
| name: cluster | ||
| spec: | ||
| serviceNetwork: | ||
| - "172.30.0.0/16" | ||
| clusterNetwork: | ||
| - cidr: "10.128.0.0/14" | ||
| hostPrefix: 23 | ||
| networkType: OpenShiftSDN | ||
| openshiftSDNConfig: | ||
| mode: Multitenant | ||
| vxlanPort: 4789 | ||
| enableUnidling: true | ||
| useExternalOpenvswitch: false | ||
| EOF |
10 changes: 10 additions & 0 deletions
10
ci-operator/step-registry/sdn/conf/multi-manifest/sdn-conf-multi-manifest-ref.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| ref: | ||
| as: sdn-conf-multi-manifest | ||
| from: base | ||
| commands: sdn-conf-multi-manifest-commands.sh | ||
| resources: | ||
| requests: | ||
| cpu: 10m | ||
| memory: 100Mi | ||
| documentation: |- | ||
| 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. | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| #!/bin/bash | ||
| set -o errexit | ||
| set -o nounset | ||
| set -o pipefail | ||
|
|
||
| cat >> "${SHARED_DIR}/install-config.yaml" << EOF | ||
dcbw marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| networking: | ||
| networkType: OpenShiftSDN | ||
| EOF | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| ref: | ||
| as: sdn-conf | ||
| from: base | ||
| commands: sdn-conf-commands.sh | ||
| resources: | ||
| requests: | ||
| cpu: 10m | ||
| memory: 100Mi | ||
| documentation: |- | ||
| The sdn configure step sets the networkType to OpenShiftSDN in the install-config.yaml |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| approvers: | ||
| - danwinship | ||
| - dcbw | ||
| - knobunc | ||
| - pecameron | ||
| - squeed | ||
| reviewers: | ||
| - alexanderconstantinescu | ||
| - danwinship | ||
| - dcbw | ||
| - jacobtanenbaum | ||
| - pecameron | ||
| - rcarrillocruz | ||
| - squeed |
23 changes: 23 additions & 0 deletions
23
ci-operator/step-registry/sdn/conf/single-manifest/sdn-conf-single-manifest-commands.sh
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #!/bin/bash | ||
| set -o errexit | ||
| set -o nounset | ||
| set -o pipefail | ||
|
|
||
| cat > "${SHARED_DIR}/manifest_cluster-network-03-config.yml" << EOF | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Network | ||
| metadata: | ||
| name: cluster | ||
| spec: | ||
| serviceNetwork: | ||
| - "172.30.0.0/16" | ||
| clusterNetwork: | ||
| - cidr: "10.128.0.0/14" | ||
| hostPrefix: 23 | ||
| networkType: OpenShiftSDN | ||
| openshiftSDNConfig: | ||
| mode: Subnet | ||
| vxlanPort: 4789 | ||
| enableUnidling: true | ||
| useExternalOpenvswitch: false | ||
| EOF |
10 changes: 10 additions & 0 deletions
10
ci-operator/step-registry/sdn/conf/single-manifest/sdn-conf-single-manifest-ref.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| ref: | ||
| as: sdn-conf-single-manifest | ||
pecameron marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| from: base | ||
| commands: sdn-conf-single-manifest-commands.sh | ||
| resources: | ||
| requests: | ||
| cpu: 10m | ||
| memory: 100Mi | ||
| documentation: |- | ||
| 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. | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know if this is a big deal but it might be cleaer to change this to sdn-conf-multitenant-manifest? it might be clearer if we ever need to create many manifests in the future
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was keeping the length of the filename down.