Skip to content

Commit 1f5bf77

Browse files
authored
Merge pull request #25 from CentaurusInfra/release-test-plan
test plan doc draft
2 parents f278fa6 + abed673 commit 1f5bf77

File tree

9 files changed

+843
-13
lines changed

9 files changed

+843
-13
lines changed

build/crds/edgecluster/edgecluster_v1.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,7 @@ spec:
2323
JSONPath: .state.lastheartbeat
2424
- name: HealthStatus
2525
type: string
26-
description: Whether the cluster is healthy and accessible
2726
JSONPath: .state.healthstatus
28-
- name: Nodes
29-
type: string
30-
description: nodes
31-
JSONPath: .state.nodes
32-
- name: EdgeNodes
33-
type: string
34-
JSONPath: .state.edgenodes
3527
- name: SubEdgeClusters
3628
type: string
3729
JSONPath: .state.subedgeclusterstates

build/tools/certgen.sh

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,20 @@ readonly certPath=${CERT_PATH:-/etc/kubeedge/certs}
88
readonly subject=${SUBJECT:-/C=CN/ST=Zhejiang/L=Hangzhou/O=KubeEdge/CN=kubeedge.io}
99

1010
genCA() {
11+
IPs=$@
1112
openssl genrsa -des3 -out ${caPath}/rootCA.key -passout pass:kubeedge.io 4096
12-
openssl req -x509 -new -nodes -key ${caPath}/rootCA.key -sha256 -days 3650 \
13-
-subj ${subject} -passin pass:kubeedge.io -out ${caPath}/rootCA.crt
13+
14+
if [ -z "$IPs" ] ;then
15+
openssl req -x509 -new -nodes -key ${caPath}/rootCA.key -sha256 -days 3650 \
16+
-subj ${subject} -passin pass:kubeedge.io -out ${caPath}/rootCA.crt
17+
else
18+
SAN="IP.1:127.0.0.1"
19+
for ip in ${IPs[*]}; do
20+
SAN="${SAN},IP:${ip}"
21+
done
22+
openssl req -x509 -new -nodes -key ${caPath}/rootCA.key -sha256 -days 3650 \
23+
-subj ${subject} -passin pass:kubeedge.io -out ${caPath}/rootCA.crt -addext "subjectAltName=${SAN}"
24+
fi
1425
}
1526

1627
ensureCA() {
@@ -58,7 +69,7 @@ genCertAndKey() {
5869
ensureCA
5970
local name=$1
6071
genCsr $name
61-
genCert $name
72+
genCert $name ${@:2}
6273
}
6374

6475
stream() {

0 commit comments

Comments
 (0)