Merge pull request #25 from larsks/feature-routingviahost

Set routingViaHost in OVN configuration
OCP-on-NERC · Jun 28, 2022 · 9fee8b9 · 9fee8b9
2 parents 3ae0dea + 37c4dc7
commit 9fee8b9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/cluster-scope/base/operator.openshift.io/networks/cluster/kustomization.yaml b/cluster-scope/base/operator.openshift.io/networks/cluster/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+    - network.yaml
diff --git a/cluster-scope/base/operator.openshift.io/networks/cluster/network.yaml b/cluster-scope/base/operator.openshift.io/networks/cluster/network.yaml
@@ -0,0 +1,9 @@
+apiVersion: operator.openshift.io/v1
+kind: Network
+metadata:
+  name: cluster
+spec:
+  defaultNetwork:
+    ovnKubernetesConfig:
+      gatewayConfig:
+        routingViaHost: true
diff --git a/...pe/base/operators.coreos.com/subscriptions/kubernetes-nmstate-operator/subscriptions.yaml b/...pe/base/operators.coreos.com/subscriptions/kubernetes-nmstate-operator/subscriptions.yaml
@@ -3,7 +3,7 @@ kind: Subscription
 metadata:
     name: kubernetes-nmstate-operator
 spec:
-    channel: stable
+    channel: "4.10"
     installPlanApproval: Automatic
     name: kubernetes-nmstate-operator
     source: redhat-operators

diff --git a/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml
@@ -7,6 +7,7 @@ resources:
 - ../../bundles/openshift-gitops
 - ../../bundles/acm
 - ../../bundles/odf
+- ../../base/operator.openshift.io/networks/cluster
 - clusterversion.yaml
 - machineconfigs/disable-net-ifnames.yaml
 - machineconfigs/mellanox-udev-rules