Skip to content

OCPBUGS-77026: DNS optimization, add trailing dots #1112

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

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

OCPBUGS-77026: DNS optimization, add trailing dots #1112

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
4 changes: 2 additions & 2 deletions pkg/console/subresource/configmap/configmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,15 +231,15 @@ func getProxyAuthorization(authorizationType v1.AuthorizationType) bool {
func getProxyServiceURL(service *v1.ConsolePluginProxyServiceConfig) string {
pluginURL := &url.URL{
Scheme: "https",
Host: fmt.Sprintf("%s.%s.svc.cluster.local:%d", service.Name, service.Namespace, service.Port),
Host: fmt.Sprintf("%s.%s.svc.cluster.local.:%d", service.Name, service.Namespace, service.Port),
}
return pluginURL.String()
}

func getServiceURL(pluginBackend *v1.ConsolePluginBackend) string {
pluginURL := &url.URL{
Scheme: "https",
Host: fmt.Sprintf("%s.%s.svc.cluster.local:%d", pluginBackend.Service.Name, pluginBackend.Service.Namespace, pluginBackend.Service.Port),
Host: fmt.Sprintf("%s.%s.svc.cluster.local.:%d", pluginBackend.Service.Name, pluginBackend.Service.Namespace, pluginBackend.Service.Port),
Path: pluginBackend.Service.BasePath,
}
return pluginURL.String()
Expand Down
10 changes: 5 additions & 5 deletions pkg/console/subresource/configmap/configmap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,9 +1027,9 @@ servingInfo:
keyFile: /var/serving-cert/tls.key
providers: {}
plugins:
plugin1: https://service1.service-namespace1.svc.cluster.local:8443/
plugin2: https://service2.service-namespace2.svc.cluster.local:8443/
plugin3: https://service3.service-namespace3.svc.cluster.local:8443/
plugin1: https://service1.service-namespace1.svc.cluster.local.:8443/
plugin2: https://service2.service-namespace2.svc.cluster.local.:8443/
plugin3: https://service3.service-namespace3.svc.cluster.local.:8443/
proxy:
services:
- authorize: true
Expand All @@ -1049,7 +1049,7 @@ nV5cXbp9W1bC12Tc8nnNXn4ypLE2JTQAvyp51zoZ8hQoSnRVx/VCY55Yu+br8gQZ` + "\n" + `
+tW+O/PoE7B3tuY=` + "\n" + `
-----END CERTIFICATE-----'
consoleAPIPath: /api/proxy/plugin/plugin1/plugin1-alias/
endpoint: https://proxy-service1.proxy-service-namespace1.svc.cluster.local:9991
endpoint: https://proxy-service1.proxy-service-namespace1.svc.cluster.local.:9991
- authorize: true
caCertificate: '-----BEGIN CERTIFICATE-----` + "\n" + `
MIICRzCCAfGgAwIBAgIJAIydTIADd+yqMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNV` + "\n" + `
Expand All @@ -1067,7 +1067,7 @@ nV5cXbp9W1bC12Tc8nnNXn4ypLE2JTQAvyp51zoZ8hQoSnRVx/VCY55Yu+br8gQZ` + "\n" + `
+tW+O/PoE7B3tuY=` + "\n" + `
-----END CERTIFICATE-----'
consoleAPIPath: /api/proxy/plugin/plugin2/plugin2-alias/
endpoint: https://proxy-service2.proxy-service-namespace2.svc.cluster.local:9991
endpoint: https://proxy-service2.proxy-service-namespace2.svc.cluster.local.:9991
`,
},
},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/plugins_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
const (
availablePluginName = "test-plugin"
unavailablePluginName = "missing-test-plugin"
expectedPluginServiceEndpoint = "https://test-plugin-service-name.test-plugin-service-namespace.svc.cluster.local:8443/manifest"
expectedPluginServiceEndpoint = "https://test-plugin-service-name.test-plugin-service-namespace.svc.cluster.local.:8443/manifest"
expectedPluginNamespace = "plugin__test-plugin"
)

Expand Down