Skip to content

Bug 1788135: Fix IPv6 Support #231

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-robot merged 3 commits into from
Jan 6, 2020
Merged

Bug 1788135: Fix IPv6 Support #231

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
2bbf625
Use "BindNetwork: tcp" to be dual-stack friendly
danwinship Dec 6, 2019
16bea77
Set bindNetwork to "tcp" for operator config
russellb Dec 12, 2019
85d5980
Fix joining a host and port with IPv6
russellb Dec 12, 2019
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 manifests/03_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ data:
operator-config.yaml: |
apiVersion: operator.openshift.io/v1alpha1
kind: GenericOperatorConfig
servingInfo:
bindNetwork: "tcp"
2 changes: 1 addition & 1 deletion pkg/operator2/oauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func (c *authOperator) handleOAuthConfig(
ServingInfo: configv1.HTTPServingInfo{
ServingInfo: configv1.ServingInfo{
BindAddress: fmt.Sprintf("0.0.0.0:%d", 6443),
BindNetwork: "tcp4",
BindNetwork: "tcp",
// we have valid serving certs provided by service-ca
// this is our main server cert which is used if SNI does not match
CertInfo: configv1.CertInfo{
Expand Down
3 changes: 2 additions & 1 deletion pkg/operator2/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"encoding/json"
"fmt"
"io/ioutil"
"net"
"net/http"
"os"
"reflect"
Expand Down Expand Up @@ -557,7 +558,7 @@ func (c *authOperator) getAPIServerIPs() ([]string, error) {

ips := make([]string, 0, len(subset.Addresses))
for _, address := range subset.Addresses {
ips = append(ips, fmt.Sprintf("%s:%d", address.IP, targetPort))
Comment thread
russellb marked this conversation as resolved.
ips = append(ips, net.JoinHostPort(address.IP, strconv.Itoa(targetPort)))
}
return ips, nil
}
Expand Down