From 05f31e23962e595979492d4087a4e8c2362e4701 Mon Sep 17 00:00:00 2001 From: Vara Date: Thu, 2 Jan 2025 11:57:50 -0800 Subject: [PATCH] Add required steps for installing enterprise on Openshift v4.16+ on AWS --- .../_includes/components/InstallOpenShift.js | 32 +++++++++---------- .../_includes/components/InstallOpenShift.js | 32 +++++++++---------- 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/calico-enterprise_versioned_docs/version-3.20-1/_includes/components/InstallOpenShift.js b/calico-enterprise_versioned_docs/version-3.20-1/_includes/components/InstallOpenShift.js index 2d39112271..2db3bb6f5d 100644 --- a/calico-enterprise_versioned_docs/version-3.20-1/_includes/components/InstallOpenShift.js +++ b/calico-enterprise_versioned_docs/version-3.20-1/_includes/components/InstallOpenShift.js @@ -84,23 +84,21 @@ export default function InstallOpenShift(props) {

For OpenShift **v4.16 or newer** on **AWS**, configure AWS security groups to allow BGP, typha and IP-in-IP encapsulation traffic by editing the OpenShift cluster-api manifests.

Edit `spec.network.cni.cniIngressRules` in the `cluster-api/02_infra-cluster.yaml` file to add

- {` - cniIngressRules: - (...) - - description: BGP (calico) - fromPort: 179 - protocol: tcp - toPort: 179 - - description: IP-in-IP (calico) - fromPort: -1 - protocol: "4" - toPort: -1 - - description: Typha (calico) - fromPort: 5473 - protocol: tcp - toPort: 5473 - `} - + {`cniIngressRules: +(...) +- description: BGP (calico enterprise) + fromPort: 179 + protocol: tcp + toPort: 179 +- description: IP-in-IP (calico enterprise) + fromPort: -1 + protocol: "4" + toPort: -1 +- description: Typha (calico enterprise) + fromPort: 5473 + protocol: tcp + toPort: 5473 +`} diff --git a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallOpenShift.js b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallOpenShift.js index 6a7a8146bc..7011fb406d 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallOpenShift.js +++ b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallOpenShift.js @@ -84,23 +84,21 @@ export default function InstallOpenShift(props) {

For OpenShift **v4.16 or newer** on **AWS**, configure AWS security groups to allow BGP, typha and IP-in-IP encapsulation traffic by editing the OpenShift cluster-api manifests.

Edit `spec.network.cni.cniIngressRules` in the `cluster-api/02_infra-cluster.yaml` file to add

- {` - cniIngressRules: - (...) - - description: BGP (calico) - fromPort: 179 - protocol: tcp - toPort: 179 - - description: IP-in-IP (calico) - fromPort: -1 - protocol: "4" - toPort: -1 - - description: Typha (calico) - fromPort: 5473 - protocol: tcp - toPort: 5473 - `} - + {`cniIngressRules: +(...) +- description: BGP (calico enterprise) + fromPort: 179 + protocol: tcp + toPort: 179 +- description: IP-in-IP (calico enterprise) + fromPort: -1 + protocol: "4" + toPort: -1 +- description: Typha (calico enterprise) + fromPort: 5473 + protocol: tcp + toPort: 5473 +`}