Merge pull request #25 from CentaurusInfra/release-test-plan

test plan doc draft
CentaurusInfra · Aug 17, 2021 · 1f5bf77 · 1f5bf77
2 parents f278fa6 + abed673
commit 1f5bf77
Show file tree

Hide file tree

Showing 9 changed files with 843 additions and 13 deletions.
diff --git a/build/crds/edgecluster/edgecluster_v1.yaml b/build/crds/edgecluster/edgecluster_v1.yaml
@@ -23,15 +23,7 @@ spec:
       JSONPath: .state.lastheartbeat
     - name: HealthStatus
       type: string
-      description: Whether the cluster is healthy and accessible
       JSONPath: .state.healthstatus
-    - name: Nodes
-      type: string
-      description: nodes
-      JSONPath: .state.nodes
-    - name: EdgeNodes
-      type: string
-      JSONPath: .state.edgenodes
     - name: SubEdgeClusters
       type: string
       JSONPath: .state.subedgeclusterstates

diff --git a/build/tools/certgen.sh b/build/tools/certgen.sh
@@ -8,9 +8,20 @@ readonly certPath=${CERT_PATH:-/etc/kubeedge/certs}
 readonly subject=${SUBJECT:-/C=CN/ST=Zhejiang/L=Hangzhou/O=KubeEdge/CN=kubeedge.io}
 
 genCA() {
+    IPs=$@
     openssl genrsa -des3 -out ${caPath}/rootCA.key -passout pass:kubeedge.io 4096
-    openssl req -x509 -new -nodes -key ${caPath}/rootCA.key -sha256 -days 3650 \
-    -subj ${subject} -passin pass:kubeedge.io -out ${caPath}/rootCA.crt
+
+    if  [ -z "$IPs" ] ;then
+        openssl req -x509 -new -nodes -key ${caPath}/rootCA.key -sha256 -days 3650 \
+        -subj ${subject} -passin pass:kubeedge.io -out ${caPath}/rootCA.crt
+    else
+        SAN="IP.1:127.0.0.1"
+        for ip in ${IPs[*]}; do
+            SAN="${SAN},IP:${ip}"
+        done
+        openssl req -x509 -new -nodes -key ${caPath}/rootCA.key -sha256 -days 3650 \
+        -subj ${subject} -passin pass:kubeedge.io -out ${caPath}/rootCA.crt -addext "subjectAltName=${SAN}"
+    fi
 }
 
 ensureCA() {
@@ -58,7 +69,7 @@ genCertAndKey() {
     ensureCA
     local name=$1
     genCsr $name
-    genCert $name
+    genCert $name ${@:2}
 }
 
 stream() {