feat: add support to cluster.local cluster domain

Author: colin404

manifests/env.k8s

@@ -2,12 +2,16 @@
 
 ONEX_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
-export ONEX_MYSQL_HOST=mariadb.infra.svc.onex.io
-export ONEX_REDIS_HOST=redis.infra.svc.onex.io
-export ONEX_ETCD_HOST=etcd.infra.svc.onex.io
-export ONEX_MONGO_HOST=mongo.infra.svc.onex.io
-export ONEX_KAFKA_HOST=onex-kafka.infra.svc.onex.io
-export ONEX_JAEGER_HOST=jaeger.infra.svc.onex.io
+# If deployed in a kubernetes cluster with cluster domain as 
+# cluster.local, please set KUBERNETES_CLUSTER_DOMAIN to cluster.local.
+export KUBERNETES_CLUSTER_DOMAIN=${KUBERNETES_CLUSTER_DOMAIN:-onex.io}
+
+export ONEX_MYSQL_HOST=mariadb.infra.svc.${KUBERNETES_CLUSTER_DOMAIN}
+export ONEX_REDIS_HOST=redis.infra.svc.${KUBERNETES_CLUSTER_DOMAIN}
+export ONEX_ETCD_HOST=etcd.infra.svc.${KUBERNETES_CLUSTER_DOMAIN}
+export ONEX_MONGO_HOST=mongo.infra.svc.${KUBERNETES_CLUSTER_DOMAIN}
+export ONEX_KAFKA_HOST=onex-kafka.infra.svc.${KUBERNETES_CLUSTER_DOMAIN}
+export ONEX_JAEGER_HOST=jaeger.infra.svc.${KUBERNETES_CLUSTER_DOMAIN}
 
 # 将组件的访问地址改为 Kubernetes 服务名
 export ONEX_USERCENTER_HOST=onex-usercenter

scripts/gen-certs.sh

@@ -15,6 +15,8 @@ source "${ONEX_ROOT}/scripts/lib/init.sh"
 readonly LOCAL_OUTPUT_ROOT="${ONEX_ROOT}/${OUT_DIR:-_output}"
 readonly LOCAL_OUTPUT_CAPATH="${LOCAL_OUTPUT_ROOT}/cert"
 readonly ONEX_DOMAIN="onex.io"
+# To ensure that access is available in the default k8s cluster (with cluster domain as cluster.local).
+readonly DEFAULT_KUBERNETES_CLUSTER_DOMAIN="cluster.local"
 
 # Hostname for the cert
 #readonly CERT_HOSTNAME="${CERT_HOSTNAME:-onex-apiserver},127.0.0.1,localhost,"
@@ -94,7 +96,7 @@ EOF
 
   #echo "Generate "${prefix}" certificates..."
   echo '{"CN":"'"${prefix}"'","hosts":[],"key":{"algo":"rsa","size":2048},"names":[{"C":"CN","ST":"Shenzhen","L":"Shenzhen","O":"tencent","OU":"'"${prefix}"'"}]}' \
-    | ${CFSSL_BIN} gencert -hostname="${CERT_HOSTNAME},${prefix/-/.}.${ONEX_DOMAIN}" -ca=ca.pem -ca-key=ca-key.pem \
+    | ${CFSSL_BIN} gencert -hostname="${CERT_HOSTNAME},${prefix/-/.}.${DEFAULT_KUBERNETES_CLUSTER_DOMAIN},${prefix/-/.}.${ONEX_DOMAIN}" -ca=ca.pem -ca-key=ca-key.pem \
     -config=ca-config.json -profile=node - | ${CFSSLJSON_BIN} -bare "${prefix}"
 
   # the popd will access `directory stack`, no `real` parameters is actually needed