[PPML] convert dkeryserver to headless service (intel-analytics#6612)

* [PPML] convert dkeryserver to headless service * remove dkeyserver ip variable * refine
ForJadeForest · Nov 15, 2022 · 7bba133 · 7bba133
1 parent 34ee574
commit 7bba133
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 29 deletions.
diff --git a/ppml/services/ehsm/kubernetes/README.md b/ppml/services/ehsm/kubernetes/README.md
@@ -45,9 +45,7 @@ ping 1.2.3.227
 # information below means 1.2.3.227 is expected to be an appropriate IP addess for dkeyserver. 
 # otherwise, you are supposed to test another one.
 PING 1.2.3.227 (1.2.3.227) 56(84) bytes of data.
-From 1.2.3.4 icmp_seq=1 Destination Host Unreachable
-From 1.2.3.4 icmp_seq=2 Destination Host Unreachable
-From 1.2.3.4 icmp_seq=3 Destination Host Unreachable
+From 1.2.3.4 icmp_seq=1 Destination Host **Unreachable**
 ........
 
 # try another IP address (e.g 1.2.3.228) for KMS with the same approach.
@@ -65,7 +63,6 @@ nfsServerIP: your_nfs_server_ip                   --->   <the_IP_address_of_your
 nfsPath: a_nfs_shared_folder_path_on_the_server   --->   <an_existing_shared_folder_path_on_NFS_server>
 ......
 pccsIP: your_pccs_ip                              --->   <the_ip_address_in_your_subnetwork_you_have_assigned_to_pccs_in_step1>
-dkeyserverIP: your_dkeyserver_ip_to_use_as        --->   <an_unused_ip_address_in_your_subnetwork_to_assign_to_dkeyserver>
 kmsIP: your_kms_ip_to_use_as                      --->   <an_unused_ip_address_in_your_subnetwork_to_assign_to_kms>
 ```
 
@@ -88,10 +85,10 @@ pod/couchdb-0                                          1/1     Running   0
 pod/dkeycache-57db49f98-z28t4                          1/1     Running   0          6h52m
 pod/dkeyserver-0                                       1/1     Running   0          6h52m
 
-NAME                                   TYPE           CLUSTER-IP      EXTERNAL-IP     PORT(S)          AGE
-service/bigdl-ehsm-kms-service         LoadBalancer   1.10.9.98       1.2.3.228       9000:30000/TCP   6h52m
-service/couchdb                        ClusterIP      1.10.8.236      <none>          5984/TCP         6h52m
-service/dkeyserver                     ClusterIP      1.10.1.132      1.2.3.227       8888/TCP         6h52m
+NAME                             TYPE           CLUSTER-IP       EXTERNAL-IP     PORT(S)          AGE
+service/bigdl-ehsm-kms-service   LoadBalancer   10.103.152.224   172.168.0.238   9000:30011/TCP   56m
+service/couchdb                  ClusterIP      10.103.152.212   <none>          5984/TCP         56m
+service/dkeyserver               ClusterIP      10.103.152.227   <none>          8888/TCP         56m
 
 NAME                                              READY   UP-TO-DATE   AVAILABLE   AGE
 deployment.apps/bigdl-ehsm-kms-deployment         1/1     1            1           6h52m
@@ -105,6 +102,7 @@ NAME                          READY   AGE
 statefulset.apps/couchdb      1/1     6h52m
 statefulset.apps/dkeyserver   1/1     6h52m
 
+
 # Check the status of KMS
 curl -v -k -G "https://<external_kms_ip>:9000/ehsm/?Action=GetVersion"
 

diff --git a/ppml/services/ehsm/kubernetes/bigdl-ehsm-kms.yaml b/ppml/services/ehsm/kubernetes/bigdl-ehsm-kms.yaml
@@ -9,17 +9,6 @@ data:
     couch_root_username: $couchdbRootUsername
     couch_root_password: $couchdbRootPassword
 ---
-# bigdl-ehsm-kms ConfigMap
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: dkeyserver-configmap
-  namespace: bigdl-ehsm-kms
-data:
-  pccs_url: "https://$pccsIP:18081"
-  dkeyserver_service_url: "https://$dkeyserverIP:8888"
-
----
 # bigdl-ehsm-kms dkeyserver
 apiVersion: v1
 kind: Service
@@ -36,8 +25,6 @@ spec:
       targetPort: 8888
   selector:
     app: dkeyserver
-  externalIPs:
-  - $dkeyserverIP
 ---
 apiVersion: apps/v1
 kind: StatefulSet
@@ -81,10 +68,7 @@ spec:
           name: dev-aesmd
         env:
         - name: PCCS_URL
-          valueFrom:
-            configMapKeyRef:
-              name: dkeyserver-configmap
-              key: pccs_url
+          value: "https://$pccsIP:18081"
         ports:
         - containerPort: 8888
           name: dkeyserver-port
@@ -99,10 +83,9 @@ data:
   database_url: "couchdb-0.couchdb"
   database_port: "5984"
   database_name: "ehsm_kms_db"
-  dkeyserver_ip: "$dkeyserverIP"
+  dkeyserver_ip: "dkeyserver-0.dkeyserver"
   dkeyserver_port: "8888"
   pccs_url: "https://$pccsIP:18081"
-
 ---
 # bigdl-ehsm-kms PersistentVolume for CouchDB
 apiVersion: v1

diff --git a/ppml/services/ehsm/kubernetes/install-bigdl-ehsm-kms.sh b/ppml/services/ehsm/kubernetes/install-bigdl-ehsm-kms.sh
@@ -9,9 +9,8 @@ export couchdbImageName=couchdb:3.2
 export dkeycacheImageName=intelccc/ehsm_dkeycache:0.3.0
 export ehsmKmsImageName=intelccc/ehsm_kms:0.3.0
 export pccsIP=your_pccs_IP
-export dkeyserverIP=your_dkeyserver_ip_to_use_as
 export kmsIP=your_kms_ip_to_use_as
 
 # Create k8s namespace and apply BigDL-eHSM-KMS
 kubectl create namespace bigdl-ehsm-kms
-envsubst < bigdl-ehsm-kms.yaml | kubectl apply -f -
+envsubst < bigdl-ehsm-kms.yaml | kubectl apply -f -