chore: update cluster domain service dns

Signed-off-by: Derek Wang <[email protected]>
numaproj · Jun 30, 2023 · 92ca138 · 92ca138
1 parent 0155b4a
commit 92ca138
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 26 deletions.
diff --git a/docs/user-guide/sources/http.md b/docs/user-guide/sources/http.md
@@ -38,7 +38,7 @@ Data could be sent to an HTTP source through:
 
 ### ClusterIP Service
 
-An HTTP Source Vertex can generate a `ClusterIP` Service if `service: true` is specified, the service name is in the format of `{pipelineName}-{vertexName}`, so the HTTP Source can be accessed through `https://{pipelineName}-{vertexName}.{namespace}.svc.cluster.local:8443/vertices/{vertexName}` within the cluster.
+An HTTP Source Vertex can generate a `ClusterIP` Service if `service: true` is specified, the service name is in the format of `{pipelineName}-{vertexName}`, so the HTTP Source can be accessed through `https://{pipelineName}-{vertexName}.{namespace}.svc:8443/vertices/{vertexName}` within the cluster.
 
 ```yaml
 apiVersion: numaflow.numaproj.io/v1alpha1

diff --git a/pkg/apis/numaflow/v1alpha1/jetstream_buffer_service.go b/pkg/apis/numaflow/v1alpha1/jetstream_buffer_service.go
@@ -195,7 +195,7 @@ func (j JetStreamBufferService) GetStatefulSetSpec(req GetJetStreamStatefulSetSp
 					{Name: "POD_NAME", ValueFrom: &corev1.EnvVarSource{FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.name"}}},
 					{Name: "SERVER_NAME", Value: "$(POD_NAME)"},
 					{Name: "POD_NAMESPACE", ValueFrom: &corev1.EnvVarSource{FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.namespace"}}},
-					{Name: "CLUSTER_ADVERTISE", Value: "$(POD_NAME)." + req.ServiceName + ".$(POD_NAMESPACE).svc.cluster.local"},
+					{Name: "CLUSTER_ADVERTISE", Value: "$(POD_NAME)." + req.ServiceName + ".$(POD_NAMESPACE).svc"},
 					{Name: "GOMEMLIMIT", ValueFrom: &corev1.EnvVarSource{ResourceFieldRef: &corev1.ResourceFieldSelector{ContainerName: "main", Resource: "limits.memory"}}},
 					{Name: "JS_KEY", ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{LocalObjectReference: corev1.LocalObjectReference{Name: req.ServerEncryptionSecretName}, Key: JetStreamServerSecretEncryptionKey}}},
 				},

diff --git a/pkg/apis/numaflow/v1alpha1/pipeline_types.go b/pkg/apis/numaflow/v1alpha1/pipeline_types.go
@@ -183,7 +183,7 @@ func (p Pipeline) GetDaemonDeploymentName() string {
 	return fmt.Sprintf("%s-daemon", p.Name)
 }
 func (p Pipeline) GetDaemonServiceURL() string {
-	return fmt.Sprintf("%s.%s.svc.cluster.local:%d", p.GetDaemonServiceName(), p.Namespace, DaemonServicePort)
+	return fmt.Sprintf("%s.%s.svc:%d", p.GetDaemonServiceName(), p.Namespace, DaemonServicePort)
 }
 
 func (p Pipeline) GetDaemonDeploymentObj(req GetDaemonDeploymentReq) (*appv1.Deployment, error) {

diff --git a/pkg/daemon/server/service/pipeline_metrics_query.go b/pkg/daemon/server/service/pipeline_metrics_query.go
@@ -207,8 +207,8 @@ func (ps *pipelineMetadataQuery) getPending(ctx context.Context, req *daemon.Get
 	for idx := 0; idx < metricsCount; idx++ {
 		// Get the headless service name
 		// We can query the metrics endpoint of the (i)th pod to obtain this value.
-		// example for 0th pod : https://simple-pipeline-in-0.simple-pipeline-in-headless.default.svc.cluster.local:2469/metrics
-		url := fmt.Sprintf("https://%s-%v.%s.%s.svc.cluster.local:%v/metrics", vertexName, idx, headlessServiceName, ps.pipeline.Namespace, v1alpha1.VertexMetricsPort)
+		// example for 0th pod : https://simple-pipeline-in-0.simple-pipeline-in-headless.default.svc:2469/metrics
+		url := fmt.Sprintf("https://%s-%v.%s.%s.svc:%v/metrics", vertexName, idx, headlessServiceName, ps.pipeline.Namespace, v1alpha1.VertexMetricsPort)
 		if res, err := ps.httpClient.Get(url); err != nil {
 			log.Debugf("Error reading the metrics endpoint, it might be because of vertex scaling down to 0: %f", err.Error())
 			return nil

diff --git a/pkg/daemon/server/service/rater/pod_tracker.go b/pkg/daemon/server/service/rater/pod_tracker.go
@@ -122,8 +122,8 @@ func (pt *PodTracker) GetActivePods() *UniqueStringList {
 
 func (pt *PodTracker) isActive(vertexName, podName string) bool {
 	// using the vertex headless service to check if a pod exists or not.
-	// example for 0th pod : https://simple-pipeline-in-0.simple-pipeline-in-headless.default.svc.cluster.local:2469/metrics
-	url := fmt.Sprintf("https://%s.%s.%s.svc.cluster.local:%v/metrics", podName, pt.pipeline.Name+"-"+vertexName+"-headless", pt.pipeline.Namespace, v1alpha1.VertexMetricsPort)
+	// example for 0th pod : https://simple-pipeline-in-0.simple-pipeline-in-headless.default.svc:2469/metrics
+	url := fmt.Sprintf("https://%s.%s.%s.svc:%v/metrics", podName, pt.pipeline.Name+"-"+vertexName+"-headless", pt.pipeline.Namespace, v1alpha1.VertexMetricsPort)
 	if _, err := pt.httpClient.Head(url); err != nil {
 		// during performance test (100 pods per vertex), we never saw a false negative, meaning every time isActive returns false,
 		// it truly means the pod doesn't exist.

diff --git a/pkg/daemon/server/service/rater/rater.go b/pkg/daemon/server/service/rater/rater.go
@@ -217,7 +217,7 @@ func sleep(ctx context.Context, duration time.Duration) {
 // since a pod can read from multiple partitions, we will return a map of partition to read count.
 func (r *Rater) getPodReadCounts(vertexName, vertexType, podName string) *PodReadCount {
 	// scrape the read total metric from pod metric port
-	url := fmt.Sprintf("https://%s.%s.%s.svc.cluster.local:%v/metrics", podName, r.pipeline.Name+"-"+vertexName+"-headless", r.pipeline.Namespace, v1alpha1.VertexMetricsPort)
+	url := fmt.Sprintf("https://%s.%s.%s.svc:%v/metrics", podName, r.pipeline.Name+"-"+vertexName+"-headless", r.pipeline.Namespace, v1alpha1.VertexMetricsPort)
 	if res, err := r.httpClient.Get(url); err != nil {
 		r.log.Errorf("failed reading the metrics endpoint, %v", err.Error())
 		return nil

diff --git a/pkg/daemon/server/service/rater/rater_test.go b/pkg/daemon/server/service/rater/rater_test.go
@@ -39,7 +39,7 @@ import (
 //func (m *mockHttpClient) Get(url string) (*http.Response, error) {
 //	m.lock.Lock()
 //	defer m.lock.Unlock()
-//	if url == "https://p-v-0.p-v-headless.default.svc.cluster.local:2469/metrics" {
+//	if url == "https://p-v-0.p-v-headless.default.svc:2469/metrics" {
 //		m.podOneCount = m.podOneCount + 20
 //		resp := &http.Response{
 //			StatusCode: 200,
@@ -49,7 +49,7 @@ import (
 //forwarder_read_total{buffer="input",pipeline="simple-pipeline",vertex="input"} %d
 //`, m.podOneCount))))}
 //		return resp, nil
-//	} else if url == "https://p-v-1.p-v-headless.default.svc.cluster.local:2469/metrics" {
+//	} else if url == "https://p-v-1.p-v-headless.default.svc:2469/metrics" {
 //		m.podTwoCount = m.podTwoCount + 60
 //		resp := &http.Response{
 //			StatusCode: 200,
@@ -67,11 +67,11 @@ import (
 //func (m *mockHttpClient) Head(url string) (*http.Response, error) {
 //	m.lock.Lock()
 //	defer m.lock.Unlock()
-//	if url == "https://p-v-0.p-v-headless.default.svc.cluster.local:2469/metrics" {
+//	if url == "https://p-v-0.p-v-headless.default.svc:2469/metrics" {
 //		return &http.Response{
 //			StatusCode: 200,
 //			Body:       io.NopCloser(bytes.NewReader([]byte(``)))}, nil
-//	} else if url == "https://p-v-1.p-v-headless.default.svc.cluster.local:2469/metrics" {
+//	} else if url == "https://p-v-1.p-v-headless.default.svc:2469/metrics" {
 //		return &http.Response{
 //			StatusCode: 200,
 //			Body:       io.NopCloser(bytes.NewReader([]byte(``)))}, nil

diff --git a/pkg/reconciler/isbsvc/installer/assets/redis/config/sentinel.conf b/pkg/reconciler/isbsvc/installer/assets/redis/config/sentinel.conf
@@ -1,6 +1,6 @@
 dir "/tmp"
 port {{.SentinelPort}}
-sentinel monitor mymaster {{.StatefulSetName}}-0.{{.HeadlessServiceName}}.{{.Namespace}}.svc.cluster.local {{.RedisPort}} {{.Quorum}}
+sentinel monitor mymaster {{.StatefulSetName}}-0.{{.HeadlessServiceName}}.{{.Namespace}}.svc {{.RedisPort}} {{.Quorum}}
 {{.SentinelSettings}}
 # User-supplied sentinel configuration:
 # End of sentinel configuration
diff --git a/pkg/reconciler/isbsvc/installer/assets/redis/scripts/prestop-redis.sh b/pkg/reconciler/isbsvc/installer/assets/redis/scripts/prestop-redis.sh
@@ -15,10 +15,10 @@ is_master() {
     [[ "$REDIS_ROLE" == "master" ]]
 }
 
-HEADLESS_SERVICE="{{.HeadlessServiceName}}.{{.Namespace}}.svc.cluster.local"
+HEADLESS_SERVICE="{{.HeadlessServiceName}}.{{.Namespace}}.svc"
 SENTINEL_SERVICE_ENV_NAME=REDIS_SENTINEL_SERVICE_PORT_TCP_SENTINEL
 SENTINEL_SERVICE_PORT=$(get_port "{{.ServiceName}}" "TCP_SENTINEL")
-REDIS_SERVICE="{{.ServiceName}}.{{.Namespace}}.svc.cluster.local"
+REDIS_SERVICE="{{.ServiceName}}.{{.Namespace}}.svc"
 
 get_full_hostname() {
     hostname="$1"

diff --git a/pkg/reconciler/isbsvc/installer/assets/redis/scripts/prestop-sentinel.sh b/pkg/reconciler/isbsvc/installer/assets/redis/scripts/prestop-sentinel.sh
@@ -3,10 +3,10 @@
 . /opt/bitnami/scripts/libvalidations.sh
 . /opt/bitnami/scripts/libos.sh
 
-HEADLESS_SERVICE="{{.HeadlessServiceName}}.{{.Namespace}}.svc.cluster.local"
+HEADLESS_SERVICE="{{.HeadlessServiceName}}.{{.Namespace}}.svc"
 SENTINEL_SERVICE_ENV_NAME=REDIS_SENTINEL_SERVICE_PORT_TCP_SENTINEL
 SENTINEL_SERVICE_PORT=${!SENTINEL_SERVICE_ENV_NAME}
-REDIS_SERVICE="{{.ServiceName}}.{{.Namespace}}.svc.cluster.local"
+REDIS_SERVICE="{{.ServiceName}}.{{.Namespace}}.svc"
 
 get_full_hostname() {
     hostname="$1"

diff --git a/pkg/reconciler/isbsvc/installer/assets/redis/scripts/start-node.sh b/pkg/reconciler/isbsvc/installer/assets/redis/scripts/start-node.sh
@@ -33,8 +33,8 @@ get_full_hostname() {
 
 REDISPORT=$(get_port "$HOSTNAME" "REDIS")
 
-HEADLESS_SERVICE="{{.HeadlessServiceName}}.{{.Namespace}}.svc.cluster.local"
-REDIS_SERVICE="{{.ServiceName}}.{{.Namespace}}.svc.cluster.local"
+HEADLESS_SERVICE="{{.HeadlessServiceName}}.{{.Namespace}}.svc"
+REDIS_SERVICE="{{.ServiceName}}.{{.Namespace}}.svc"
 SENTINEL_SERVICE_PORT=$(get_port "{{.ServiceName}}" "TCP_SENTINEL")
 
 

diff --git a/pkg/reconciler/isbsvc/installer/assets/redis/scripts/start-sentinel.sh b/pkg/reconciler/isbsvc/installer/assets/redis/scripts/start-sentinel.sh
@@ -4,8 +4,8 @@
 . /opt/bitnami/scripts/libvalidations.sh
 . /opt/bitnami/scripts/libfile.sh
 
-HEADLESS_SERVICE="{{.HeadlessServiceName}}.{{.Namespace}}.svc.cluster.local"
-REDIS_SERVICE="{{.ServiceName}}.{{.Namespace}}.svc.cluster.local"
+HEADLESS_SERVICE="{{.HeadlessServiceName}}.{{.Namespace}}.svc"
+REDIS_SERVICE="{{.ServiceName}}.{{.Namespace}}.svc"
 
 get_port() {
     hostname="$1"

diff --git a/pkg/reconciler/isbsvc/installer/jetstream.go b/pkg/reconciler/isbsvc/installer/jetstream.go
@@ -118,7 +118,7 @@ func (r *jetStreamInstaller) Install(ctx context.Context) (*dfv1.BufferServiceCo
 	r.isbs.Status.MarkDeployed()
 	return &dfv1.BufferServiceConfig{
 		JetStream: &dfv1.JetStreamConfig{
-			URL: fmt.Sprintf("nats://%s.%s.svc.cluster.local:%s", generateJetStreamServiceName(r.isbs), r.isbs.Namespace, strconv.Itoa(int(clientPort))),
+			URL: fmt.Sprintf("nats://%s.%s.svc:%s", generateJetStreamServiceName(r.isbs), r.isbs.Namespace, strconv.Itoa(int(clientPort))),
 			Auth: &dfv1.NatsAuth{
 				Basic: &dfv1.BasicAuth{
 					User: &corev1.SecretKeySelector{
@@ -395,7 +395,7 @@ func (r *jetStreamInstaller) createConfigMap(ctx context.Context) error {
 	}
 	routes := []string{}
 	for j := 0; j < replicas; j++ {
-		routes = append(routes, fmt.Sprintf("nats://%s-%s.%s.%s.svc.cluster.local:%s", ssName, strconv.Itoa(j), svcName, r.isbs.Namespace, strconv.Itoa(int(clusterPort))))
+		routes = append(routes, fmt.Sprintf("nats://%s-%s.%s.%s.svc:%s", ssName, strconv.Itoa(j), svcName, r.isbs.Namespace, strconv.Itoa(int(clusterPort))))
 	}
 	settings := r.config.ISBSvc.JetStream.Settings
 	if x := r.isbs.Spec.JetStream.Settings; x != nil {

diff --git a/server/apis/v1/handler.go b/server/apis/v1/handler.go
@@ -341,5 +341,5 @@ func (h *handler) ListNamespaces(c *gin.Context) {
 }
 
 func daemonSvcAddress(ns, pipeline string) string {
-	return fmt.Sprintf("%s.%s.svc.cluster.local:%d", fmt.Sprintf("%s-daemon-svc", pipeline), ns, dfv1.DaemonServicePort)
+	return fmt.Sprintf("%s.%s.svc:%d", fmt.Sprintf("%s-daemon-svc", pipeline), ns, dfv1.DaemonServicePort)
 }
diff --git a/ui/src/utils/fetchWrappers/podsFetch.test.ts b/ui/src/utils/fetchWrappers/podsFetch.test.ts
@@ -293,7 +293,7 @@ describe("podsFetch test", () => {
                     "value": "eyJqZXRzdHJlYW0iOnsidXJsIjoibmF0czovL2lzYnMtZGVmYXVsdC1qcy1zdmMuZGF0YWZsb3ctc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FsOjQyMjIiLCJhdXRoIjp7InVzZXIiOnsibmFtZSI6ImlzYnMtZGVmYXVsdC1qcy1jbGllbnQtYXV0aCIsImtleSI6ImNsaWVudC1hdXRoLXVzZXIifSwicGFzc3dvcmQiOnsibmFtZSI6ImlzYnMtZGVmYXVsdC1qcy1jbGllbnQtYXV0aCIsImtleSI6ImNsaWVudC1hdXRoLXBhc3N3b3JkIn19LCJidWZmZXJDb25maWciOiJjb25zdW1lcjpcbiAgYWNrd2FpdDogNjBzXG4gIG1heGFja3BlbmRpbmc6IDIwMDAwXG5zdHJlYW06XG4gIGR1cGxpY2F0ZXM6IDYwc1xuICBtYXhhZ2U6IDE2OGhcbiAgbWF4Ynl0ZXM6IC0xXG4gIG1heG1zZ3M6IDUwMDAwXG4gIHJlcGxpY2FzOiAzXG4gIHJldGVudGlvbjogMVxuIn19"
                 }, {
                     "name": "NUMAFLOW_ISBS_JETSTREAM_URL",
-                    "value": "nats://isbs-default-js-svc.numaflow-system.svc.cluster.local:4222"
+                    "value": "nats://isbs-default-js-svc.numaflow-system.svc:4222"
                 }, {
                     "name": "NUMAFLOW_ISBS_JETSTREAM_TLS_ENABLED",
                     "value": "false"
@@ -348,7 +348,7 @@ describe("podsFetch test", () => {
                     "value": "eyJqZXRzdHJlYW0iOnsidXJsIjoibmF0czovL2lzYnMtZGVmYXVsdC1qcy1zdmMuZGF0YWZsb3ctc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FsOjQyMjIiLCJhdXRoIjp7InVzZXIiOnsibmFtZSI6ImlzYnMtZGVmYXVsdC1qcy1jbGllbnQtYXV0aCIsImtleSI6ImNsaWVudC1hdXRoLXVzZXIifSwicGFzc3dvcmQiOnsibmFtZSI6ImlzYnMtZGVmYXVsdC1qcy1jbGllbnQtYXV0aCIsImtleSI6ImNsaWVudC1hdXRoLXBhc3N3b3JkIn19LCJidWZmZXJDb25maWciOiJjb25zdW1lcjpcbiAgYWNrd2FpdDogNjBzXG4gIG1heGFja3BlbmRpbmc6IDIwMDAwXG5zdHJlYW06XG4gIGR1cGxpY2F0ZXM6IDYwc1xuICBtYXhhZ2U6IDE2OGhcbiAgbWF4Ynl0ZXM6IC0xXG4gIG1heG1zZ3M6IDUwMDAwXG4gIHJlcGxpY2FzOiAzXG4gIHJldGVudGlvbjogMVxuIn19"
                 }, {
                     "name": "NUMAFLOW_ISBS_JETSTREAM_URL",
-                    "value": "nats://isbs-default-js-svc.numaflow-system.svc.cluster.local:4222"
+                    "value": "nats://isbs-default-js-svc.numaflow-system.svc:4222"
                 }, {
                     "name": "NUMAFLOW_ISBS_JETSTREAM_TLS_ENABLED",
                     "value": "false"