Skip to content

USHIFT-3479: ipFamilyPolicy adjustments and ovnk restart on dual stack migration #3676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 3 commits into from
Jul 26, 2024
Merged

USHIFT-3479: ipFamilyPolicy adjustments and ovnk restart on dual stack migration #3676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af2aedd
USHIFT-3479: Add IPFamily to render variables
pacevedom Jul 9, 2024
7d98be7
USHIFT-3479: Add ipFamilyPolicy to router services
pacevedom Jul 9, 2024
295387b
USHIFT-3479: Add onvk restart on dual stack change
pacevedom Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions assets/components/openshift-router/service-cloud.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ spec:
# router pods are present on a node behind the service.
externalTrafficPolicy: Local
internalTrafficPolicy: Cluster
ipFamilyPolicy: '{{.IPFamily}}'
ports:
- name: http
protocol: TCP
Expand Down
1 change: 1 addition & 0 deletions assets/components/openshift-router/service-internal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ apiVersion: v1
spec:
type: ClusterIP
internalTrafficPolicy: Cluster
ipFamilyPolicy: '{{.IPFamily}}'
ports:
- name: http
port: 80
Expand Down
1 change: 1 addition & 0 deletions assets/components/ovn/single-node/master/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ spec:
type: infra
openshift.io/component: network
kubernetes.io/os: "linux"
microshift.io/ipfamilypolicy: '{{.IPFamily}}'
spec:
serviceAccountName: ovn-kubernetes-controller
hostNetwork: true
Expand Down
9 changes: 9 additions & 0 deletions pkg/components/render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import (
"strings"
"text/template"

"k8s.io/kubernetes/pkg/apis/core"

"github.com/openshift/microshift/pkg/assets"
"github.com/openshift/microshift/pkg/config"
"github.com/openshift/microshift/pkg/release"
Expand All @@ -28,9 +30,16 @@ func renderParamsFromConfig(cfg *config.Config, extra assets.RenderParams) asset
"ClusterDNS": cfg.Network.DNS,
"BaseDomain": cfg.DNS.BaseDomain,
}
ipFamily := core.IPFamilyPolicySingleStack
if cfg.IsIPv4() && cfg.IsIPv6() {
ipFamily = core.IPFamilyPolicyPreferDualStack
}
params["IPFamily"] = ipFamily

for k, v := range extra {
params[k] = v
}

return params
}

Expand Down
2 changes: 2 additions & 0 deletions scripts/auto-rebase/rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,6 +718,7 @@ EOF
yq -i '.metadata.labels += {"ingresscontroller.operator.openshift.io/owning-ingresscontroller": "default"}' "${REPOROOT}"/assets/components/openshift-router/service-internal.yaml
yq -i '.metadata += {"name": "router-internal-default", "namespace": "openshift-ingress"}' "${REPOROOT}"/assets/components/openshift-router/service-internal.yaml
yq -i '.spec.selector = {"ingresscontroller.operator.openshift.io/deployment-ingresscontroller": "default"}' "${REPOROOT}"/assets/components/openshift-router/service-internal.yaml
yq -i '.spec.ipFamilyPolicy = "{{.IPFamily}}"' "${REPOROOT}"/assets/components/openshift-router/service-internal.yaml
sed -i '/#.*set at runtime/d' "${REPOROOT}"/assets/components/openshift-router/service-internal.yaml

# MicroShift-specific changes
Expand All @@ -731,6 +732,7 @@ EOF
yq -i '.metadata += {"name": "router-default", "namespace": "openshift-ingress"}' "${REPOROOT}"/assets/components/openshift-router/service-cloud.yaml
yq -i '.spec.selector = {"ingresscontroller.operator.openshift.io/deployment-ingresscontroller": "default"}' "${REPOROOT}"/assets/components/openshift-router/service-cloud.yaml
yq -i '.metadata.labels += {"ingresscontroller.operator.openshift.io/owning-ingresscontroller": "default"}' "${REPOROOT}"/assets/components/openshift-router/service-cloud.yaml
yq -i '.spec.ipFamilyPolicy = "{{.IPFamily}}"' "${REPOROOT}"/assets/components/openshift-router/service-cloud.yaml
# Must use sed instead of yq because unquoted {{ .RouterHttpPort }} is interpreted as yaml object and yq has no option to not interpret it (like provide is as quoted string but produce unquoted output).
# It needs to be last manipulation of the file, otherwise yq commands after this one would expand the {{ .RouterHttpPort }}.
sed -i 's/port: 80/port: {{ .RouterHttpPort }}/g; s/port: 443/port: {{ .RouterHttpsPort }}/g' "${REPOROOT}"/assets/components/openshift-router/service-cloud.yaml
Expand Down