From 53d21efba6a4515aee9f50b9080ae2b75f8cfdc0 Mon Sep 17 00:00:00 2001
From: dengbiao <dengbiao@fnuoos.com>
Date: Tue, 10 Dec 2024 16:12:30 +0800
Subject: [PATCH] update

---
 Dockerfile                      | 11 +++++------
 k8s/zyos-go-mq-consume-prd.yaml | 23 +++++++++++------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3ff4092..8468374 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,23 +12,22 @@ WORKDIR /go/release
 # 把全部文件添加到/go/release目录
 ADD . .
 
-# 编译：把main.go编译成可执行的二进制文件，命名为zyos
-RUN GOOS=linux CGO_ENABLED=0 GOARCH=amd64 go build -tags netgo -ldflags="-s -w" -installsuffix cgo -o zyos main.go
+# 编译：把main.go编译成可执行的二进制文件，命名为egg
+RUN GOOS=linux CGO_ENABLED=0 GOARCH=amd64 go build -tags netgo -ldflags="-s -w" -installsuffix cgo -o egg main.go
 
 FROM ubuntu:xenial as prod
 LABEL maintainer="dengbiao"
 ENV TZ="Asia/Shanghai"
 
-COPY static/html static/html
 # 时区纠正
 RUN rm -f /etc/localtime \
     && ln -sv /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
     && echo "Asia/Shanghai" > /etc/timezone
 # 在build阶段复制可执行的go二进制文件app
-COPY --from=build /go/release/zyos ./zyos
+COPY --from=build /go/release/egg ./egg
 
-COPY --from=build /go/release/etc/cfg.yml /var/zyos/cfg.yml
+COPY --from=build /go/release/etc/cfg.yml /var/egg/cfg.yml
 
 # 启动服务
-CMD ["./zyos","-c","/var/zyos/cfg.yml"]
+CMD ["./egg","-c","/var/egg/cfg.yml"]
 
diff --git a/k8s/zyos-go-mq-consume-prd.yaml b/k8s/zyos-go-mq-consume-prd.yaml
index 0efb2fb..d630b94 100644
--- a/k8s/zyos-go-mq-consume-prd.yaml
+++ b/k8s/zyos-go-mq-consume-prd.yaml
@@ -2,25 +2,24 @@ kind: Deployment
 apiVersion: apps/v1
 # 元数据
 metadata:
-  name: zyos-go-mq-consume-one-circles-v2
-  namespace: zhios
+  name: egg-go-mq-consume
+  namespace: egg
   labels:
-    app: zyos-go-mq-consume-one-circles-v2
+    app: egg-go-mq-consume
   annotations:
     kubesphere.io/creator: dengbiao
-    kubesphere.io/description: 一个圈圈v2
 # deployment主要部分
 spec:
   replicas: 1
   selector:
     matchLabels:
       # 名称与上面的labels对应
-      app: zyos-go-mq-consume-one-circles-v2
+      app: egg-go-mq-consume
   template:
     metadata:
       labels:
         # 名称与上面的matchLabels对应
-        app: zyos-go-mq-consume-one-circles-v2
+        app: egg-go-mq-consume
     spec:
       # 声明挂载卷（将外部已存在的pvc、config等挂载进来）
       volumes:
@@ -30,25 +29,25 @@ spec:
             path: /etc/localtime
             type: ''
         # 将前面创建的configMap也挂载进来
-        - name: zyos-go-mq-consume-cfg
+        - name: egg-go-mq-consume-cfg
           configMap:
             # 这里的名字就是前面创建的configMap的名字
-            name: zyos-go-mq-consume-cfg
+            name: egg-go-mq-consume-cfg
             defaultMode: 420
       containers:
         # 主容器
-        - name: zyos-go-mq-consume-one-circles-v2-container
+        - name: egg-go-mq-consume
           # 镜像地址（提前打包好并推送的镜像仓库）
-          image: 'registry.cn-shenzhen.aliyuncs.com/fnuoos-prd/zyos-go-mq-consume-one-circles-v2:20240727-01'
+          image: 'registry.cn-shenzhen.aliyuncs.com/fnuoos-prd/egg-go-mq-consume:0.0.1'
           # 将前面volume声明的需要用到的pvc、config挂载上来
           volumeMounts:
             - name: host-time
               readOnly: true
               mountPath: /etc/localtime
-            - name: zyos-go-mq-consume-cfg # 该名字对应前面volumes声明的名字
+            - name: egg-go-mq-consume-cfg # 该名字对应前面volumes声明的名字
               readOnly: true
               # 挂载到容器的哪个路径
-              mountPath: /var/zyos
+              mountPath: /var/egg
           imagePullPolicy: Always
       restartPolicy: Always
       terminationGracePeriodSeconds: 30