修改deployment.yml文件格式

.deploy/deployment.yml

@@ -1,3 +1,34 @@
+## k8s默认是访问不了外部服务的，需要代理,以mysql和redis为例，代理myservice名称到192.168.0.100，配置文件中对应的ip修改为myservice
+#apiVersion: v1
+#kind: Endpoints
+#metadata:
+#  name: myservice
+#subsets:
+#  - addresses:
+#      - ip: 192.168.0.100
+#    ports:
+#      - port: 6379
+#        protocol: TCP
+#        name: redis
+#      - port: 3306
+#        protocol: TCP
+#        name: mysql
+#---
+#apiVersion: v1
+#kind: Service
+#metadata:
+#  name: myservice
+#spec:
+#  ports:
+#    - port: 6379
+#      targetPort: 6379
+#      protocol: TCP
+#      name: redis
+#    - port: 3306
+#      targetPort: 3306
+#      protocol: TCP
+#      name: mysql
+#
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -15,7 +46,7 @@ spec:
         app: myk3s-test
     spec:
       containers:
-        - image: registry.cn-chengdu.aliyuncs.com/bamanker/myk3stest
+        - image: ${env.REGISTRY}/${env.IMAGE_NAME}:${steps.datetime.outputs.datetime}
           name: myk3s-test
           imagePullPolicy: Always
           readinessProbe:
@@ -28,7 +59,9 @@ spec:
             - containerPort: 9090
       imagePullSecrets:
         - name: dockerhub-id
+
 ---
+
 apiVersion: v1
 kind: Service
 metadata:

.gitea/workflows/build.yml

@@ -14,7 +14,7 @@ env:
   PATH: /opt/node/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
   REGISTRY: registry.cn-chengdu.aliyuncs.com
   IMAGE_NAME: bamanker/myk3stest
-  CONTAINER_NAME: myk3s-test
+  CONTAINER_NAME: myk3stest
 
 jobs:
   # 构建 Job
@@ -78,17 +78,11 @@ jobs:
         uses: http://139.9.216.111:3000/bamanker/steevchen-kubectl@master
         with:
           config: ${{ secrets.KUBE_CONFIG }}
-          command: apply -f http://139.9.216.111:3000/bamanker/myk3sTest/raw/branch/master/.deploy/deployment.yml
-      - name: k8s Check Pods Health
-        uses: http://139.9.216.111:3000/bamanker/steevchen-kubectl@master
-        with:
-          config: ${{ secrets.KUBE_CONFIG }}
-          command: get pod -n default -l app=${{ env.CONTAINER_NAME }}
-
-      - name: k8s Update Deployment
-        uses: http://139.9.216.111:3000/bamanker/kubectl@master
-        env:
-          KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
-        with:
-          args: rollout restart deployment ${{ env.CONTAINER_NAME }}-${{ gitea.ref_name }}
+          command: apply -f http://139.9.216.111:3000/bamanker/myk3sTest/src/branch/master/.deploy/deployment.yml
+#      - name: k8s Update Deployment
+#        uses: http://139.9.216.111:3000/bamanker/kubectl@master
+#        env:
+#          KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
+#        with:
+#          args: rollout restart deployment ${{ env.CONTAINER_NAME }}-${{ gitea.ref_name }}