Skip to content

USHIFT-3000: Configure router to support ipv6 single/dual stack #3579

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 5, 2024
Merged

USHIFT-3000: Configure router to support ipv6 single/dual stack #3579

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
38b3740
USHIFT-3000: Add helpers for ipv4/6 config
pacevedom Jul 3, 2024
7991b52
USHIFT-3000: Add RouterMode variable for ingress resources rendering
pacevedom Jul 3, 2024
8f76e21
USHIFT-3000: Add router mode to ingress based on ip families
pacevedom Jul 3, 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
2 changes: 2 additions & 0 deletions assets/components/openshift-router/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ spec:
value: 1s
- name: ROUTER_DOMAIN
value: apps.{{ .BaseDomain }}
- name: ROUTER_IP_V4_V6_MODE
value: '{{ .RouterMode }}'
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
10 changes: 10 additions & 0 deletions pkg/components/controllers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,20 @@ func startIngressController(ctx context.Context, cfg *config.Config, kubeconfigP
klog.Warningf("Failed to apply configMap %v: %v", cm, err)
return err
}

routerMode := "v4"
if cfg.IsIPv6() {
routerMode = "v4v6"
if !cfg.IsIPv4() {
routerMode = "v6"
}
}

extraParams := assets.RenderParams{
"RouterNamespaceOwnership": cfg.Ingress.AdmissionPolicy.NamespaceOwnership == config.NamespaceOwnershipAllowed,
"RouterHttpPort": *cfg.Ingress.Ports.Http,
"RouterHttpsPort": *cfg.Ingress.Ports.Https,
"RouterMode": routerMode,
}
if err := assets.ApplyServices(ctx, svc, renderTemplate, renderParamsFromConfig(cfg, extraParams), kubeconfigPath); err != nil {
klog.Warningf("Failed to apply service %v %v", svc, err)
Expand Down
20 changes: 20 additions & 0 deletions pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,26 @@ func (c Config) UserNodeIP() string {
return ""
}

func (c Config) IsIPv4() bool {
for _, network := range c.Network.ClusterNetwork {
ip, _, _ := net.ParseCIDR(network)
if ip.To4() != nil {
return true
}
}
return false
}

func (c Config) IsIPv6() bool {
for _, network := range c.Network.ClusterNetwork {
ip, _, _ := net.ParseCIDR(network)
if ip.To4() == nil {
return true
}
}
return false
}

var allHostnames []string

func getAllHostnames() ([]string, error) {
Expand Down
9 changes: 5 additions & 4 deletions scripts/auto-rebase/rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,11 @@ EOF
yq -i '.spec.template.spec.containers[0].env += {"name": "ROUTER_TCP_BALANCE_SCHEME", "value": "source"}' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml
yq -i '.spec.template.spec.containers[0].env += {"name": "ROUTER_THREADS", "value": "4"}' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml
yq -i '.spec.template.spec.containers[0].env += {"name": "SSL_MIN_VERSION", "value": "TLSv1.2"}' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml
# Not use proxy protocol due to lack of load balancer support
yq -i '.spec.template.spec.containers[0].env += {"name": "ROUTER_USE_PROXY_PROTOCOL", "value": "false"}' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml
yq -i '.spec.template.spec.containers[0].env += {"name": "GRACEFUL_SHUTDOWN_DELAY", "value": "1s"}' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml
yq -i '.spec.template.spec.containers[0].env += {"name": "ROUTER_DOMAIN", "value": "apps.{{ .BaseDomain }}"}' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml
yq -i '.spec.template.spec.containers[0].env += {"name": "ROUTER_IP_V4_V6_MODE", "value": "{{ .RouterMode }}"}' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml
# TODO: Generate and volume mount the router-stats-default secret
# yq -i '.spec.template.spec.containers[0].env += {"name": "STATS_PASSWORD_FILE", "value": "/var/lib/haproxy/conf/metrics-auth/statsPassword"}' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml
# yq -i '.spec.template.spec.containers[0].env += {"name": "STATS_USERNAME_FILE", "value": "/var/lib/haproxy/conf/metrics-auth/statsUsername"}' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml
Expand Down Expand Up @@ -719,10 +724,6 @@ EOF
yq -i '.spec.replicas = 1' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml
# Set deployment strategy type to Recreate.
yq -i '.spec.strategy.type = "Recreate"' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml
# Not use proxy protocol due to lack of load balancer support
yq -i '.spec.template.spec.containers[0].env += {"name": "ROUTER_USE_PROXY_PROTOCOL", "value": "false"}' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml
yq -i '.spec.template.spec.containers[0].env += {"name": "GRACEFUL_SHUTDOWN_DELAY", "value": "1s"}' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml
yq -i '.spec.template.spec.containers[0].env += {"name": "ROUTER_DOMAIN", "value": "apps.{{ .BaseDomain }}"}' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml
# Configure LoadBalancer service
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
Expand Down