Atlas-12675: Replacing google dns with internal csp

infobloxopen · May 18, 2022 · ce609d4 · ce609d4
1 parent 21379d1
commit ce609d4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/charts/dapr/charts/dapr_sidecar_injector/templates/dapr_sidecar_injector_deployment.yaml b/charts/dapr/charts/dapr_sidecar_injector/templates/dapr_sidecar_injector_deployment.yaml
@@ -77,6 +77,8 @@ spec:
 {{- end }}
         - "--metrics-port"
         - "{{ .Values.global.prometheus.port }}"
+        - "--public-server"
+        - "{{ .Values.host.cpNoa.domain | required "set host.cpNoa.domain" | quote }}"
         env:
         - name: TLS_CERT_FILE
           value: /dapr/cert/tls.crt

diff --git a/charts/dapr/charts/dapr_sidecar_injector/values.yaml b/charts/dapr/charts/dapr_sidecar_injector/values.yaml
@@ -12,3 +12,6 @@ webhookFailurePolicy: Ignore
 sidecarImagePullPolicy: Always
 runAsNonRoot: true
 resources: {}
+host:
+  cpNoa:
+    domain: ""
diff --git a/utils/host.go b/utils/host.go
@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"fmt"
 	"net"
 	"os"
 
@@ -18,9 +19,14 @@ func GetHostAddress() (string, error) {
 		return val, nil
 	}
 
+	publicLookupAddr, ok := os.LookupEnv("public-server")
+	if !ok {
+		publicLookupAddr = "cp.noa.infoblox.com"
+	}
+
 	// Use udp so no handshake is made.
 	// Any IP can be used, since connection is not established, but we used a known DNS IP.
-	conn, err := net.Dial("udp", "8.8.8.8:80")
+	conn, err := net.Dial("udp", fmt.Sprintf("%s:80", publicLookupAddr))
 	if err != nil {
 		// Could not find one via a  UDP connection, so we fallback to the "old" way: try first non-loopback IPv4:
 		addrs, err := net.InterfaceAddrs()