fix: fix onex installation in k8s

Author: colin404

configs/appconfig/onex-miner-controller.config.tmpl.yaml

@@ -11,6 +11,7 @@ leaderElection:
   leaderElect: false
 metricsBindAddress: 0.0.0.0:${ONEX_MINER_CONTROLLER_METRICS_PORT}
 healthzBindAddress: 0.0.0.0:${ONEX_MINER_CONTROLLER_HEALTHZ_PORT}
+providerKubeconfig: /opt/onex/etc/config.kind
 dryRun: true
 redis:
   addr: ${ONEX_REDIS_ADDR}

configs/appconfig/onex-minerset-controller.config.tmpl.yaml

@@ -4,7 +4,6 @@
 # this file is https://github.com/superproj/onex.
 #
 
-
 apiVersion: minersetcontroller.config.onex.io/v1beta1
 kind: MinerSetControllerConfiguration
 leaderElection:

docs/guide/zh-CN/installation/onex/onex-toyblc/installation.md

@@ -35,7 +35,7 @@ $ curl -H "Host: onex.toyblc.superproj.com" http://127.0.0.1:18080/v1/peers
 $ curl -H "Host: onex.toyblc.superproj.com" http://127.0.0.1:18080/v1/blocks
 ```
 
-> curl http://genesis.kube-system.svc.onex.io:8080/v1/blocks
+> curl http://genesis.kube-system.svc.superproj.com:8080/v1/blocks
 
 ### 3. 挖矿 
 

internal/pkg/util/miner/miner.go

@@ -91,7 +91,7 @@ func IsMinerReady(m *v1beta1.Miner) bool {
 }
 
 func ChainDNSServiceNameFromMiner(namespace, name string) string {
-	return fmt.Sprintf("%s.%s.svc.onex.io", name, namespace)
+	return fmt.Sprintf("%s.%s.svc.superproj.com", name, namespace)
 }
 
 func GenesisDNSServiceNameFromMiner(name string) string {

manifests/env.k8s

@@ -4,7 +4,7 @@ ONEX_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 # 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 KUBERNETES_CLUSTER_DOMAIN=${KUBERNETES_CLUSTER_DOMAIN:-superproj.com}
 
 export ONEX_MYSQL_HOST=mariadb.infra.svc.${KUBERNETES_CLUSTER_DOMAIN}
 export ONEX_REDIS_HOST=redis.infra.svc.${KUBERNETES_CLUSTER_DOMAIN}

manifests/installation/bare/onex/onex-apiserver/deployment.yaml

@@ -41,7 +41,7 @@ spec:
       - args:
         - --secure-port=52443
         - --bind-address=0.0.0.0
-        - --etcd-servers=etcd.infra.svc.onex.io:2379
+        - --etcd-servers=etcd.infra.svc.superproj.com:2379
         - --client-ca-file=/opt/onex/etc/cert/ca.pem
         - --tls-cert-file=/opt/onex/etc/cert/onex-apiserver.pem 
         - --tls-private-key-file=/opt/onex/etc/cert/onex-apiserver-key.pem

manifests/installation/bare/onex/onex-apiserver/ingressroute.yaml

@@ -4,6 +4,16 @@
 # this file is https://github.com/superproj/onex.
 #
 
+apiVersion: traefik.io/v1alpha1
+kind: ServersTransport
+metadata:
+  name: onex-apiserver-transport
+spec:
+  serverName: onex.apiserver.superproj.com
+  insecureSkipVerify: false
+  rootCAsSecrets:
+    - root-ca-secret
+---
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
@@ -18,5 +28,6 @@ spec:
         - kind: Service
           name: onex-apiserver
           port: 52443
+          serversTransport: onex-apiserver-transport
   tls:
     secretName: onex-apiserver

manifests/installation/kubernetes/kind-onex.yaml

@@ -42,7 +42,7 @@ kubeadmConfigPatches:
 - |
   kind: ClusterConfiguration
   networking:
-    dnsDomain: "onex.io"
+    dnsDomain: "superproj.com"
 - |
   apiVersion: kubelet.config.k8s.io/v1beta1
   kind: KubeletConfiguration

manifests/installation/storage/values.yaml

@@ -1,5 +1,5 @@
 # 设置集群的域名
-clusterDomain: onex.io
+clusterDomain: superproj.com
 # 镜像相关配置
 image:
   # 镜像仓库的地址

scripts/gen-certs.sh

@@ -14,7 +14,7 @@ source "${ONEX_ROOT}/scripts/lib/init.sh"
 # OUT_DIR can come in from the Makefile, so honor it.
 readonly LOCAL_OUTPUT_ROOT="${ONEX_ROOT}/${OUT_DIR:-_output}"
 readonly LOCAL_OUTPUT_CAPATH="${LOCAL_OUTPUT_ROOT}/cert"
-readonly ONEX_DOMAIN="onex.io"
+readonly PROJ_DOMAIN="superproj.com"
 # To ensure that access is available in the default k8s cluster (with cluster domain as cluster.local).
 readonly DEFAULT_KUBERNETES_CLUSTER_DOMAIN="cluster.local"
 
@@ -96,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/-/.}.${DEFAULT_KUBERNETES_CLUSTER_DOMAIN},${prefix/-/.}.${ONEX_DOMAIN}" -ca=ca.pem -ca-key=ca-key.pem \
+    | ${CFSSL_BIN} gencert -hostname="${CERT_HOSTNAME},${prefix/-/.}.${DEFAULT_KUBERNETES_CLUSTER_DOMAIN},${prefix/-/.}.${PROJ_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