Skip to content
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

Do not assume the kubernetes cluster domain #401

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Do not assume the kubernetes cluster domain #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions pomerium/ingress_to_route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,17 +235,17 @@ func getPathServiceHosts(r *pb.Route, p networkingv1.HTTPIngressPath, ic *model.
if service.Spec.Type == corev1.ServiceTypeExternalName {
hosts = append(hosts, fmt.Sprintf("%s:%d", service.Spec.ExternalName, port))
} else if ic.UseServiceProxy() {
hosts = append(hosts, fmt.Sprintf("%s.%s.svc.cluster.local:%d", backend.Name, ic.Namespace, port))
hosts = append(hosts, fmt.Sprintf("%s.%s.svc:%d", backend.Name, ic.Namespace, port))
} else {
endpoints, ok := ic.Endpoints[ic.GetNamespacedName(backend.Name)]
if ok {
hosts = getEndpointsURLs(backend.Port, service.Spec.Ports, endpoints.Subsets)
}
// this can happen if no endpoints are ready, or none match, in which case we fallback to the Kubernetes DNS name
if len(hosts) == 0 {
hosts = append(hosts, fmt.Sprintf("%s.%s.svc.cluster.local:%d", backend.Name, ic.Namespace, port))
hosts = append(hosts, fmt.Sprintf("%s.%s.svc:%d", backend.Name, ic.Namespace, port))
} else if ic.IsSecureUpstream() && r.TlsServerName == "" {
r.TlsServerName = fmt.Sprintf("%s.%s.svc.cluster.local", backend.Name, ic.Namespace)
r.TlsServerName = fmt.Sprintf("%s.%s.svc", backend.Name, ic.Namespace)
}
}

Expand Down
37 changes: 23 additions & 14 deletions pomerium/routes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ func TestUpsertIngress(t *testing.T) {
corev1.TLSCertKey: []byte("A"),
},
Type: corev1.SecretTypeTLS,
}},
},
},
Services: map[types.NamespacedName]*corev1.Service{
{Name: "service", Namespace: "default"}: {
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -228,7 +229,8 @@ func TestSecureUpstream(t *testing.T) {
Addresses: []corev1.EndpointAddress{{IP: "1.2.3.4"}},
Ports: []corev1.EndpointPort{{Name: "https", Port: 443}},
}},
}},
},
},
Services: map[types.NamespacedName]*corev1.Service{
{Name: "service", Namespace: "default"}: {
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -313,7 +315,8 @@ func TestCustomSecrets(t *testing.T) {
Addresses: []corev1.EndpointAddress{{IP: "1.2.3.4"}},
Ports: []corev1.EndpointPort{{Name: "http", Port: 80}},
}},
}},
},
},
Services: map[types.NamespacedName]*corev1.Service{
{Name: "service", Namespace: "default"}: {
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -418,7 +421,8 @@ func TestKubernetesToken(t *testing.T) {
Addresses: []corev1.EndpointAddress{{IP: "1.2.3.4"}},
Ports: []corev1.EndpointPort{{Name: "http", Port: 80}},
}},
}},
},
},
Services: map[types.NamespacedName]*corev1.Service{
{Name: "service", Namespace: "default"}: {
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -491,7 +495,8 @@ func TestTCPUpstream(t *testing.T) {
Addresses: []corev1.EndpointAddress{{IP: "1.2.3.4"}},
Ports: []corev1.EndpointPort{{Name: "app", Port: 12345}},
}},
}},
},
},
Services: map[types.NamespacedName]*corev1.Service{
{Name: "service", Namespace: "default"}: {
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -731,7 +736,8 @@ func TestDefaultBackendService(t *testing.T) {
Backend: *ic.Spec.DefaultBackend,
}},
},
}}}
},
}}
cfg := new(pb.Config)
require.NoError(t, upsertRoutes(context.Background(), cfg, ic))
sort.Sort(routeList(cfg.Routes))
Expand Down Expand Up @@ -861,7 +867,8 @@ func TestUseServiceProxy(t *testing.T) {
Addresses: []corev1.EndpointAddress{{IP: "1.2.3.4"}},
Ports: []corev1.EndpointPort{{Port: 80}},
}},
}},
},
},
Services: map[types.NamespacedName]*corev1.Service{
{Name: "service", Namespace: "default"}: {
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -893,7 +900,7 @@ func TestUseServiceProxy(t *testing.T) {
}]
require.NotNil(t, route, "route not found in %v", routes)
require.Equal(t, []string{
"http://service.default.svc.cluster.local:80",
"http://service.default.svc:80",
}, route.To)
}

Expand Down Expand Up @@ -1081,7 +1088,8 @@ func TestServicePortsAndEndpoints(t *testing.T) {
Namespace: "default",
},
Subsets: tc.endpointSubsets,
}},
},
},
Services: map[types.NamespacedName]*corev1.Service{
{Name: "service", Namespace: "default"}: {
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -1144,13 +1152,13 @@ func TestEndpointsHTTPS(t *testing.T) {
"https://1.2.3.4:443",
"https://1.2.3.5:443",
},
"service.default.svc.cluster.local",
"service.default.svc",
},
{
"HTTPS multiple IPs - override",
map[string]string{
fmt.Sprintf("p/%s", model.SecureUpstream): "true",
fmt.Sprintf("p/%s", model.TLSServerName): "custom-service.default.svc.cluster.local",
fmt.Sprintf("p/%s", model.TLSServerName): "custom-service.default.svc",
},
networkingv1.ServiceBackendPort{Name: "https"},
[]corev1.ServicePort{{
Expand All @@ -1166,7 +1174,7 @@ func TestEndpointsHTTPS(t *testing.T) {
"https://1.2.3.4:443",
"https://1.2.3.5:443",
},
"custom-service.default.svc.cluster.local",
"custom-service.default.svc",
},
{
"HTTPS use service proxy",
Expand All @@ -1185,7 +1193,7 @@ func TestEndpointsHTTPS(t *testing.T) {
Ports: []corev1.EndpointPort{{Name: "https", Port: 443}},
}},
[]string{
"https://service.default.svc.cluster.local:443",
"https://service.default.svc:443",
},
"",
},
Expand Down Expand Up @@ -1231,7 +1239,8 @@ func TestEndpointsHTTPS(t *testing.T) {
Namespace: "default",
},
Subsets: tc.endpointSubsets,
}},
},
},
Services: map[types.NamespacedName]*corev1.Service{
{Name: "service", Namespace: "default"}: {
ObjectMeta: metav1.ObjectMeta{
Expand Down