relocatable only requires RoutingViaHost for OCP 4.12

loganmc10 · May 18, 2023 · f1a9c0e · f1a9c0e
1 parent 2c1bce8
commit f1a9c0e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/edge/docs/RELOCATABLE.md b/edge/docs/RELOCATABLE.md
@@ -4,7 +4,7 @@ This feature requires OpenShift 4.12 or higher.
 When the ```relocatable``` option is enabled, the cluster is configured in such a way that its primary interface IP addresses can be changed without impacting the operation of the cluster.
 
 ## How it works
-You set the value of ```relocatable.interface``` to the name of the external facing interface. A secondary static IP address is assigned to this interface. The machineNetwork CIDR is also set to a static internal subnet. Finally, a MachineConfig is created that modifies /etc/default/nodeip-configuration to tell the cluster to use the static IP as the node IP. 'routingViaHost' is also enabled.
+You set the value of ```relocatable.interface``` to the name of the external facing interface. A secondary static IP address is assigned to this interface. The machineNetwork CIDR is also set to a static internal subnet. Finally, a MachineConfig is created that modifies /etc/default/nodeip-configuration to tell the cluster to use the static IP as the node IP. 'routingViaHost' is also enabled for OCP 4.12.
 
 All of these actions together cause the server to use the static IP for everything related to OpenShift, while still allowing access to the cluster from outside via the primary interface IP address. This means that the external IP can be changed, and the cluster will continue to use the static IP internally for its operation.
 

diff --git a/edge/roles/edge_install/tasks/install.yaml b/edge/roles/edge_install/tasks/install.yaml
@@ -13,15 +13,6 @@
   register: k8s_result
   until: k8s_result is not failed
 
-- name: Configure routingViaHost
-  when: (edgeCluster.routingViaHost is defined and edgeCluster.routingViaHost) or (edgeCluster.relocatable is defined)
-  kubernetes.core.k8s:
-    template: RoutingViaHost.yaml.j2
-    apply: true
-    state: present
-  register: k8s_result
-  until: k8s_result is not failed
-
 - name: Disable CRI-O wipe
   when:
     - edgeCluster.clearRegistryConfig is defined
@@ -111,6 +102,23 @@
   register: k8s_result
   until: k8s_result is not failed
 
+- name: Get Cluster Version
+  kubernetes.core.k8s_info:
+    api_version: hive.openshift.io/v1
+    kind: ClusterDeployment
+    name: "{{ metadata.name }}"
+    namespace: "{{ metadata.name }}"
+  register: cluster_deployment
+  until: cluster_deployment.resources[0].status.installVersion is defined
+
+- name: Configure routingViaHost
+  kubernetes.core.k8s:
+    template: RoutingViaHost.yaml.j2
+    apply: true
+    state: present
+  register: k8s_result
+  until: k8s_result is not failed
+
 - name: Setup InfraEnv and BMH
   ansible.builtin.include_tasks: setup_bmh.yaml
 

diff --git a/edge/roles/edge_install/templates/AgentClusterInstall.yaml.j2 b/edge/roles/edge_install/templates/AgentClusterInstall.yaml.j2
@@ -24,9 +24,7 @@ spec:
 {% if edgeCluster.reservedCpuSet is defined %}
     - name: "workload-partitioning"
 {% endif %}
-{% if (edgeCluster.routingViaHost is defined and edgeCluster.routingViaHost) or (edgeCluster.relocatable is defined) %}
     - name: "routing-via-host"
-{% endif %}
 {% if edgeCluster.clearRegistryConfig is defined and edgeCluster.clearRegistryConfig %}
     - name: "crio-wipe"
 {% endif %}

diff --git a/edge/roles/edge_install/templates/RoutingViaHost.yaml.j2 b/edge/roles/edge_install/templates/RoutingViaHost.yaml.j2
@@ -4,6 +4,8 @@ metadata:
   name: "routing-via-host"
   namespace: "{{ metadata.name }}"
 data:
+{% if (edgeCluster.routingViaHost is defined and edgeCluster.routingViaHost) or
+      (edgeCluster.relocatable is defined and cluster_deployment.resources[0].status.installVersion is ansible.builtin.version("4.13.0", "lt")) %}
   routing_via_host.yaml: |
     apiVersion: operator.openshift.io/v1
     kind: Network
@@ -14,3 +16,4 @@ data:
         ovnKubernetesConfig:
           gatewayConfig:
             routingViaHost: true
+{% endif %}