From b9752204a5467c3438af83670e402ec483141771 Mon Sep 17 00:00:00 2001
From: TommyLike <tommylikehu@gmail.com>
Date: Wed, 26 Apr 2023 22:02:23 +0800
Subject: [PATCH] Update document and deploy yaml

---
 Makefile                  |   5 +-
 README.md                 |  20 +++++++
 deploy/config.yaml        |  59 ++++++++++++--------
 deploy/deployment.yaml    | 114 ++++++++++++++++++++++++++++----------
 deploy/kustomization.yaml |   2 +-
 deploy/namespace.yaml     |   2 +-
 deploy/service.yaml       |  20 ++++++-
 7 files changed, 163 insertions(+), 59 deletions(-)

diff --git a/Makefile b/Makefile
index 38309e6..b3ce382 100644
--- a/Makefile
+++ b/Makefile
@@ -23,4 +23,7 @@ control-server-image:
 	docker build -t tommylike/signatrust-control-server:$(GIT_COMMIT) --build-arg BINARY=control-server -f Dockerfile .
 
 control-admin-image:
-	docker build -t tommylike/signatrust-control-admin:$(GIT_COMMIT) --build-arg BINARY=control-admin -f Dockerfile .
\ No newline at end of file
+	docker build -t tommylike/signatrust-control-admin:$(GIT_COMMIT) --build-arg BINARY=control-admin -f Dockerfile .
+
+deploy-local:
+	kustomize build ./deploy | kubectl apply -f -
\ No newline at end of file
diff --git a/README.md b/README.md
index 66adbf4..ca89cc0 100644
--- a/README.md
+++ b/README.md
@@ -138,4 +138,24 @@ RUST_BACKTRACE=full RUST_LOG=info ./target/debug/client --config <client-config-
 Signatrust supports online openAPI documentation, once control server starts, navigate to `localhost:8080/swagger-ui/` and check the document. note you need to add correct `Authorization` 
 header to try the APIs.
 
+## Local cluster
+In order to build and run the project in a local cluster:
+1. You may need to install [kind](https://kind.sigs.k8s.io/docs/user/quick-start/) and [kustomize](https://kustomize.io/) first.
+2. Use our commands to build and push the images:
+```shell
+make client-image/make data-server-image/make control-server-image/make control-admin-image
+```
+3. We have prepared the kustomize yaml files in deploy folder, when your cluster and kube-config gets ready, simply run:
+```shell
+make deploy-local
+```
+and you will have these pods running:
+```shell
+signatrust-client-6cfddccc7-frl5r          ●  1/1          0 Running      0    0       0     n/a       0     n/a 10.10.1.120   10.0.0.56    14m
+signatrust-control-admin-665fccc4b-mhknb   ●  1/1          0 Running      0    3     n/a     n/a     n/a     n/a 10.10.1.31    10.0.0.134   10m
+signatrust-control-server-967f6d84f-lrbl9  ●  1/1          0 Running      2   13       0     n/a       0     n/a 10.10.0.28    10.0.0.175   17m
+signatrust-database-6cfdb54c58-5c2lr       ●  1/1          0 Running      3  491       0     n/a      12     n/a 10.10.0.229   10.0.0.237   6h37m
+signatrust-redis-9bcc87b46-88jbp           ●  1/1          0 Running      1   11       0     n/a       0     n/a 10.10.0.29    10.0.0.175   15m
+signatrust-server-6995c84749-zj2df         ●  1/1          0 Running      1    1       0     n/a       0     n/a 10.10.0.30    10.0.0.175   4h2m
+```
 # Contribute
diff --git a/deploy/config.yaml b/deploy/config.yaml
index 61d4f71..a5c9b2e 100644
--- a/deploy/config.yaml
+++ b/deploy/config.yaml
@@ -3,37 +3,48 @@ kind: ConfigMap
 metadata:
   name: signatrust-config
 data:
-  server.toml: |
-    name = "application"
-    tls_cert = ""
-    tls_key = ""
-    ca_root = ""
-    [data-server]
-    server_ip = "0.0.0.0"
-    server_port = "8080"
-    [kms-provider]
-    type = "huaweicloud"
-    kms_id = "65ccb4d8-cc45-4139-b380-2fcff184ac4f"
-    endpoint = "cn-north-4.myhuaweicloud.com"
-    project_name = "cn-north-4"
-    project_id = "25f40abeecb84d3e90731de258ca71ec"
-    username = "freesky-edward"
-    password = ""
-    domain="freesky-edward"
-    [database]
-    connection_url = "mysql://test:test@signatrust-database.signatrust.svc.cluster.local:3306/signatrust"
-    max_connection = 10
-    [encryption-engine]
-    keep_in_days = 180
-    algorithm = "aes256gsm"
   client.toml: |
     working_dir = "/app/data/"
     worker_threads = 8
     buffer_size = 20480
+    # consider the memory consumption if number bumped since all binaries will be stored in memory
+    max_concurrency = 100
     [server]
     domain_name = "signatrust.test.osinfra.cn"
     tls_cert = ""
     tls_key = ""
     type = "dns"
-    server_name = "signatrust-server-headless.signatrust.svc.cluster.local"
+    server_name = "signatrust-server-headless.signatrust-local-development.svc.cluster.local"
+    server_port = "8088"
+
+  server.toml: |
+    name = "application"
+    tls_cert = ""
+    tls_key = ""
+    ca_root = ""
+    [data-server]
+    server_ip = "0.0.0.0"
+    server_port = "8088"
+    [control-server]
+    server_ip = "0.0.0.0"
     server_port = "8080"
+    cookie_key = "2B5AEC57F7CC4FF8B4120AA7E4527C7B597CAF43183E453A9B981991E6FACB76"
+    redis_connection = "redis://:signatrust-redis@signatrust-redis.signatrust-local-development.svc.cluster.local:6379"
+    limits_per_minute = 100
+    [oidc]
+    client_id = ""
+    client_secret = ""
+    auth_url = "https://omapi.test.osinfra.cn/oneid/oidc/authorize"
+    token_url = "https://omapi.test.osinfra.cn/oneid/oidc/token"
+    userinfo_url = "https://omapi.test.osinfra.cn/oneid/oidc/user"
+    redirect_url = "https://127.0.0.1:8080/api/v1/users/callback"
+    [sign-backend]
+    type = "memory"
+    [memory.kms-provider]
+    type = "dummy"    
+    [memory.encryption-engine]
+    keep_in_days = 180
+    algorithm = "aes256gsm"
+    [database]
+    connection_url = "mysql://test:test@signatrust-database.signatrust-local-development.svc.cluster.local:3306/signatrust"
+    max_connection = 10
\ No newline at end of file
diff --git a/deploy/deployment.yaml b/deploy/deployment.yaml
index e90925e..3185b07 100644
--- a/deploy/deployment.yaml
+++ b/deploy/deployment.yaml
@@ -16,26 +16,59 @@ spec:
       initContainers:
         - name: init-mysql
           image: busybox:1.28
-          command: [ "sh", "-c", "until nslookup signatrust-database.signatrust.svc.cluster.local; do echo waiting for mysql service ; sleep 2; done;" ]
+          command: [ "sh", "-c", "until nslookup signatrust-database.signatrust-local-development.svc.cluster.local; do echo waiting for mysql service ; sleep 2; done;" ]
       containers:
-        - image: tommylike/signatrust-control-server:cc73e716d8a680301131788a3b8c4f6ef98b2e74
+        - image: tommylike/signatrust-control-server:f1e04f2fd37a92b04dfc9a4fd78cba1956654970
           imagePullPolicy: Always
           name: signatrust-server
           command: ["/app/control-server"]
           resources:
             requests:
-              cpu: 8000m
-              memory: 8000Mi
-            limits:
-              cpu: 8000m
-              memory: 8000Mi
+              cpu: 4000m
+              memory: 4000Mi
           ports:
-            - containerPort: 8088
+            - containerPort: 8080
               name: http
               protocol: TCP
           env:
             - name: RUST_LOG
-              value: info
+              value: debug
+          volumeMounts:
+            - mountPath: /app/config/server.toml
+              name: config-volume
+              subPath: server.toml
+      volumes:
+        - name: config-volume
+          configMap:
+            name: signatrust-config
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: signatrust-control-admin
+  namespace: signatrust
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      component: signatrust-control-admin
+  template:
+    metadata:
+      labels:
+        component: signatrust-control-admin
+    spec:
+      initContainers:
+        - name: init-mysql
+          image: busybox:1.28
+          command: [ "sh", "-c", "until nslookup signatrust-database.signatrust-local-development.svc.cluster.local; do echo waiting for mysql service ; sleep 2; done;" ]
+      containers:
+        - image: tommylike/signatrust-control-admin:f1e04f2fd37a92b04dfc9a4fd78cba1956654970
+          imagePullPolicy: Always
+          name: signatrust-control-admin
+          command: ["/bin/sleep", "10000"]
+          env:
+            - name: RUST_LOG
+              value: debug
           volumeMounts:
             - mountPath: /app/config/server.toml
               name: config-volume
@@ -50,7 +83,7 @@ kind: Deployment
 metadata:
   name: signatrust-server
 spec:
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       component: signatrust-server
@@ -62,39 +95,37 @@ spec:
       initContainers:
         - name: init-mysql
           image: busybox:1.28
-          command: [ "sh", "-c", "until nslookup signatrust-database.signatrust.svc.cluster.local; do echo waiting for mysql service ; sleep 2; done;" ]
+          command: [ "sh", "-c", "until nslookup signatrust-database.signatrust-local-development.svc.cluster.local; do echo waiting for mysql service ; sleep 2; done;" ]
         - name: prepare-table
           image: tommylike/rust-sqlx
           env:
             - name: DATABASE_URL
-              value: mysql://test:test@signatrust-database.signatrust.svc.cluster.local/signatrust
+              value: mysql://test:test@signatrust-database.signatrust-local-development.svc.cluster.local:3306/signatrust
           command:
             - /bin/sh
             - -c
             - |
-              git clone https://github.com/TommyLike/signatrust
+              # TODO: Use commit it instead of latest master
+              git clone https://gitee.com/openeuler/signatrust
               cd signatrust
               sqlx database create
               sqlx migrate run
       containers:
-        - image: tommylike/signatrust-data-server:a32f381b1fd47463d94e0c6468e8e28213ba05f5
+        - image: tommylike/signatrust-data-server:f1e04f2fd37a92b04dfc9a4fd78cba1956654970
           imagePullPolicy: Always
           name: signatrust-server
           command: ["/app/data-server"]
           resources:
             requests:
-              cpu: 8000m
-              memory: 8000Mi
-            limits:
-              cpu: 8000m
-              memory: 8000Mi
+              cpu: 4000m
+              memory: 4000Mi
           ports:
-            - containerPort: 8080
+            - containerPort: 8088
               name: http
               protocol: TCP
           env:
             - name: RUST_LOG
-              value: info
+              value: debug
           volumeMounts:
             - mountPath: /app/config/server.toml
               name: config-volume
@@ -176,7 +207,7 @@ spec:
         component: signatrust-client
     spec:
       containers:
-        - image: tommylike/signatrust-client:a32f381b1fd47463d94e0c6468e8e28213ba05f5
+        - image: tommylike/signatrust-client:f1e04f2fd37a92b04dfc9a4fd78cba1956654970
           imagePullPolicy: Always
           name: signatrust-client
           env:
@@ -184,16 +215,13 @@ spec:
               value: debug
           resources:
             requests:
-              cpu: 8000m
-              memory: 8000Mi
-            limits:
-              cpu: 8000m
-              memory: 8000Mi
+              cpu: 2000m
+              memory: 2000Mi
           command:
             - /bin/sh
             - -c
             - |
-              sleep 10000000
+              sleep 100000000
           volumeMounts:
             - mountPath: /app/config/client.toml
               name: config-volume
@@ -206,4 +234,32 @@ spec:
             name: signatrust-config
         - name: client-volume
           persistentVolumeClaim:
-            claimName: client-volume
\ No newline at end of file
+            claimName: client-volume
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: signatrust-redis
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      component: signatrust-redis
+  template:
+    metadata:
+      labels:
+        component: signatrust-redis
+    spec:
+      containers:
+        - image: redis:7.2-rc-alpine
+          imagePullPolicy: Always
+          name: signatrust-redis
+          resources:
+            requests:
+              cpu: 2000m
+              memory: 2000Mi
+          command:
+            - /bin/sh
+            - -c
+            - |
+              /usr/local/bin/redis-server --requirepass signatrust-redis
\ No newline at end of file
diff --git a/deploy/kustomization.yaml b/deploy/kustomization.yaml
index 963bd83..25b679d 100644
--- a/deploy/kustomization.yaml
+++ b/deploy/kustomization.yaml
@@ -8,6 +8,6 @@ commonLabels:
   owner: tommylike
 commonAnnotations:
   email: tommylikehu@gmail.com
-namespace: signatrust
+namespace: signatrust-local-development
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
diff --git a/deploy/namespace.yaml b/deploy/namespace.yaml
index 27098f2..7b1883d 100644
--- a/deploy/namespace.yaml
+++ b/deploy/namespace.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: signatrust
+  name: signatrust-local-development
diff --git a/deploy/service.yaml b/deploy/service.yaml
index 7e587eb..b228d15 100644
--- a/deploy/service.yaml
+++ b/deploy/service.yaml
@@ -9,7 +9,7 @@ spec:
       protocol: TCP
       targetPort: 8080
   selector:
-    component: signatrust-server
+    component: signatrust-control-server
   type: ClusterIP
 ---
 apiVersion: v1
@@ -19,9 +19,9 @@ metadata:
 spec:
   ports:
     - name: signatrust
-      port: 8080
+      port: 8088
       protocol: TCP
-      targetPort: 8080
+      targetPort: 8088
   clusterIP: None
   selector:
     component: signatrust-server
@@ -40,3 +40,17 @@ spec:
   selector:
     component: signatrust-database
   type: ClusterIP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: signatrust-redis
+spec:
+  ports:
+    - name: redis
+      port: 6379
+      protocol: TCP
+      targetPort: 6379
+  selector:
+    component: signatrust-redis
+  type: ClusterIP
-- 
Gitee