Skip to content

Bug 1701422: registry auth without port number #22659

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 1 commit into from
Apr 26, 2019
Merged

Bug 1701422: registry auth without port number #22659

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
17 changes: 13 additions & 4 deletions pkg/serviceaccounts/controllers/docker_registry_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"k8s.io/klog"

"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/sets"
Expand Down Expand Up @@ -249,12 +249,21 @@ func getDockerRegistryLocations(lister listers.ServiceLister, location serviceLo

hasClusterIP := (len(service.Spec.ClusterIP) > 0) && (net.ParseIP(service.Spec.ClusterIP) != nil)
if hasClusterIP && len(service.Spec.Ports) > 0 {
svcPort := service.Spec.Ports[0].Port
ret := []string{
net.JoinHostPort(service.Spec.ClusterIP, fmt.Sprintf("%d", service.Spec.Ports[0].Port)),
net.JoinHostPort(fmt.Sprintf("%s.%s.svc", service.Name, service.Namespace), fmt.Sprintf("%d", service.Spec.Ports[0].Port)),
net.JoinHostPort(service.Spec.ClusterIP, fmt.Sprintf("%d", svcPort)),
net.JoinHostPort(fmt.Sprintf("%s.%s.svc", service.Name, service.Namespace), fmt.Sprintf("%d", svcPort)),
}
// Bug 1701422: if using HTTP/S default ports, add locations without the port number
if svcPort == 80 || svcPort == 443 {
ret = append(ret, service.Spec.ClusterIP, fmt.Sprintf("%s.%s.svc", service.Name, service.Namespace))
}
if len(clusterDNSSuffix) > 0 {
ret = append(ret, net.JoinHostPort(fmt.Sprintf("%s.%s.svc."+clusterDNSSuffix, service.Name, service.Namespace), fmt.Sprintf("%d", service.Spec.Ports[0].Port)))
ret = append(ret, net.JoinHostPort(fmt.Sprintf("%s.%s.svc."+clusterDNSSuffix, service.Name, service.Namespace), fmt.Sprintf("%d", svcPort)))
// Bug 1701422: if using HTTP/S default ports, add locations without the port number
if svcPort == 80 || svcPort == 443 {
ret = append(ret, fmt.Sprintf("%s.%s.svc."+clusterDNSSuffix, service.Name, service.Namespace))
}
}

return ret
Expand Down
34 changes: 28 additions & 6 deletions pkg/serviceaccounts/controllers/docker_registry_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"
"time"

"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
Expand All @@ -28,7 +28,7 @@ var (
ObjectMeta: metav1.ObjectMeta{Name: registryName, Namespace: registryNamespace},
Spec: v1.ServiceSpec{
ClusterIP: "172.16.123.123",
Ports: []v1.ServicePort{{Port: 1235}},
Ports: []v1.ServicePort{{Port: 443}},
},
}
)
Expand Down Expand Up @@ -182,7 +182,14 @@ func TestUpdateNewStyleSecretAndDNSSuffixAndAdditionalURLs(t *testing.T) {
}

expectedDockercfgMap := credentialprovider.DockerConfig{}
for _, key := range []string{"foo.bar.com", "172.16.123.123:1235", "docker-registry.default.svc:1235", "docker-registry.default.svc.something.else:1235"} {
expectedLocations := []string{"foo.bar.com",
"172.16.123.123:443",
"172.16.123.123",
"docker-registry.default.svc:443",
"docker-registry.default.svc",
"docker-registry.default.svc.something.else:443",
"docker-registry.default.svc.something.else"}
for _, key := range expectedLocations {
expectedDockercfgMap[key] = credentialprovider.DockerConfigEntry{
Username: "serviceaccount",
Password: newStyleDockercfgSecret.Annotations[ServiceAccountTokenValueAnnotation],
Expand Down Expand Up @@ -271,7 +278,12 @@ func TestUpdateOldStyleSecretWithKey(t *testing.T) {
}

expectedDockercfgMap := credentialprovider.DockerConfig{}
for _, key := range []string{"172.16.123.123:1235", "docker-registry.default.svc:1235"} {
expectedLocations := []string{
"172.16.123.123:443",
"172.16.123.123",
"docker-registry.default.svc:443",
"docker-registry.default.svc"}
for _, key := range expectedLocations {
expectedDockercfgMap[key] = credentialprovider.DockerConfigEntry{
Username: "serviceaccount",
Password: "token-value",
Expand Down Expand Up @@ -362,7 +374,12 @@ func TestUpdateOldStyleSecretWithoutKey(t *testing.T) {
}

expectedDockercfgMap := credentialprovider.DockerConfig{}
for _, key := range []string{"172.16.123.123:1235", "docker-registry.default.svc:1235"} {
expectedLocations := []string{
"172.16.123.123:443",
"172.16.123.123",
"docker-registry.default.svc:443",
"docker-registry.default.svc"}
for _, key := range expectedLocations {
expectedDockercfgMap[key] = credentialprovider.DockerConfigEntry{
Username: "serviceaccount",
Password: "the-sa-bearer-token",
Expand Down Expand Up @@ -496,7 +513,12 @@ func TestClearSecretAndRecreate(t *testing.T) {
}

expectedDockercfgMap := credentialprovider.DockerConfig{}
for _, key := range []string{"172.16.123.123:1235", "docker-registry.default.svc:1235"} {
expectedLocations := []string{
"172.16.123.123:443",
"172.16.123.123",
"docker-registry.default.svc:443",
"docker-registry.default.svc"}
for _, key := range expectedLocations {
expectedDockercfgMap[key] = credentialprovider.DockerConfigEntry{
Username: "serviceaccount",
Password: "the-token",
Expand Down