deploy config

Author: dzdx

Makefile

@@ -2,12 +2,7 @@ proto:
 	protoc-3.5.1 --proto_path=./server/common/model/src/main/resources/proto --java_out=server/common/model/src/main/java  server/common/model/src/main/resources/proto/*.proto
 
 image_build:
-	docker build . -f docker/Dockerfile -t dzdx/sofa-registry-test:latest
+	docker build . -f docker/Dockerfile -t  sofastack/sofaregistry:6.1.4
 
 image_push:
-	docker push dzdx/sofa-registry-test:latest
-
-app_run:
-	docker run -e REGISTRY_APP_NAME=integration -d  --net=host --name=sofa-registry --rm  -v /Users/dzdx/Desktop/registry-all/conf/application.properties:/registry-distribution/registry-all/conf/application.properties   dzdx/sofa-registry-test:latest
-mysql_run:
-	docker run --rm -e MARIADB_ROOT_PASSWORD=root -p 3306:3306 --name=mysql -v /Users/dzdx/Desktop/registry-all:/registry-distribution/registry-all -d  mariadb:10.7
+	docker push  sofastack/sofaregistry:6.1.4

create_table.sql

@@ -33,8 +33,8 @@ CREATE TABLE IF NOT EXISTS `provide_data`
 (
     `id`           bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
     `data_center`  varchar(128)  NOT NULL COMMENT '集群名',
-    `data_key`     varchar(512) NOT NULL COMMENT 'data key',
-    `data_value`   mediumtext             DEFAULT NULL COMMENT 'data value',
+    `data_key`     varchar(512) NOT NULL COMMENT 'data.yaml key',
+    `data_value`   mediumtext             DEFAULT NULL COMMENT 'data.yaml value',
     `gmt_create`   timestamp     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `gmt_modified` timestamp     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
     `data_version` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT '版本号',

docker/Dockerfile

@@ -8,7 +8,8 @@ RUN apt-get -y install openjdk-8-jdk supervisor less net-tools vim curl iputils-
 
 COPY server/distribution/all/target/registry-all.tgz /registry-distribution/registry-all.tgz
 RUN tar -xzf /registry-distribution/registry-all.tgz -C /registry-distribution \
-    && rm -rf /registry-distribution/registry-all.tgz \
-    && cp /registry-distribution/registry-all/conf/supervisord/registry.supervisord.conf /etc/supervisor/conf.d/
+    && rm -rf /registry-distribution/registry-all.tgz
 
-CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/supervisord.conf"]
+RUN useradd -s /bin/bash admin && usermod -a -G admin admin && mkdir -p /home/admin/logs && chown -R admin:admin  /home/admin/logs && chmod -R 755 /home/admin/logs
+USER admin
+CMD ["/registry-distribution/registry-all/bin/registry-run.sh"]

docker/docker-compose-integration.yml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sofa-registry-config
+data:
+  application.properties: |
+    nodes.localDataCenter=DefaultDataCenter
+    nodes.localRegion=DEFAULT_ZONE
+    jdbc.url=jdbc:mysql://mysql.default.svc.cluster.local:3306/registrymetadb
+    jdbc.username=root
+    jdbc.password=root

docker/kube/mysql.yaml

@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: sofa-registry-secret
+type: Opaque
+stringData:
+  JDBC_PASSWORD: root

docker/kube/sofa-registry/base-integration/configmap.yaml

@@ -5,54 +5,53 @@ metadata:
   labels:
     app: sofa-registry
     type: integration
+    cluster: default-integration
 spec:
-  replicas: 3
+  replicas: 2
   selector:
     matchLabels:
       app: sofa-registry
       type: integration
+      cluster: default-integration
   template:
     metadata:
       labels:
         app: sofa-registry
         type: integration
+        cluster: default-integration
     spec:
       containers:
         - name: sofa-registry
-          image: dzdx/sofa-registry-test:latest
+          image: sofastack/sofaregistry:6.1.4
           env:
+            - name: REGISTRY_APP_NAME
+              value: integration
             - name: JDBC_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: sofa-registry-integration-secret
+                  name: sofa-registry-secret
                   key: JDBC_PASSWORD
-            - name: REGISTRY_APP_NAME
-              value: integration
           volumeMounts:
             - name: config-volume
               mountPath: /registry-distribution/registry-all/conf
+            - name: log-volume
+              mountPath: /home/admin/logs
+          readinessProbe:
+            httpGet:
+              path: /health/check
+              port: 9603
+            initialDelaySeconds: 10
+            periodSeconds: 10
+          resources:
+            requests:
+              memory: 8Gi
+              cpu: 4
+            limits:
+              memory: 8Gi
+              cpu: 4
       volumes:
         - name: config-volume
           configMap:
-            name: sofa-registry-integration-config
----
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: sofa-registry-integration-config
-data:
-  application.properties: |
-    nodes.localDataCenter=DefaultDataCenter
-    nodes.localRegion=DEFAULT_ZONE
-    jdbc.url=jdbc:mysql://mysql.default.svc.cluster.local:3306/registrymetadb
-    jdbc.username=root
-    jdbc.password=root
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: sofa-registry-integration-secret
-type: Opaque
-stringData:
-  JDBC_PASSWORD: root
+            name: sofa-registry-config
+        - name: log-volume
+          emptyDir: { }

docker/kube/sofa-registry/base-integration/db-secret.yaml

@@ -0,0 +1,4 @@
+resources:
+  - configmap.yaml
+  - db-secret.yaml
+  - integration.yaml

docker/kube/integration.yaml …gistry/base-integration/integration.yamldocker/kube/integration.yaml renamed to docker/kube/sofa-registry/base-integration/integration.yaml docker/kube/integration.yaml renamed to docker/kube/sofa-registry/base-integration/integration.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sofa-registry-config
+data:
+  application.properties: |
+    nodes.localDataCenter=DefaultDataCenter
+    nodes.localRegion=DEFAULT_ZONE
+    jdbc.url=jdbc:mysql://mysql.default.svc.cluster.local:3306/registrymetadb
+    jdbc.username=root
+    jdbc.password=root