Merge branch 'main' of https://git.sxidc.com/kingdee_large_screen/pc_kingdee_large_screen

.drone.yml

@@ -22,27 +22,17 @@ steps:
       password:
         from_secret: harbor_password
 
-  - name: ssh-commands
+  # 使用ssh访问主机制作镜像并运行
+  - name: 集群部署
     pull: if-not-exists
-    image: appleboy/drone-ssh:1.5.7
+    image: bh90210/dron8s:latest
     settings:
-      host: test_host
-      username: test_user
-      password:
-        # 从drone仓库配置中秘密空间读取密码
-        from_secret: test_pwd
-      port: 22
-      script:
-        - echo =======暂停容器=======
-        - docker stop `docker ps -a | grep  kingdee_big_screen | awk '{print $1}' `
-        - echo =======暂停旧容器和镜像=======
-        - docker rm -f `docker ps -a | grep kingdee_big_screen | awk '{print $1}' `
-        - docker rmi `docker images | grep harbor.sxidc.com/fs/kingdee_big_screen | awk '{print $3}' `
-        - echo =======开始部署应用=======
-        - docker run -d -p 10003:80  --name kingdee_big_screen harbor.sxidc.com/fs/kingdee_big_screen
-        - echo =======清理构建文件,建议保留=======
-        - echo =======部署成功=======
-
+      repo_namespace: ywzx
+      repo_name: ${DRONE_REPO_NAME//_/-}
+      yaml: ./deployment-app.yaml
+      image_addr: harbor.sxidc.com/fs/${DRONE_REPO_NAME//_/-}:${DRONE_COMMIT_BRANCH/master/latest}
+      kubeconfig:
+        from_secret: test_kubeconfig
       
       
 trigger:

deployment-app.yaml

@@ -0,0 +1,61 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{.repo_namespace}}
+
+---
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{.repo_name}}
+  namespace: {{.repo_namespace}}
+spec:
+  selector:
+    matchLabels:
+      app: {{.repo_name}}
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: {{.repo_name}}
+      annotations:
+        dapr.io/enabled: "true"
+        dapr.io/app-id: {{.repo_name}}
+        dapr.io/app-port: "80"  
+    spec:
+      imagePullSecrets:
+        - name: harbor-registry-secret
+      containers:
+        - name: {{.repo_name}}
+          image: {{.image_addr}}
+          ports:
+            - containerPort: 80
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{.repo_name}}-svc
+  namespace: {{.repo_namespace}}
+spec:
+  selector:
+    app: {{.repo_name}}
+  type: NodePort
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
+      nodePort: 30016
+
+---
+# 私有仓库
+apiVersion: v1
+kind: Secret
+metadata:
+  name: harbor-registry-secret
+  namespace: {{.repo_namespace}}
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: eyJhdXRocyI6eyJoYXJib3Iuc3hpZGMuY29tIjp7InVzZXJuYW1lIjoiZHJvbmUiLCJwYXNzd29yZCI6IkRyb25lMTIzNDU2IiwiYXV0aCI6IlpISnZibVU2UkhKdmJtVXhNak0wTlRZPSJ9fX0=

index.html

@@ -0,0 +1 @@
+1