From ae7e0f69a3410ebdbc0e52a2dc3be7ea37caa40b Mon Sep 17 00:00:00 2001 From: Benjamin Ruland Date: Mon, 15 Jul 2024 14:22:47 +0200 Subject: [PATCH] Remove unnessary status-Blocks from test data of new OpenShift rules --- .../tests/deployments_anti_affinity.pass.sh | 125 ------- .../tests/deployments_excluded.pass.sh | 25 -- .../tests/deployments_no_rules.fail.sh | 100 ----- .../tests/deployments_single_replica.pass.sh | 25 -- ...yments_topology_spread_constraints.pass.sh | 75 ---- .../tests/statefulsets_anti_affinity.pass.sh | 11 - .../tests/statefulsets_excluded.pass.sh | 11 - .../tests/statefulsets_no_rules.fail.sh | 11 - .../tests/statefulsets_single_replica.pass.sh | 11 - ...ulsets_topology_spread_constraints.pass.sh | 11 - .../tests/no_zones.fail.sh | 149 -------- .../tests/three_zones.pass.sh | 149 -------- .../tests/two_nodes.fail.sh | 100 ----- .../tests/two_zones.fail.sh | 149 -------- .../tests/no_infra_nodes.pass.sh | 347 +----------------- .../tests/one_zone.fail.sh | 347 +----------------- .../tests/three_zones.pass.sh | 347 +----------------- .../tests/four_zones.pass.sh | 347 +----------------- .../tests/no_zone.fail.sh | 347 +----------------- .../tests/one_zone.fail.sh | 347 +----------------- .../tests/three_zones.pass.sh | 347 +----------------- 21 files changed, 7 insertions(+), 3374 deletions(-) diff --git a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_anti_affinity.pass.sh b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_anti_affinity.pass.sh index 1758c12cbe31..a07a5cc89507 100644 --- a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_anti_affinity.pass.sh +++ b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_anti_affinity.pass.sh @@ -241,31 +241,6 @@ cat < "$kube_apipath$deployment_apipath" ] } } - }, - "status": { - "availableReplicas": 1, - "conditions": [ - { - "lastTransitionTime": "2022-04-04T12:44:36Z", - "lastUpdateTime": "2023-11-07T10:21:53Z", - "message": "ReplicaSet \"kube-state-metrics-7d68dd96cc\" has successfully progressed.", - "reason": "NewReplicaSetAvailable", - "status": "True", - "type": "Progressing" - }, - { - "lastTransitionTime": "2024-07-11T13:58:41Z", - "lastUpdateTime": "2024-07-11T13:58:41Z", - "message": "Deployment has minimum availability.", - "reason": "MinimumReplicasAvailable", - "status": "True", - "type": "Available" - } - ], - "observedGeneration": 5, - "readyReplicas": 1, - "replicas": 1, - "updatedReplicas": 1 } }, { @@ -458,31 +433,6 @@ cat < "$kube_apipath$deployment_apipath" ] } } - }, - "status": { - "availableReplicas": 1, - "conditions": [ - { - "lastTransitionTime": "2023-01-30T10:35:46Z", - "lastUpdateTime": "2023-11-07T10:22:02Z", - "message": "ReplicaSet \"openshift-state-metrics-6698fdb7d7\" has successfully progressed.", - "reason": "NewReplicaSetAvailable", - "status": "True", - "type": "Progressing" - }, - { - "lastTransitionTime": "2024-07-11T13:58:41Z", - "lastUpdateTime": "2024-07-11T13:58:41Z", - "message": "Deployment has minimum availability.", - "reason": "MinimumReplicasAvailable", - "status": "True", - "type": "Available" - } - ], - "observedGeneration": 3, - "readyReplicas": 1, - "replicas": 1, - "updatedReplicas": 1 } }, { @@ -749,31 +699,6 @@ cat < "$kube_apipath$deployment_apipath" ] } } - }, - "status": { - "availableReplicas": 2, - "conditions": [ - { - "lastTransitionTime": "2023-01-27T10:14:59Z", - "lastUpdateTime": "2023-01-27T10:14:59Z", - "message": "Deployment has minimum availability.", - "reason": "MinimumReplicasAvailable", - "status": "True", - "type": "Available" - }, - { - "lastTransitionTime": "2022-04-04T12:44:37Z", - "lastUpdateTime": "2024-07-05T10:29:21Z", - "message": "ReplicaSet \"prometheus-adapter-7d7cbd5f78\" has successfully progressed.", - "reason": "NewReplicaSetAvailable", - "status": "True", - "type": "Progressing" - } - ], - "observedGeneration": 347, - "readyReplicas": 2, - "replicas": 2, - "updatedReplicas": 2 } }, { @@ -945,31 +870,6 @@ cat < "$kube_apipath$deployment_apipath" ] } } - }, - "status": { - "availableReplicas": 2, - "conditions": [ - { - "lastTransitionTime": "2023-10-05T11:34:31Z", - "lastUpdateTime": "2023-10-05T11:34:31Z", - "message": "Deployment has minimum availability.", - "reason": "MinimumReplicasAvailable", - "status": "True", - "type": "Available" - }, - { - "lastTransitionTime": "2023-10-05T11:34:18Z", - "lastUpdateTime": "2023-11-07T10:21:23Z", - "message": "ReplicaSet \"prometheus-operator-admission-webhook-7ccff7b477\" has successfully progressed.", - "reason": "NewReplicaSetAvailable", - "status": "True", - "type": "Progressing" - } - ], - "observedGeneration": 2, - "readyReplicas": 2, - "replicas": 2, - "updatedReplicas": 2 } }, { @@ -1469,31 +1369,6 @@ cat < "$kube_apipath$deployment_apipath" ] } } - }, - "status": { - "availableReplicas": 2, - "conditions": [ - { - "lastTransitionTime": "2023-01-30T10:36:00Z", - "lastUpdateTime": "2023-01-30T10:36:00Z", - "message": "Deployment has minimum availability.", - "reason": "MinimumReplicasAvailable", - "status": "True", - "type": "Available" - }, - { - "lastTransitionTime": "2023-01-30T10:35:49Z", - "lastUpdateTime": "2024-03-17T14:28:49Z", - "message": "ReplicaSet \"thanos-querier-5fd9586467\" has successfully progressed.", - "reason": "NewReplicaSetAvailable", - "status": "True", - "type": "Progressing" - } - ], - "observedGeneration": 5, - "readyReplicas": 2, - "replicas": 2, - "updatedReplicas": 2 } } ], diff --git a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_excluded.pass.sh b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_excluded.pass.sh index 44340f397bfb..05690fa1e38d 100644 --- a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_excluded.pass.sh +++ b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_excluded.pass.sh @@ -198,31 +198,6 @@ cat < "$kube_apipath$deployment_apipath" ] } } - }, - "status": { - "availableReplicas": 3, - "conditions": [ - { - "lastTransitionTime": "2022-04-19T12:58:24Z", - "lastUpdateTime": "2023-11-08T01:49:20Z", - "message": "ReplicaSet \"argocd-server-6f58975d9d\" has successfully progressed.", - "reason": "NewReplicaSetAvailable", - "status": "True", - "type": "Progressing" - }, - { - "lastTransitionTime": "2024-07-11T13:58:41Z", - "lastUpdateTime": "2024-07-11T13:58:41Z", - "message": "Deployment has minimum availability.", - "reason": "MinimumReplicasAvailable", - "status": "True", - "type": "Available" - } - ], - "observedGeneration": 143, - "readyReplicas": 3, - "replicas": 3, - "updatedReplicas": 3 } } ], diff --git a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_no_rules.fail.sh b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_no_rules.fail.sh index 593e571bbef0..e6ed11b84f23 100644 --- a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_no_rules.fail.sh +++ b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_no_rules.fail.sh @@ -184,31 +184,6 @@ cat < "$kube_apipath$deployment_apipath" ] } } - }, - "status": { - "availableReplicas": 1, - "conditions": [ - { - "lastTransitionTime": "2022-12-03T02:04:01Z", - "lastUpdateTime": "2023-11-08T01:48:24Z", - "message": "ReplicaSet \"argocd-dex-server-74dcd6789c\" has successfully progressed.", - "reason": "NewReplicaSetAvailable", - "status": "True", - "type": "Progressing" - }, - { - "lastTransitionTime": "2024-06-06T13:50:21Z", - "lastUpdateTime": "2024-06-06T13:50:21Z", - "message": "Deployment has minimum availability.", - "reason": "MinimumReplicasAvailable", - "status": "True", - "type": "Available" - } - ], - "observedGeneration": 216, - "readyReplicas": 1, - "replicas": 1, - "updatedReplicas": 1 } }, { @@ -309,31 +284,6 @@ cat < "$kube_apipath$deployment_apipath" ] } } - }, - "status": { - "availableReplicas": 1, - "conditions": [ - { - "lastTransitionTime": "2022-04-19T12:58:24Z", - "lastUpdateTime": "2023-11-07T10:28:41Z", - "message": "ReplicaSet \"argocd-redis-6bfd7df9fd\" has successfully progressed.", - "reason": "NewReplicaSetAvailable", - "status": "True", - "type": "Progressing" - }, - { - "lastTransitionTime": "2024-07-11T13:58:40Z", - "lastUpdateTime": "2024-07-11T13:58:40Z", - "message": "Deployment has minimum availability.", - "reason": "MinimumReplicasAvailable", - "status": "True", - "type": "Available" - } - ], - "observedGeneration": 29, - "readyReplicas": 1, - "replicas": 1, - "updatedReplicas": 1 } }, { @@ -582,31 +532,6 @@ cat < "$kube_apipath$deployment_apipath" ] } } - }, - "status": { - "availableReplicas": 3, - "conditions": [ - { - "lastTransitionTime": "2022-04-19T12:58:24Z", - "lastUpdateTime": "2023-11-08T01:49:14Z", - "message": "ReplicaSet \"argocd-repo-server-646dc7684\" has successfully progressed.", - "reason": "NewReplicaSetAvailable", - "status": "True", - "type": "Progressing" - }, - { - "lastTransitionTime": "2024-07-11T13:58:40Z", - "lastUpdateTime": "2024-07-11T13:58:40Z", - "message": "Deployment has minimum availability.", - "reason": "MinimumReplicasAvailable", - "status": "True", - "type": "Available" - } - ], - "observedGeneration": 163, - "readyReplicas": 3, - "replicas": 3, - "updatedReplicas": 3 } }, { @@ -794,31 +719,6 @@ cat < "$kube_apipath$deployment_apipath" ] } } - }, - "status": { - "availableReplicas": 3, - "conditions": [ - { - "lastTransitionTime": "2022-04-19T12:58:24Z", - "lastUpdateTime": "2023-11-08T01:49:20Z", - "message": "ReplicaSet \"argocd-server-6f58975d9d\" has successfully progressed.", - "reason": "NewReplicaSetAvailable", - "status": "True", - "type": "Progressing" - }, - { - "lastTransitionTime": "2024-07-11T13:58:41Z", - "lastUpdateTime": "2024-07-11T13:58:41Z", - "message": "Deployment has minimum availability.", - "reason": "MinimumReplicasAvailable", - "status": "True", - "type": "Available" - } - ], - "observedGeneration": 143, - "readyReplicas": 3, - "replicas": 3, - "updatedReplicas": 3 } } ], diff --git a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_single_replica.pass.sh b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_single_replica.pass.sh index c42829fade9c..3e3866b6df6a 100644 --- a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_single_replica.pass.sh +++ b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_single_replica.pass.sh @@ -184,31 +184,6 @@ cat < "$kube_apipath$deployment_apipath" ] } } - }, - "status": { - "availableReplicas": 1, - "conditions": [ - { - "lastTransitionTime": "2022-12-03T02:04:01Z", - "lastUpdateTime": "2023-11-08T01:48:24Z", - "message": "ReplicaSet \"argocd-dex-server-74dcd6789c\" has successfully progressed.", - "reason": "NewReplicaSetAvailable", - "status": "True", - "type": "Progressing" - }, - { - "lastTransitionTime": "2024-06-06T13:50:21Z", - "lastUpdateTime": "2024-06-06T13:50:21Z", - "message": "Deployment has minimum availability.", - "reason": "MinimumReplicasAvailable", - "status": "True", - "type": "Available" - } - ], - "observedGeneration": 216, - "readyReplicas": 1, - "replicas": 1, - "updatedReplicas": 1 } }, { diff --git a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_topology_spread_constraints.pass.sh b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_topology_spread_constraints.pass.sh index ad7bb3b7e012..423d4db6cc30 100644 --- a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_topology_spread_constraints.pass.sh +++ b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_deployment/tests/deployments_topology_spread_constraints.pass.sh @@ -97,31 +97,6 @@ cat < "$kube_apipath$deployment_apipath" ] } } - }, - "status": { - "availableReplicas": 1, - "conditions": [ - { - "lastTransitionTime": "2021-05-18T20:18:35Z", - "lastUpdateTime": "2021-05-18T20:19:31Z", - "message": "ReplicaSet \"nextcloud-bfc8779f6\" has successfully progressed.", - "reason": "NewReplicaSetAvailable", - "status": "True", - "type": "Progressing" - }, - { - "lastTransitionTime": "2024-06-06T13:50:21Z", - "lastUpdateTime": "2024-06-06T13:50:21Z", - "message": "Deployment has minimum availability.", - "reason": "MinimumReplicasAvailable", - "status": "True", - "type": "Available" - } - ], - "observedGeneration": 1, - "readyReplicas": 1, - "replicas": 1, - "updatedReplicas": 1 } }, { @@ -205,31 +180,6 @@ cat < "$kube_apipath$deployment_apipath" ] } } - }, - "status": { - "availableReplicas": 6, - "conditions": [ - { - "lastTransitionTime": "2024-07-15T09:40:40Z", - "lastUpdateTime": "2024-07-15T09:40:40Z", - "message": "Deployment has minimum availability.", - "reason": "MinimumReplicasAvailable", - "status": "True", - "type": "Available" - }, - { - "lastTransitionTime": "2024-07-15T09:40:37Z", - "lastUpdateTime": "2024-07-15T09:40:40Z", - "message": "ReplicaSet \"webserver-5dd84d945c\" has successfully progressed.", - "reason": "NewReplicaSetAvailable", - "status": "True", - "type": "Progressing" - } - ], - "observedGeneration": 1, - "readyReplicas": 6, - "replicas": 6, - "updatedReplicas": 6 } }, { @@ -496,31 +446,6 @@ cat < "$kube_apipath$deployment_apipath" ] } } - }, - "status": { - "availableReplicas": 2, - "conditions": [ - { - "lastTransitionTime": "2023-01-27T10:14:59Z", - "lastUpdateTime": "2023-01-27T10:14:59Z", - "message": "Deployment has minimum availability.", - "reason": "MinimumReplicasAvailable", - "status": "True", - "type": "Available" - }, - { - "lastTransitionTime": "2022-04-04T12:44:37Z", - "lastUpdateTime": "2024-07-05T10:29:21Z", - "message": "ReplicaSet \"prometheus-adapter-7d7cbd5f78\" has successfully progressed.", - "reason": "NewReplicaSetAvailable", - "status": "True", - "type": "Progressing" - } - ], - "observedGeneration": 347, - "readyReplicas": 2, - "replicas": 2, - "updatedReplicas": 2 } } ], diff --git a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_anti_affinity.pass.sh b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_anti_affinity.pass.sh index acb5079ba74a..1ee138aa2219 100644 --- a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_anti_affinity.pass.sh +++ b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_anti_affinity.pass.sh @@ -593,17 +593,6 @@ cat < "$kube_apipath$statefulset_apipath" } } ] - }, - "status": { - "availableReplicas": 2, - "collisionCount": 0, - "currentReplicas": 2, - "currentRevision": "alertmanager-main-59dd9d8b6c", - "observedGeneration": 44, - "readyReplicas": 2, - "replicas": 2, - "updateRevision": "alertmanager-main-59dd9d8b6c", - "updatedReplicas": 2 } } ], diff --git a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_excluded.pass.sh b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_excluded.pass.sh index 5f62bd86380e..5c82ff035659 100644 --- a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_excluded.pass.sh +++ b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_excluded.pass.sh @@ -176,17 +176,6 @@ cat < "$kube_apipath$statefulset_apipath" } } ] - }, - "status": { - "availableReplicas": 2, - "collisionCount": 0, - "currentReplicas": 2, - "currentRevision": "trivy-846b7fc8dd", - "observedGeneration": 1, - "readyReplicas": 2, - "replicas": 2, - "updateRevision": "trivy-846b7fc8dd", - "updatedReplicas": 2 } } ], diff --git a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_no_rules.fail.sh b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_no_rules.fail.sh index 1265157c4b4e..e38a6dfc7e0a 100644 --- a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_no_rules.fail.sh +++ b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_no_rules.fail.sh @@ -176,17 +176,6 @@ cat < "$kube_apipath$statefulset_apipath" } } ] - }, - "status": { - "availableReplicas": 2, - "collisionCount": 0, - "currentReplicas": 2, - "currentRevision": "trivy-846b7fc8dd", - "observedGeneration": 1, - "readyReplicas": 2, - "replicas": 2, - "updateRevision": "trivy-846b7fc8dd", - "updatedReplicas": 2 } } diff --git a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_single_replica.pass.sh b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_single_replica.pass.sh index 69f613c22609..c22e0975f273 100644 --- a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_single_replica.pass.sh +++ b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_single_replica.pass.sh @@ -176,17 +176,6 @@ cat < "$kube_apipath$statefulset_apipath" } } ] - }, - "status": { - "availableReplicas": 1, - "collisionCount": 0, - "currentReplicas": 1, - "currentRevision": "trivy-846b7fc8dd", - "observedGeneration": 1, - "readyReplicas": 1, - "replicas": 1, - "updateRevision": "trivy-846b7fc8dd", - "updatedReplicas": 1 } } ], diff --git a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_topology_spread_constraints.pass.sh b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_topology_spread_constraints.pass.sh index f46c69e9f55d..fc0205c16125 100644 --- a/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_topology_spread_constraints.pass.sh +++ b/applications/openshift/high-availability/anti_affinity_or_topology_spread_constraints_in_statefulset/tests/statefulsets_topology_spread_constraints.pass.sh @@ -92,17 +92,6 @@ cat < "$kube_apipath$statefulset_apipath" }, "type": "RollingUpdate" } - }, - "status": { - "availableReplicas": 2, - "collisionCount": 0, - "currentReplicas": 2, - "currentRevision": "webserver-d85b48787", - "observedGeneration": 1, - "readyReplicas": 2, - "replicas": 2, - "updateRevision": "webserver-d85b48787", - "updatedReplicas": 2 } } ], diff --git a/applications/openshift/high-availability/control_plane_nodes_in_three_zones/tests/no_zones.fail.sh b/applications/openshift/high-availability/control_plane_nodes_in_three_zones/tests/no_zones.fail.sh index 4c33ced6783f..8df992530675 100644 --- a/applications/openshift/high-availability/control_plane_nodes_in_three_zones/tests/no_zones.fail.sh +++ b/applications/openshift/high-availability/control_plane_nodes_in_three_zones/tests/no_zones.fail.sh @@ -15,13 +15,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.6\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control1.domain.local\",\"ip-addresses\":[\"172.10.57.6/24\"],\"ip-address\":\"172.10.57.6/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "aa52d871-d0a8-46ee-a9be-913fd34f7692", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.8/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.5.9\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.6/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.0.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -57,48 +50,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.6", - "type": "InternalIP" - }, - { - "address": "ocp-control1.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -106,13 +57,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.7\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control2.domain.local\",\"ip-addresses\":[\"172.10.57.7/24\"],\"ip-address\":\"172.10.57.7/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "3d8ab0a6-17aa-4425-a989-e5f681672a6f", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.2/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.13.130\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.7/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.2.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -148,50 +92,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.7", - "type": "InternalIP" - }, - { - "address": "ocp-control2.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "15252816Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "16403792Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -199,13 +99,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.8\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control3.domain.local\",\"ip-addresses\":[\"172.10.57.8/24\"],\"ip-address\":\"172.10.57.8/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "33908c13-7c84-44a8-a1ec-bcc0c7b9a363", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.3/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.9.205\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.8/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.4.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -240,48 +133,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.8", - "type": "InternalIP" - }, - { - "address": "ocp-control3.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } } ], diff --git a/applications/openshift/high-availability/control_plane_nodes_in_three_zones/tests/three_zones.pass.sh b/applications/openshift/high-availability/control_plane_nodes_in_three_zones/tests/three_zones.pass.sh index f420968a1501..bdc12ecdd397 100644 --- a/applications/openshift/high-availability/control_plane_nodes_in_three_zones/tests/three_zones.pass.sh +++ b/applications/openshift/high-availability/control_plane_nodes_in_three_zones/tests/three_zones.pass.sh @@ -15,13 +15,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.6\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control1.domain.local\",\"ip-addresses\":[\"172.10.57.6/24\"],\"ip-address\":\"172.10.57.6/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "aa52d871-d0a8-46ee-a9be-913fd34f7692", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.8/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.5.9\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.6/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.0.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -59,48 +52,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.6", - "type": "InternalIP" - }, - { - "address": "ocp-control1.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -108,13 +59,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.7\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control2.domain.local\",\"ip-addresses\":[\"172.10.57.7/24\"],\"ip-address\":\"172.10.57.7/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "3d8ab0a6-17aa-4425-a989-e5f681672a6f", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.2/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.13.130\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.7/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.2.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -152,50 +96,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.7", - "type": "InternalIP" - }, - { - "address": "ocp-control2.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "15252816Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "16403792Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -203,13 +103,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.8\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control3.domain.local\",\"ip-addresses\":[\"172.10.57.8/24\"],\"ip-address\":\"172.10.57.8/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "33908c13-7c84-44a8-a1ec-bcc0c7b9a363", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.3/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.9.205\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.8/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.4.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -246,48 +139,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.8", - "type": "InternalIP" - }, - { - "address": "ocp-control3.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } } ], diff --git a/applications/openshift/high-availability/control_plane_nodes_in_three_zones/tests/two_nodes.fail.sh b/applications/openshift/high-availability/control_plane_nodes_in_three_zones/tests/two_nodes.fail.sh index eb9e7fe91956..ee46daceb6ad 100644 --- a/applications/openshift/high-availability/control_plane_nodes_in_three_zones/tests/two_nodes.fail.sh +++ b/applications/openshift/high-availability/control_plane_nodes_in_three_zones/tests/two_nodes.fail.sh @@ -15,13 +15,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.6\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control1.domain.local\",\"ip-addresses\":[\"172.10.57.6/24\"],\"ip-address\":\"172.10.57.6/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "aa52d871-d0a8-46ee-a9be-913fd34f7692", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.8/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.5.9\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.6/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.0.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -59,48 +52,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.6", - "type": "InternalIP" - }, - { - "address": "ocp-control1.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -108,13 +59,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.7\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control2.domain.local\",\"ip-addresses\":[\"172.10.57.7/24\"],\"ip-address\":\"172.10.57.7/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "3d8ab0a6-17aa-4425-a989-e5f681672a6f", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.2/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.13.130\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.7/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.2.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -152,50 +96,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.7", - "type": "InternalIP" - }, - { - "address": "ocp-control2.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "15252816Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "16403792Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } } ], diff --git a/applications/openshift/high-availability/control_plane_nodes_in_three_zones/tests/two_zones.fail.sh b/applications/openshift/high-availability/control_plane_nodes_in_three_zones/tests/two_zones.fail.sh index dc96397aecd8..0370a61b65b6 100644 --- a/applications/openshift/high-availability/control_plane_nodes_in_three_zones/tests/two_zones.fail.sh +++ b/applications/openshift/high-availability/control_plane_nodes_in_three_zones/tests/two_zones.fail.sh @@ -15,13 +15,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.6\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control1.domain.local\",\"ip-addresses\":[\"172.10.57.6/24\"],\"ip-address\":\"172.10.57.6/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "aa52d871-d0a8-46ee-a9be-913fd34f7692", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.8/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.5.9\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.6/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.0.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -59,48 +52,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.6", - "type": "InternalIP" - }, - { - "address": "ocp-control1.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -108,13 +59,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.7\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control2.domain.local\",\"ip-addresses\":[\"172.10.57.7/24\"],\"ip-address\":\"172.10.57.7/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "3d8ab0a6-17aa-4425-a989-e5f681672a6f", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.2/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.13.130\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.7/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.2.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -152,50 +96,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.7", - "type": "InternalIP" - }, - { - "address": "ocp-control2.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "15252816Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "16403792Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -203,13 +103,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.8\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control3.domain.local\",\"ip-addresses\":[\"172.10.57.8/24\"],\"ip-address\":\"172.10.57.8/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "33908c13-7c84-44a8-a1ec-bcc0c7b9a363", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.3/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.9.205\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.8/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.4.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -246,48 +139,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.8", - "type": "InternalIP" - }, - { - "address": "ocp-control3.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } } ], diff --git a/applications/openshift/high-availability/infra_nodes_in_two_zones_or_more/tests/no_infra_nodes.pass.sh b/applications/openshift/high-availability/infra_nodes_in_two_zones_or_more/tests/no_infra_nodes.pass.sh index b5e999296ab2..488be7409293 100644 --- a/applications/openshift/high-availability/infra_nodes_in_two_zones_or_more/tests/no_infra_nodes.pass.sh +++ b/applications/openshift/high-availability/infra_nodes_in_two_zones_or_more/tests/no_infra_nodes.pass.sh @@ -15,13 +15,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.6\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control1.domain.local\",\"ip-addresses\":[\"172.10.57.6/24\"],\"ip-address\":\"172.10.57.6/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "aa52d871-d0a8-46ee-a9be-913fd34f7692", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.8/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.5.9\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.6/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.0.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -59,48 +52,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.6", - "type": "InternalIP" - }, - { - "address": "ocp-control1.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -108,13 +59,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.7\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control2.domain.local\",\"ip-addresses\":[\"172.10.57.7/24\"],\"ip-address\":\"172.10.57.7/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "3d8ab0a6-17aa-4425-a989-e5f681672a6f", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.2/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.13.130\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.7/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.2.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -152,50 +96,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.7", - "type": "InternalIP" - }, - { - "address": "ocp-control2.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "15252816Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "16403792Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -203,13 +103,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.8\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control3.domain.local\",\"ip-addresses\":[\"172.10.57.8/24\"],\"ip-address\":\"172.10.57.8/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "33908c13-7c84-44a8-a1ec-bcc0c7b9a363", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.3/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.9.205\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.8/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.4.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -246,48 +139,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.8", - "type": "InternalIP" - }, - { - "address": "ocp-control3.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -295,13 +146,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.11\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker1.domain.local\",\"ip-addresses\":[\"172.10.57.11/24\"],\"ip-address\":\"172.10.57.11/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "0777559e-2621-4da6-8d59-cc195de68507", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.4/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.6.62\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.11/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.10.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-worker-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-worker-2bc1dcecc35503442d9102830613c52b", @@ -340,48 +184,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/infra" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.11", - "type": "InternalIP" - }, - { - "address": "ocp-worker1.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -389,13 +191,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.12\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker2.domain.local\",\"ip-addresses\":[\"172.10.57.12/24\"],\"ip-address\":\"172.10.57.12/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "88f61c26-848b-41d9-a200-e393ba709895", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.5/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.4.62\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.12/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.8.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -434,48 +229,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/infra" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.12", - "type": "InternalIP" - }, - { - "address": "ocp-worker2.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -483,13 +236,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.13\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker3.domain.local\",\"ip-addresses\":[\"172.10.57.13/24\"],\"ip-address\":\"172.10.57.13/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "5a10fb7b-89d4-4510-8389-0578093eddb1", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.6/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.8.180\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.13/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.6.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -528,48 +274,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/infra" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.13", - "type": "InternalIP" - }, - { - "address": "ocp-worker3.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381096Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532072Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -577,13 +281,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.15\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker4.domain.local\",\"ip-addresses\":[\"172.10.57.15/24\"],\"ip-address\":\"172.10.57.15/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "6877fce2-e6aa-43ae-817d-ed85e451a463", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.7/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.5.179\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.15/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.12.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -608,49 +305,7 @@ cat < "$kube_apipath$nodes_apipath" "resourceVersion": "1192119420", "uid": "6e993021-17e9-4945-9c46-65e60c90c65a" }, - "spec": {}, - "status": { - "addresses": [ - { - "address": "172.10.57.15", - "type": "InternalIP" - }, - { - "address": "ocp-worker4.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } - } + "spec": {} } ], "kind": "List", diff --git a/applications/openshift/high-availability/infra_nodes_in_two_zones_or_more/tests/one_zone.fail.sh b/applications/openshift/high-availability/infra_nodes_in_two_zones_or_more/tests/one_zone.fail.sh index dbb65d687a63..4553f6e3f358 100644 --- a/applications/openshift/high-availability/infra_nodes_in_two_zones_or_more/tests/one_zone.fail.sh +++ b/applications/openshift/high-availability/infra_nodes_in_two_zones_or_more/tests/one_zone.fail.sh @@ -15,13 +15,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.6\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control1.domain.local\",\"ip-addresses\":[\"172.10.57.6/24\"],\"ip-address\":\"172.10.57.6/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chasskubernetes.io/hostnameis-id": "aa52d871-d0a8-46ee-a9be-913fd34f7692", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.8/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.5.9\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.6/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.0.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -59,48 +52,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.6", - "type": "InternalIP" - }, - { - "address": "ocp-control1.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -108,13 +59,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.7\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control2.domain.local\",\"ip-addresses\":[\"172.10.57.7/24\"],\"ip-address\":\"172.10.57.7/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "3d8ab0a6-17aa-4425-a989-e5f681672a6f", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.2/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.13.130\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.7/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.2.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -152,50 +96,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.7", - "type": "InternalIP" - }, - { - "address": "ocp-control2.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "15252816Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "16403792Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -203,13 +103,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.8\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control3.domain.local\",\"ip-addresses\":[\"172.10.57.8/24\"],\"ip-address\":\"172.10.57.8/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "33908c13-7c84-44a8-a1ec-bcc0c7b9a363", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.3/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.9.205\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.8/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.4.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -246,48 +139,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.8", - "type": "InternalIP" - }, - { - "address": "ocp-control3.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -295,13 +146,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.11\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker1.domain.local\",\"ip-addresses\":[\"172.10.57.11/24\"],\"ip-address\":\"172.10.57.11/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "0777559e-2621-4da6-8d59-cc195de68507", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.4/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.6.62\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.11/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.10.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-worker-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-worker-2bc1dcecc35503442d9102830613c52b", @@ -340,48 +184,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/infra" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.11", - "type": "InternalIP" - }, - { - "address": "ocp-worker1.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -389,13 +191,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.12\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker2.domain.local\",\"ip-addresses\":[\"172.10.57.12/24\"],\"ip-address\":\"172.10.57.12/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "88f61c26-848b-41d9-a200-e393ba709895", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.5/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.4.62\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.12/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.8.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -434,48 +229,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/infra" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.12", - "type": "InternalIP" - }, - { - "address": "ocp-worker2.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -483,13 +236,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.13\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker3.domain.local\",\"ip-addresses\":[\"172.10.57.13/24\"],\"ip-address\":\"172.10.57.13/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "5a10fb7b-89d4-4510-8389-0578093eddb1", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.6/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.8.180\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.13/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.6.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -528,48 +274,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/infra" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.13", - "type": "InternalIP" - }, - { - "address": "ocp-worker3.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381096Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532072Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -577,13 +281,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.15\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker4.domain.local\",\"ip-addresses\":[\"172.10.57.15/24\"],\"ip-address\":\"172.10.57.15/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "6877fce2-e6aa-43ae-817d-ed85e451a463", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.7/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.5.179\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.15/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.12.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -608,49 +305,7 @@ cat < "$kube_apipath$nodes_apipath" "resourceVersion": "1192119420", "uid": "6e993021-17e9-4945-9c46-65e60c90c65a" }, - "spec": {}, - "status": { - "addresses": [ - { - "address": "172.10.57.15", - "type": "InternalIP" - }, - { - "address": "ocp-worker4.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } - } + "spec": {} } ], "kind": "List", diff --git a/applications/openshift/high-availability/infra_nodes_in_two_zones_or_more/tests/three_zones.pass.sh b/applications/openshift/high-availability/infra_nodes_in_two_zones_or_more/tests/three_zones.pass.sh index 343e92f3c0cb..488be7409293 100644 --- a/applications/openshift/high-availability/infra_nodes_in_two_zones_or_more/tests/three_zones.pass.sh +++ b/applications/openshift/high-availability/infra_nodes_in_two_zones_or_more/tests/three_zones.pass.sh @@ -15,13 +15,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.6\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control1.domain.local\",\"ip-addresses\":[\"172.10.57.6/24\"],\"ip-address\":\"172.10.57.6/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chasskubernetes.io/hostnameis-id": "aa52d871-d0a8-46ee-a9be-913fd34f7692", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.8/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.5.9\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.6/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.0.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -59,48 +52,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.6", - "type": "InternalIP" - }, - { - "address": "ocp-control1.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -108,13 +59,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.7\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control2.domain.local\",\"ip-addresses\":[\"172.10.57.7/24\"],\"ip-address\":\"172.10.57.7/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "3d8ab0a6-17aa-4425-a989-e5f681672a6f", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.2/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.13.130\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.7/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.2.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -152,50 +96,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.7", - "type": "InternalIP" - }, - { - "address": "ocp-control2.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "15252816Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "16403792Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -203,13 +103,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.8\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control3.domain.local\",\"ip-addresses\":[\"172.10.57.8/24\"],\"ip-address\":\"172.10.57.8/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "33908c13-7c84-44a8-a1ec-bcc0c7b9a363", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.3/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.9.205\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.8/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.4.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -246,48 +139,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.8", - "type": "InternalIP" - }, - { - "address": "ocp-control3.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -295,13 +146,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.11\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker1.domain.local\",\"ip-addresses\":[\"172.10.57.11/24\"],\"ip-address\":\"172.10.57.11/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "0777559e-2621-4da6-8d59-cc195de68507", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.4/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.6.62\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.11/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.10.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-worker-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-worker-2bc1dcecc35503442d9102830613c52b", @@ -340,48 +184,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/infra" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.11", - "type": "InternalIP" - }, - { - "address": "ocp-worker1.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -389,13 +191,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.12\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker2.domain.local\",\"ip-addresses\":[\"172.10.57.12/24\"],\"ip-address\":\"172.10.57.12/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "88f61c26-848b-41d9-a200-e393ba709895", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.5/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.4.62\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.12/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.8.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -434,48 +229,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/infra" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.12", - "type": "InternalIP" - }, - { - "address": "ocp-worker2.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -483,13 +236,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.13\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker3.domain.local\",\"ip-addresses\":[\"172.10.57.13/24\"],\"ip-address\":\"172.10.57.13/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "5a10fb7b-89d4-4510-8389-0578093eddb1", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.6/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.8.180\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.13/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.6.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -528,48 +274,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/infra" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.13", - "type": "InternalIP" - }, - { - "address": "ocp-worker3.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381096Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532072Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -577,13 +281,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.15\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker4.domain.local\",\"ip-addresses\":[\"172.10.57.15/24\"],\"ip-address\":\"172.10.57.15/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "6877fce2-e6aa-43ae-817d-ed85e451a463", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.7/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.5.179\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.15/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.12.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -608,49 +305,7 @@ cat < "$kube_apipath$nodes_apipath" "resourceVersion": "1192119420", "uid": "6e993021-17e9-4945-9c46-65e60c90c65a" }, - "spec": {}, - "status": { - "addresses": [ - { - "address": "172.10.57.15", - "type": "InternalIP" - }, - { - "address": "ocp-worker4.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } - } + "spec": {} } ], "kind": "List", diff --git a/applications/openshift/high-availability/worker_nodes_in_two_zones_or_more/tests/four_zones.pass.sh b/applications/openshift/high-availability/worker_nodes_in_two_zones_or_more/tests/four_zones.pass.sh index 78a0dd8c2e64..7a54c11b23c1 100644 --- a/applications/openshift/high-availability/worker_nodes_in_two_zones_or_more/tests/four_zones.pass.sh +++ b/applications/openshift/high-availability/worker_nodes_in_two_zones_or_more/tests/four_zones.pass.sh @@ -15,13 +15,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.6\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control1.domain.local\",\"ip-addresses\":[\"172.10.57.6/24\"],\"ip-address\":\"172.10.57.6/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chasskubernetes.io/hostnameis-id": "aa52d871-d0a8-46ee-a9be-913fd34f7692", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.8/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.5.9\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.6/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.0.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -59,48 +52,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.6", - "type": "InternalIP" - }, - { - "address": "ocp-control1.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -108,13 +59,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.7\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control2.domain.local\",\"ip-addresses\":[\"172.10.57.7/24\"],\"ip-address\":\"172.10.57.7/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "3d8ab0a6-17aa-4425-a989-e5f681672a6f", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.2/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.13.130\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.7/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.2.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -152,50 +96,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.7", - "type": "InternalIP" - }, - { - "address": "ocp-control2.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "15252816Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "16403792Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -203,13 +103,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.8\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control3.domain.local\",\"ip-addresses\":[\"172.10.57.8/24\"],\"ip-address\":\"172.10.57.8/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "33908c13-7c84-44a8-a1ec-bcc0c7b9a363", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.3/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.9.205\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.8/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.4.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -246,48 +139,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.8", - "type": "InternalIP" - }, - { - "address": "ocp-control3.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -295,13 +146,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.11\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker1.domain.local\",\"ip-addresses\":[\"172.10.57.11/24\"],\"ip-address\":\"172.10.57.11/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "0777559e-2621-4da6-8d59-cc195de68507", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.4/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.6.62\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.11/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.10.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-worker-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-worker-2bc1dcecc35503442d9102830613c52b", @@ -333,48 +177,6 @@ cat < "$kube_apipath$nodes_apipath" "podCIDRs": [ "10.128.5.0/24" ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.11", - "type": "InternalIP" - }, - { - "address": "ocp-worker1.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -382,13 +184,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.12\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker2.domain.local\",\"ip-addresses\":[\"172.10.57.12/24\"],\"ip-address\":\"172.10.57.12/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "88f61c26-848b-41d9-a200-e393ba709895", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.5/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.4.62\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.12/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.8.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -420,48 +215,6 @@ cat < "$kube_apipath$nodes_apipath" "podCIDRs": [ "10.128.4.0/24" ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.12", - "type": "InternalIP" - }, - { - "address": "ocp-worker2.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -469,13 +222,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.13\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker3.domain.local\",\"ip-addresses\":[\"172.10.57.13/24\"],\"ip-address\":\"172.10.57.13/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "5a10fb7b-89d4-4510-8389-0578093eddb1", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.6/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.8.180\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.13/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.6.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -507,48 +253,6 @@ cat < "$kube_apipath$nodes_apipath" "podCIDRs": [ "10.128.3.0/24" ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.13", - "type": "InternalIP" - }, - { - "address": "ocp-worker3.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381096Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532072Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -556,13 +260,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.15\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker4.domain.local\",\"ip-addresses\":[\"172.10.57.15/24\"],\"ip-address\":\"172.10.57.15/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "6877fce2-e6aa-43ae-817d-ed85e451a463", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.7/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.5.179\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.15/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.12.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -589,49 +286,7 @@ cat < "$kube_apipath$nodes_apipath" "resourceVersion": "1192119420", "uid": "6e993021-17e9-4945-9c46-65e60c90c65a" }, - "spec": {}, - "status": { - "addresses": [ - { - "address": "172.10.57.15", - "type": "InternalIP" - }, - { - "address": "ocp-worker4.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } - } + "spec": {} } ], "kind": "List", diff --git a/applications/openshift/high-availability/worker_nodes_in_two_zones_or_more/tests/no_zone.fail.sh b/applications/openshift/high-availability/worker_nodes_in_two_zones_or_more/tests/no_zone.fail.sh index 01c6150153f3..02b1cd2a4765 100644 --- a/applications/openshift/high-availability/worker_nodes_in_two_zones_or_more/tests/no_zone.fail.sh +++ b/applications/openshift/high-availability/worker_nodes_in_two_zones_or_more/tests/no_zone.fail.sh @@ -15,13 +15,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.6\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control1.domain.local\",\"ip-addresses\":[\"172.10.57.6/24\"],\"ip-address\":\"172.10.57.6/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chasskubernetes.io/hostnameis-id": "aa52d871-d0a8-46ee-a9be-913fd34f7692", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.8/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.5.9\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.6/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.0.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -59,48 +52,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.6", - "type": "InternalIP" - }, - { - "address": "ocp-control1.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -108,13 +59,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.7\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control2.domain.local\",\"ip-addresses\":[\"172.10.57.7/24\"],\"ip-address\":\"172.10.57.7/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "3d8ab0a6-17aa-4425-a989-e5f681672a6f", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.2/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.13.130\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.7/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.2.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -152,50 +96,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.7", - "type": "InternalIP" - }, - { - "address": "ocp-control2.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "15252816Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "16403792Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -203,13 +103,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.8\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control3.domain.local\",\"ip-addresses\":[\"172.10.57.8/24\"],\"ip-address\":\"172.10.57.8/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "33908c13-7c84-44a8-a1ec-bcc0c7b9a363", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.3/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.9.205\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.8/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.4.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -246,48 +139,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.8", - "type": "InternalIP" - }, - { - "address": "ocp-control3.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -295,13 +146,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.11\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker1.domain.local\",\"ip-addresses\":[\"172.10.57.11/24\"],\"ip-address\":\"172.10.57.11/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "0777559e-2621-4da6-8d59-cc195de68507", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.4/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.6.62\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.11/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.10.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-worker-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-worker-2bc1dcecc35503442d9102830613c52b", @@ -331,48 +175,6 @@ cat < "$kube_apipath$nodes_apipath" "podCIDRs": [ "10.128.5.0/24" ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.11", - "type": "InternalIP" - }, - { - "address": "ocp-worker1.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -380,13 +182,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.12\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker2.domain.local\",\"ip-addresses\":[\"172.10.57.12/24\"],\"ip-address\":\"172.10.57.12/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "88f61c26-848b-41d9-a200-e393ba709895", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.5/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.4.62\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.12/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.8.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -416,48 +211,6 @@ cat < "$kube_apipath$nodes_apipath" "podCIDRs": [ "10.128.4.0/24" ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.12", - "type": "InternalIP" - }, - { - "address": "ocp-worker2.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -465,13 +218,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.13\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker3.domain.local\",\"ip-addresses\":[\"172.10.57.13/24\"],\"ip-address\":\"172.10.57.13/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "5a10fb7b-89d4-4510-8389-0578093eddb1", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.6/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.8.180\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.13/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.6.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -501,48 +247,6 @@ cat < "$kube_apipath$nodes_apipath" "podCIDRs": [ "10.128.3.0/24" ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.13", - "type": "InternalIP" - }, - { - "address": "ocp-worker3.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381096Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532072Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -550,13 +254,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.15\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker4.domain.local\",\"ip-addresses\":[\"172.10.57.15/24\"],\"ip-address\":\"172.10.57.15/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "6877fce2-e6aa-43ae-817d-ed85e451a463", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.7/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.5.179\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.15/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.12.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -581,49 +278,7 @@ cat < "$kube_apipath$nodes_apipath" "resourceVersion": "1192119420", "uid": "6e993021-17e9-4945-9c46-65e60c90c65a" }, - "spec": {}, - "status": { - "addresses": [ - { - "address": "172.10.57.15", - "type": "InternalIP" - }, - { - "address": "ocp-worker4.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } - } + "spec": {} } ], "kind": "List", diff --git a/applications/openshift/high-availability/worker_nodes_in_two_zones_or_more/tests/one_zone.fail.sh b/applications/openshift/high-availability/worker_nodes_in_two_zones_or_more/tests/one_zone.fail.sh index 4ef85a2fa95f..d977f106a54b 100644 --- a/applications/openshift/high-availability/worker_nodes_in_two_zones_or_more/tests/one_zone.fail.sh +++ b/applications/openshift/high-availability/worker_nodes_in_two_zones_or_more/tests/one_zone.fail.sh @@ -15,13 +15,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.6\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control1.domain.local\",\"ip-addresses\":[\"172.10.57.6/24\"],\"ip-address\":\"172.10.57.6/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chasskubernetes.io/hostnameis-id": "aa52d871-d0a8-46ee-a9be-913fd34f7692", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.8/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.5.9\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.6/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.0.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -59,48 +52,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.6", - "type": "InternalIP" - }, - { - "address": "ocp-control1.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -108,13 +59,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.7\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control2.domain.local\",\"ip-addresses\":[\"172.10.57.7/24\"],\"ip-address\":\"172.10.57.7/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "3d8ab0a6-17aa-4425-a989-e5f681672a6f", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.2/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.13.130\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.7/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.2.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -152,50 +96,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.7", - "type": "InternalIP" - }, - { - "address": "ocp-control2.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "15252816Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "16403792Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -203,13 +103,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.8\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control3.domain.local\",\"ip-addresses\":[\"172.10.57.8/24\"],\"ip-address\":\"172.10.57.8/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "33908c13-7c84-44a8-a1ec-bcc0c7b9a363", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.3/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.9.205\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.8/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.4.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -246,48 +139,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.8", - "type": "InternalIP" - }, - { - "address": "ocp-control3.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -295,13 +146,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.11\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker1.domain.local\",\"ip-addresses\":[\"172.10.57.11/24\"],\"ip-address\":\"172.10.57.11/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "0777559e-2621-4da6-8d59-cc195de68507", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.4/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.6.62\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.11/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.10.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-worker-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-worker-2bc1dcecc35503442d9102830613c52b", @@ -333,48 +177,6 @@ cat < "$kube_apipath$nodes_apipath" "podCIDRs": [ "10.128.5.0/24" ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.11", - "type": "InternalIP" - }, - { - "address": "ocp-worker1.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -382,13 +184,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.12\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker2.domain.local\",\"ip-addresses\":[\"172.10.57.12/24\"],\"ip-address\":\"172.10.57.12/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "88f61c26-848b-41d9-a200-e393ba709895", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.5/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.4.62\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.12/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.8.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -420,48 +215,6 @@ cat < "$kube_apipath$nodes_apipath" "podCIDRs": [ "10.128.4.0/24" ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.12", - "type": "InternalIP" - }, - { - "address": "ocp-worker2.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -469,13 +222,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.13\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker3.domain.local\",\"ip-addresses\":[\"172.10.57.13/24\"],\"ip-address\":\"172.10.57.13/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "5a10fb7b-89d4-4510-8389-0578093eddb1", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.6/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.8.180\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.13/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.6.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -507,48 +253,6 @@ cat < "$kube_apipath$nodes_apipath" "podCIDRs": [ "10.128.3.0/24" ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.13", - "type": "InternalIP" - }, - { - "address": "ocp-worker3.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381096Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532072Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -556,13 +260,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.15\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker4.domain.local\",\"ip-addresses\":[\"172.10.57.15/24\"],\"ip-address\":\"172.10.57.15/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "6877fce2-e6aa-43ae-817d-ed85e451a463", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.7/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.5.179\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.15/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.12.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -589,49 +286,7 @@ cat < "$kube_apipath$nodes_apipath" "resourceVersion": "1192119420", "uid": "6e993021-17e9-4945-9c46-65e60c90c65a" }, - "spec": {}, - "status": { - "addresses": [ - { - "address": "172.10.57.15", - "type": "InternalIP" - }, - { - "address": "ocp-worker4.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } - } + "spec": {} } ], "kind": "List", diff --git a/applications/openshift/high-availability/worker_nodes_in_two_zones_or_more/tests/three_zones.pass.sh b/applications/openshift/high-availability/worker_nodes_in_two_zones_or_more/tests/three_zones.pass.sh index d682b19627e5..854ebf3393fd 100644 --- a/applications/openshift/high-availability/worker_nodes_in_two_zones_or_more/tests/three_zones.pass.sh +++ b/applications/openshift/high-availability/worker_nodes_in_two_zones_or_more/tests/three_zones.pass.sh @@ -15,13 +15,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.6\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control1.domain.local\",\"ip-addresses\":[\"172.10.57.6/24\"],\"ip-address\":\"172.10.57.6/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chasskubernetes.io/hostnameis-id": "aa52d871-d0a8-46ee-a9be-913fd34f7692", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.8/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.5.9\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.6/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.0.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -59,48 +52,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.6", - "type": "InternalIP" - }, - { - "address": "ocp-control1.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -108,13 +59,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.7\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control2.domain.local\",\"ip-addresses\":[\"172.10.57.7/24\"],\"ip-address\":\"172.10.57.7/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "3d8ab0a6-17aa-4425-a989-e5f681672a6f", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.2/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.13.130\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.7/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.2.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -152,50 +96,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.7", - "type": "InternalIP" - }, - { - "address": "ocp-control2.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "15252816Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-1Gi": "0", - "hugepages-2Mi": "0", - "memory": "16403792Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -203,13 +103,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.8\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-control3.domain.local\",\"ip-addresses\":[\"172.10.57.8/24\"],\"ip-address\":\"172.10.57.8/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "33908c13-7c84-44a8-a1ec-bcc0c7b9a363", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.3/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.9.205\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.8/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.4.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", "machineconfiguration.openshift.io/desiredConfig": "rendered-master-d0a23f1409780adbe3913473e3e42154", @@ -246,48 +139,6 @@ cat < "$kube_apipath$nodes_apipath" "key": "node-role.kubernetes.io/master" } ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.8", - "type": "InternalIP" - }, - { - "address": "ocp-control3.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "3500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "15252768Ki", - "pods": "250" - }, - "capacity": { - "cpu": "4", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "16403744Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -295,13 +146,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.11\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker1.domain.local\",\"ip-addresses\":[\"172.10.57.11/24\"],\"ip-address\":\"172.10.57.11/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "0777559e-2621-4da6-8d59-cc195de68507", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.4/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.6.62\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.11/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.10.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-worker-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-worker-2bc1dcecc35503442d9102830613c52b", @@ -333,48 +177,6 @@ cat < "$kube_apipath$nodes_apipath" "podCIDRs": [ "10.128.5.0/24" ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.11", - "type": "InternalIP" - }, - { - "address": "ocp-worker1.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -382,13 +184,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.12\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker2.domain.local\",\"ip-addresses\":[\"172.10.57.12/24\"],\"ip-address\":\"172.10.57.12/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "88f61c26-848b-41d9-a200-e393ba709895", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.5/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.4.62\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.12/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.8.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -420,48 +215,6 @@ cat < "$kube_apipath$nodes_apipath" "podCIDRs": [ "10.128.4.0/24" ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.12", - "type": "InternalIP" - }, - { - "address": "ocp-worker2.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -469,13 +222,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.13\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker3.domain.local\",\"ip-addresses\":[\"172.10.57.13/24\"],\"ip-address\":\"172.10.57.13/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "5a10fb7b-89d4-4510-8389-0578093eddb1", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.6/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.8.180\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.13/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.6.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -507,48 +253,6 @@ cat < "$kube_apipath$nodes_apipath" "podCIDRs": [ "10.128.3.0/24" ] - }, - "status": { - "addresses": [ - { - "address": "172.10.57.13", - "type": "InternalIP" - }, - { - "address": "ocp-worker3.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381096Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532072Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } } }, { @@ -556,13 +260,6 @@ cat < "$kube_apipath$nodes_apipath" "kind": "Node", "metadata": { "annotations": { - "k8s.ovn.org/host-addresses": "[\"172.10.57.15\"]", - "k8s.ovn.org/l3-gateway-config": "{\"default\":{\"mode\":\"shared\",\"interface-id\":\"br-ex_ocp-worker4.domain.local\",\"ip-addresses\":[\"172.10.57.15/24\"],\"ip-address\":\"172.10.57.15/24\",\"next-hops\":[\"172.10.57.1\"],\"next-hop\":\"172.10.57.1\",\"node-port-enable\":\"true\",\"vlan-id\":\"0\"}}", - "k8s.ovn.org/node-chassis-id": "6877fce2-e6aa-43ae-817d-ed85e451a463", - "k8s.ovn.org/node-gateway-router-lrp-ifaddr": "{\"ipv4\":\"100.64.0.7/16\"}", - "k8s.ovn.org/node-local-nat-ip": "{\"default\":[\"169.254.5.179\"]}", - "k8s.ovn.org/node-primary-ifaddr": "{\"ipv4\":\"172.10.57.15/24\"}", - "k8s.ovn.org/node-subnets": "{\"default\":\"10.128.12.0/23\"}", "machineconfiguration.openshift.io/controlPlaneTopology": "HighlyAvailable", "machineconfiguration.openshift.io/currentConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", "machineconfiguration.openshift.io/desiredConfig": "rendered-infra-2bc1dcecc35503442d9102830613c52b", @@ -589,49 +286,7 @@ cat < "$kube_apipath$nodes_apipath" "resourceVersion": "1192119420", "uid": "6e993021-17e9-4945-9c46-65e60c90c65a" }, - "spec": {}, - "status": { - "addresses": [ - { - "address": "172.10.57.15", - "type": "InternalIP" - }, - { - "address": "ocp-worker4.domain.local", - "type": "Hostname" - } - ], - "allocatable": { - "cpu": "5500m", - "ephemeral-storage": "114381692328", - "hugepages-2Mi": "0", - "memory": "19381080Ki", - "pods": "250" - }, - "capacity": { - "cpu": "6", - "ephemeral-storage": "125277164Ki", - "hugepages-2Mi": "0", - "memory": "20532056Ki", - "pods": "250" - }, - "conditions": [], - "daemonEndpoints": { - "kubeletEndpoint": { - "Port": 10250 - } - }, - "images": [], - "nodeInfo": { - "architecture": "amd64", - "containerRuntimeVersion": "cri-o://1.25.4-4.1.rhaos4.12.gitb9319a2.el8", - "kernelVersion": "4.18.0-372.76.1.el8_6.x86_64", - "kubeProxyVersion": "v1.25.14+20cda61", - "kubeletVersion": "v1.25.14+20cda61", - "operatingSystem": "linux", - "osImage": "Red Hat Enterprise Linux CoreOS 412.86.202310170023-0 (Ootpa)" - } - } + "spec": {} } ], "kind": "List",