Use the full svc cluster domain in alluxio config (fluid-cloudnative#…

…2191)

* use the full svc cluster domain in alluxio config

Signed-off-by: Ruofeng Lei <ruofenglei@outlook.com>

* fix ut

Signed-off-by: Ruofeng Lei <ruofenglei@outlook.com>

* add newline end of file

Signed-off-by: Ruofeng Lei <ruofenglei@outlook.com>

Signed-off-by: Ruofeng Lei <ruofenglei@outlook.com>

charts/alluxio/templates/config/alluxio-conf.yaml

@@ -24,7 +24,7 @@
 {{- $alluxioJavaOpts := list }}
 {{- /* Specify master hostname if single master */}}
 {{- if $isSingleMaster }}
-  {{- $alluxioJavaOpts = printf "-Dalluxio.master.hostname=%v-%v" $fullName $defaultMasterName | append $alluxioJavaOpts }}
+  {{- $alluxioJavaOpts = printf "-Dalluxio.master.hostname=%v-%v.%v.svc.%v" $fullName $defaultMasterName .Values.runtimeIdentity.namespace .Values.clusterDomain   | append $alluxioJavaOpts }}
 {{- end }}
 {{ if .Values.fuse.enabled -}}
   {{- $alluxioJavaOpts = print "-Dalluxio.user.hostname=${ALLUXIO_CLIENT_HOSTNAME}" | append $alluxioJavaOpts }}

charts/alluxio/values.yaml

@@ -443,3 +443,4 @@ runtimeIdentity:
   namespace: default
   name: xxx
 
+clusterDomain: cluster.local

pkg/common/cluster_domain.go

@@ -0,0 +1,33 @@
+package common
+
+import (
+	"errors"
+	"os"
+	"strings"
+)
+
+// GetClusterDomain get cluster domain: cluster.local from /etc/resolv.conf
+func GetClusterDomain() (string, error) {
+	resolveConf, err := os.ReadFile("/etc/resolv.conf")
+	if err != nil {
+		return "", err
+	}
+	return parseResolvConf(string(resolveConf))
+}
+
+// parseResolvConf parse cluster domain from /etc/resolv.conf
+// search default.svc.cluster.local svc.cluster.local cluster.local
+// for how k8s generate `resolv.conf`, ref:
+// https://github.com/kubernetes/kubernetes/blob/542ec977054c16c7981606cb1590cc39154ddf01/pkg/kubelet/network/dns/dns.go#L167
+func parseResolvConf(conf string) (string, error) {
+	for _, line := range strings.Split(conf, "\n") {
+		line := strings.TrimSpace(line)
+		if strings.HasPrefix(line, "search") {
+			search := strings.Split(line, " ")
+			if len(search) >= 4 {
+				return search[3], nil
+			}
+		}
+	}
+	return "", errors.New("failed to parse cluster domain from resolv.conf")
+}

pkg/common/cluster_domain_test.go

@@ -0,0 +1,72 @@
+package common
+
+import "testing"
+
+func Test_parseResolvConf(t *testing.T) {
+	type args struct {
+		conf string
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    string
+		wantErr bool
+	}{
+		{
+			args: args{
+				conf: `nameserver 10.255.0.10
+search default.svc.cluster.local svc.cluster.local cluster.local
+options ndots:5`,
+			},
+			want:    "cluster.local",
+			wantErr: false,
+		},
+		{
+			args: args{
+				conf: `nameserver 10.255.0.10
+search default.svc.cluster.local svc.cluster.local cluster.local foo.bar
+options ndots:5`,
+			},
+			want:    "cluster.local",
+			wantErr: false,
+		},
+		{
+			args: args{
+				conf: `nameserver 10.255.0.10
+search default.svc.clusterxx.local svc.clusterxx.local clusterxx.local
+options ndots:5`,
+			},
+			want:    "clusterxx.local",
+			wantErr: false,
+		},
+		{
+			args: args{
+				conf: `nameserver 10.255.0.10
+options ndots:5`,
+			},
+			want:    "",
+			wantErr: true,
+		},
+		{
+			args: args{
+				conf: `nameserver 10.255.0.10
+search a
+options ndots:5`,
+			},
+			want:    "",
+			wantErr: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := parseResolvConf(tt.args.conf)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("parseResolvConf() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
+				t.Errorf("parseResolvConf() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

pkg/ddc/alluxio/master_internal_test.go

@@ -22,6 +22,7 @@ import (
 
 	"github.com/brahma-adshonor/gohook"
 	datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1"
+	"github.com/fluid-cloudnative/fluid/pkg/common"
 	"github.com/fluid-cloudnative/fluid/pkg/ddc/base/portallocator"
 	"github.com/fluid-cloudnative/fluid/pkg/utils/fake"
 	"github.com/fluid-cloudnative/fluid/pkg/utils/helm"
@@ -54,6 +55,9 @@ func TestSetupMasterInternal(t *testing.T) {
 	mockExecInstallReleaseErr := func(name string, namespace string, valueFile string, chartName string) error {
 		return errors.New("fail to install dataload chart")
 	}
+	mockGetClusterDomain := func() (string, error) {
+		return "cluster.local", nil
+	}
 
 	wrappedUnhookCreateConfigMapFromFile := func() {
 		err := gohook.UnHook(kubectl.CreateConfigMapFromFile)
@@ -134,6 +138,10 @@ func TestSetupMasterInternal(t *testing.T) {
 	if err != nil {
 		t.Fatal(err.Error())
 	}
+	err = gohook.Hook(common.GetClusterDomain, mockGetClusterDomain, nil)
+	if err != nil {
+		t.Fatal(err.Error())
+	}
 	err = engine.setupMasterInternal()
 	if err != nil {
 		t.Errorf("fail to exec check helm release")
@@ -190,6 +198,9 @@ func TestGenerateAlluxioValueFile(t *testing.T) {
 	mockExecCreateConfigMapFromFileErr := func(name string, key, fileName string, namespace string) (err error) {
 		return errors.New("fail to exec command")
 	}
+	mockGetClusterDomain := func() (string, error) {
+		return "cluster.local", nil
+	}
 
 	wrappedUnhookCreateConfigMapFromFile := func() {
 		err := gohook.UnHook(kubectl.CreateConfigMapFromFile)
@@ -253,9 +264,13 @@ func TestGenerateAlluxioValueFile(t *testing.T) {
 	if err != nil {
 		t.Fatal(err.Error())
 	}
+	err = gohook.Hook(common.GetClusterDomain, mockGetClusterDomain, nil)
+	if err != nil {
+		t.Fatal(err.Error())
+	}
 	_, err = engine.generateAlluxioValueFile(allixioruntime)
 	if err != nil {
-		t.Errorf("fail to exec the function")
+		t.Errorf("fail to generateAlluxioValueFile %v", err)
 	}
 	wrappedUnhookCreateConfigMapFromFile()
 }

pkg/ddc/alluxio/transform.go

@@ -239,6 +239,12 @@ func (e *AlluxioEngine) transformCommonPart(runtime *datav1alpha1.AlluxioRuntime
 
 	e.transformShortCircuit(runtimeInfo, value)
 
+	clusterDomain, err := common.GetClusterDomain()
+	if err != nil {
+		return err
+	}
+	value.ClusterDomain = clusterDomain
+
 	return
 }
 

pkg/ddc/alluxio/types.go

@@ -72,6 +72,8 @@ type Alluxio struct {
 	PlacementMode string `json:"placement,omitempty"`
 
 	RuntimeIdentity common.RuntimeIdentity `json:"runtimeIdentity"`
+
+	ClusterDomain string `json:"clusterDomain,omitempty"`
 }
 
 type HadoopConfig struct {