Fix pod_forwarder to support two part DNS names, adjust e2e http_clie…

…nt (#1297) * Fix pod_forwarder to support two part DNS names, adjust e2e http_client url * Revert removing .svc in e2e http_client
elastic · Jul 21, 2019 · 603b6d3 · 603b6d3
1 parent f8448fc
commit 603b6d3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/operators/pkg/dev/portforward/pod_forwarder.go b/operators/pkg/dev/portforward/pod_forwarder.go
@@ -98,7 +98,7 @@ func newDefaultKubernetesClientset() (*kubernetes.Clientset, error) {
 }
 
 // podDNSRegex matches pods FQDN such as {name}.{namespace}.pod
-var podDNSRegex = regexp.MustCompile(`^.+\..+\..*$`)
+var podDNSRegex = regexp.MustCompile(`^.+\..+$`)
 
 // podIPRegex matches any ipv4 address.
 var podIPv4Regex = regexp.MustCompile(`^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$`)
@@ -118,7 +118,7 @@ func parsePodAddr(addr string, clientSet *kubernetes.Clientset) (*types.Namespac
 		// retrieve pod name and namespace from addr
 		// TODO: subdomains in pod names would change this.
 		parts := strings.SplitN(host, ".", 3)
-		if len(parts) <= 2 {
+		if len(parts) <= 1 {
 			return nil, fmt.Errorf("unsupported pod address format: %s", host)
 		}
 		return &types.NamespacedName{Namespace: parts[1], Name: parts[0]}, nil

diff --git a/operators/pkg/dev/portforward/pod_forwarder_test.go b/operators/pkg/dev/portforward/pod_forwarder_test.go
@@ -143,10 +143,15 @@ func Test_parsePodAddr(t *testing.T) {
 			args: args{addr: "foo.bar.pod:1234"},
 			want: types.NamespacedName{Namespace: "bar", Name: "foo"},
 		},
+		{
+			name: "pod DNS with pod and namespace only",
+			args: args{addr: "foopod.barnamespace:1234"},
+			want: types.NamespacedName{Namespace: "barnamespace", Name: "foopod"},
+		},
 		{
 			name:    "invalid",
-			args:    args{addr: "example.com:1234"},
-			wantErr: errors.New("unsupported pod address format: example.com"),
+			args:    args{addr: "foobar:1234"},
+			wantErr: errors.New("unsupported pod address format: foobar"),
 		},
 	}
 	for _, tt := range tests {

diff --git a/operators/test/e2e/test/elasticsearch/http_client.go b/operators/test/e2e/test/elasticsearch/http_client.go
@@ -28,7 +28,7 @@ func NewElasticsearchClient(es v1alpha1.Elasticsearch, k *test.K8sClient) (clien
 	if err != nil {
 		return nil, err
 	}
-	inClusterURL := fmt.Sprintf("https://%s:9200", name.HTTPService(es.Name))
+	inClusterURL := fmt.Sprintf("https://%s.%s.svc:9200", name.HTTPService(es.Name), es.Namespace)
 	var dialer net.Dialer
 	if test.AutoPortForward {
 		dialer = portforward.NewForwardingDialer()