From 57f4a869ee64a199749b18128839a5ef03dd06d7 Mon Sep 17 00:00:00 2001 From: dxin Date: Sun, 23 Nov 2025 09:19:02 +0800 Subject: [PATCH] =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile/web/admin_web_Dockerfile | 8 --- k8s_yaml/s1/s1-flymoon-admin-web.yaml | 79 +++++++++++++++++++++++++++ k8s_yaml/s1/s1-flymoon-admin.yaml | 10 ++-- k8s_yaml/s1/s1-flymoon-agent.yaml | 12 ++-- k8s_yaml/s1/s1-flymoon-payment.yaml | 12 ++-- 5 files changed, 96 insertions(+), 25 deletions(-) create mode 100644 k8s_yaml/s1/s1-flymoon-admin-web.yaml diff --git a/Dockerfile/web/admin_web_Dockerfile b/Dockerfile/web/admin_web_Dockerfile index 0222828..8e2019c 100644 --- a/Dockerfile/web/admin_web_Dockerfile +++ b/Dockerfile/web/admin_web_Dockerfile @@ -39,11 +39,3 @@ EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] - - - - - -# docker build \ -# --build-arg BUILD_ENV=${BUILD_ENV} \ -# -t registry.xxx.com/your_project/web:${BUILD_NUMBER} . \ No newline at end of file diff --git a/k8s_yaml/s1/s1-flymoon-admin-web.yaml b/k8s_yaml/s1/s1-flymoon-admin-web.yaml new file mode 100644 index 0000000..7497123 --- /dev/null +++ b/k8s_yaml/s1/s1-flymoon-admin-web.yaml @@ -0,0 +1,79 @@ +# ---------------------------- +# Deployment +# ---------------------------- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: s1-flymoon-admin-web-deployment + namespace: sit + labels: + app: s1-flymoon-admin-web + environment: s1 + project: flymoon +spec: + replicas: 1 + selector: + matchLabels: + app: s1-flymoon-admin-web + environment: s1 + project: flymoon + strategy: + type: RollingUpdate # 滚动更新策略 + rollingUpdate: + maxSurge: 1 # 最大新增副本数(先加) + maxUnavailable: 0 # 最大不可用副本数(不减) + template: + metadata: + labels: + app: s1-flymoon-admin-web + environment: s1 + project: flymoon + spec: + imagePullSecrets: + - name: dxin-image-repository + volumes: + - name: default-conf-volume + configMap: + name: default-conf + containers: + - name: flymoon-admin-web + image: uswccr.ccs.tencentyun.com/lessiesit/flymoon-admin-web:v1_dxin_262a944_202511191634 + imagePullPolicy: Always + ports: + - containerPort: 80 + resources: + requests: + cpu: "200m" # 容器请求分配0.2个CPU核心(这不是实际占用,但调度会以这里进行参考) + memory: "256Mi" # 容器请求分配1Gi内存(这会实际预留) + limits: + cpu: "500m" # 最多可以使用0.5个CPU核心 + memory: "512Mi" # 容器最多可以使用8Gi内存 + volumeMounts: + - name: default-conf-volume + mountPath: /etc/nginx/conf.d/default.conf + subPath: default.conf + +--- +# ---------------------------- +# Service +# 集群内部:http://s1-flymoon-admin-web-svc.sit.svc.cluster.local:8000 +# ---------------------------- +apiVersion: v1 +kind: Service +metadata: + name: s1-flymoon-admin-web-svc + namespace: sit + labels: + app: s1-flymoon-admin-web + environment: s1 + project: flymoon +spec: + type: ClusterIP + selector: + app: s1-flymoon-admin-web + environment: s1 + project: flymoon + ports: + - name: http + port: 80 + targetPort: 80 \ No newline at end of file diff --git a/k8s_yaml/s1/s1-flymoon-admin.yaml b/k8s_yaml/s1/s1-flymoon-admin.yaml index c8b46ae..94d35c9 100644 --- a/k8s_yaml/s1/s1-flymoon-admin.yaml +++ b/k8s_yaml/s1/s1-flymoon-admin.yaml @@ -14,7 +14,7 @@ spec: replicas: 1 selector: matchLabels: - app: s1-flymoon-admin + app: flymoon-admin environment: s1 project: flymoon strategy: @@ -25,7 +25,7 @@ spec: template: metadata: labels: - app: s1-flymoon-admin + app: flymoon-admin environment: s1 project: flymoon spec: @@ -38,7 +38,7 @@ spec: type: DirectoryOrCreate containers: - name: flymoon-admin # 容器名称 - image: uswccr.ccs.tencentyun.com/lessiesit/flymoon-admin:v1_dxin_467169b_202511101605 # 容器镜像 + image: uswccr.ccs.tencentyun.com/lessiesit/flymoon-admin:v7_dxin_c680638_202511201639 # 容器镜像 imagePullPolicy: Always # 镜像拉取策略 拉 env: - name: POD_NAME @@ -97,13 +97,13 @@ metadata: name: s1-flymoon-admin-svc namespace: sit labels: - app: s1-flymoon-admin + app: flymoon-admin environment: s1 project: flymoon spec: type: ClusterIP selector: # 必须匹配 Deployment 的 labels 才能关联 Pod - app: s1-flymoon-admin + app: flymoon-admin environment: s1 project: flymoon ports: diff --git a/k8s_yaml/s1/s1-flymoon-agent.yaml b/k8s_yaml/s1/s1-flymoon-agent.yaml index b0dbe4f..c92466e 100644 --- a/k8s_yaml/s1/s1-flymoon-agent.yaml +++ b/k8s_yaml/s1/s1-flymoon-agent.yaml @@ -7,14 +7,14 @@ metadata: name: s1-flymoon-agent-deployment namespace: sit labels: - app: s1-flymoon-agent + app: flymoon-agent environment: s1 project: flymoon spec: replicas: 1 selector: matchLabels: - app: s1-flymoon-agent + app: flymoon-agent environment: s1 project: flymoon strategy: @@ -25,7 +25,7 @@ spec: template: metadata: labels: - app: s1-flymoon-agent + app: flymoon-agent environment: s1 project: flymoon spec: @@ -38,7 +38,7 @@ spec: type: DirectoryOrCreate containers: - name: flymoon-agent # 容器名称 - image: uswccr.ccs.tencentyun.com/lessiesit/flymoon-agent:v0.0.5 # 容器镜像 + image: uswccr.ccs.tencentyun.com/lessiesit/flymoon-agent:v6_dxin_0eb1f51_202511201731 # 容器镜像 imagePullPolicy: Always # 镜像拉取策略,拉 env: - name: POD_NAME @@ -90,13 +90,13 @@ metadata: name: s1-flymoon-agent-svc namespace: sit labels: - app: s1-flymoon-agent + app: flymoon-agent environment: s1 project: flymoon spec: type: ClusterIP selector: # 必须匹配 Deployment 的 labels 才能关联 Pod - app: s1-flymoon-agent + app: flymoon-agent environment: s1 project: flymoon ports: diff --git a/k8s_yaml/s1/s1-flymoon-payment.yaml b/k8s_yaml/s1/s1-flymoon-payment.yaml index eb35fab..a7013c7 100644 --- a/k8s_yaml/s1/s1-flymoon-payment.yaml +++ b/k8s_yaml/s1/s1-flymoon-payment.yaml @@ -7,14 +7,14 @@ metadata: name: s1-flymoon-payment-deployment namespace: sit labels: - app: s1-flymoon-payment + app: flymoon-payment environment: s1 project: flymoon spec: replicas: 1 selector: matchLabels: - app: s1-flymoon-payment + app: flymoon-payment environment: s1 project: flymoon strategy: @@ -25,7 +25,7 @@ spec: template: metadata: labels: - app: s1-flymoon-payment + app: flymoon-payment environment: s1 project: flymoon spec: @@ -38,7 +38,7 @@ spec: type: DirectoryOrCreate containers: - name: flymoon-payment # 容器名称 - image: uswccr.ccs.tencentyun.com/lessiesit/flymoon-payment:v2_dxin_d408919_202511121501 # 容器镜像 + image: uswccr.ccs.tencentyun.com/lessiesit/flymoon-payment:v5_dxin_8a62dbb_202511141657 # 容器镜像 imagePullPolicy: Always # 镜像拉取策略,总是拉取 env: - name: POD_NAME @@ -98,13 +98,13 @@ metadata: name: s1-flymoon-payment-svc namespace: sit labels: - app: s1-flymoon-payment + app: flymoon-payment environment: s1 project: flymoon spec: type: ClusterIP selector: # 必须匹配 Deployment 的 labels 才能关联 Pod - app: s1-flymoon-payment + app: flymoon-payment environment: s1 project: flymoon ports: