[release-v3.30] Auto pick #10015: Install Calico in OCP with eBPF mode as the default

Makefile

@@ -182,7 +182,7 @@ helm-index:
 
 # Creates the tar file used for installing Calico on OpenShift.
 bin/ocp.tgz: manifests/ocp/ bin/yq
-	tar czvf $@ -C manifests/ ocp
+	tar czvf $@ --exclude='.gitattributes' -C manifests/ ocp
 
 ## Generates release notes for the given version.
 .PHONY: release-notes

manifests/generate.sh

@@ -113,6 +113,17 @@ ${HELM} template \
 find ocp/tigera-operator -name "*.yaml" | xargs sed -i -e 1,2d
 mv $(find ocp/tigera-operator -name "*.yaml") ocp/ && rm -r ocp/tigera-operator
 
+# Generating the upgrade manifest for OCP.
+# It excludes the CRs (01-*) and the specific BPF files to maintain compatibility with iptables.
+VALUES_FILES=$(ls ocp | grep -v -e '^01-' -e 'cluster-network-operator.yaml' -e '02-configmap-calico-resources.yaml')
+rm -f tigera-operator-ocp-upgrade.yaml
+for FILE in $VALUES_FILES; do
+  cat "ocp/$FILE" >> tigera-operator-ocp-upgrade.yaml
+  echo -e "---" >> tigera-operator-ocp-upgrade.yaml  # Add divisor
+done
+# Remove the last separator (last line)
+sed -i -e '$ d' tigera-operator-ocp-upgrade.yaml
+
 ##########################################################################
 # Build Calico manifest used for in-repo testing. This is largely the same as the
 # one we ship, but with tweaked values.

manifests/ocp/01-configmap-kubernetes-services-endpoint.yaml

@@ -0,0 +1,15 @@
+# This ConfigMap sets the Kubernetes API server endpoint, required when 
+# installing Calico on OpenShift with eBPF dataplane.
+# If you are installing Calico on OpenShift with the Iptables dataplane, you can remove it.
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: kubernetes-services-endpoint
+  namespace: tigera-operator
+data:
+  # By default, the hostname is formed by concatenating the "api" prefix, the cluster name you typed
+  # during the OpenShift initial configuration, and the base domain you selected in the same process. 
+  # It could also point to the load balancer in front of the API server.
+  KUBERNETES_SERVICE_HOST: "api.<cluster_name>.<base_domain>"
+  # OpenShift typically uses port 6443 as the default for the Kubernetes Service.
+  KUBERNETES_SERVICE_PORT: "6443"

manifests/ocp/01-cr-installation.yaml

@@ -4,6 +4,11 @@ kind: Installation
 metadata:
   name: default
 spec:
+  # Configures Calico networking using the eBPF dataplane. If you want to change the dataplane
+  # to iptables, you should set the linuxDataplane parameter below to "Iptables" and set the
+  # deployKubeProxy parameter to true in the cluster-network-operator.yaml file.
+  calicoNetwork:
+    linuxDataplane: BPF
   variant: Calico
 
   # List of image pull secrets to use when installing images from a container registry.

manifests/ocp/cluster-network-operator.yaml

@@ -0,0 +1,9 @@
+apiVersion: operator.openshift.io/v1
+kind: Network
+metadata:
+  name: cluster
+spec:
+  # The eBPF dataplane doesn't require the kube-proxy to be deployed, so it's set to false.
+  # If you change the linuxDataplane to Iptables in 01-cr-installation.yaml, the deployKubeProxy parameter must be set to true.
+  deployKubeProxy: false
+status: {}