update

k8s/container.yaml

@@ -0,0 +1,90 @@
+kind: Deployment
+apiVersion: apps/v1
+# 元数据
+metadata:
+  name: advertisement
+  namespace: advertisement
+  labels:
+    app: advertisement
+  annotations:
+    kubesphere.io/creator: dengbiao
+    kubesphere.io/description: advertisement
+# deployment主要部分
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      # 名称与上面的labels对应
+      app: advertisement
+  template:
+    metadata:
+      labels:
+        # 名称与上面的matchLabels对应
+        app: advertisement
+    spec:
+      # 声明挂载卷（将外部已存在的pvc、config等挂载进来）
+      volumes:
+        # 用于时区校正
+        - name: host-time
+          hostPath:
+            path: /etc/localtime
+            type: ''
+        # 将前面创建的configMap也挂载进来
+        - name: advertisement-cfg
+          configMap:
+            # 这里的名字就是前面创建的configMap的名字
+            name: advertisement-cfg
+            defaultMode: 420
+        # pvc
+        - name: advertisement-pvc  # 在该部署中的名称，后面使用改名称挂载
+          persistentVolumeClaim:
+            claimName: 	advertisement-pvc    # pvc的名称
+        # Nginx配置
+        - name: advertisement-nginx
+          configMap:
+            name: advertisement-nginx  # 外部configMap的名称
+            items:
+              - key: go.conf
+                path: default.conf
+      containers:
+        # 主容器
+        - name: advertisement-container
+          # 镜像地址（提前打包好并推送的镜像仓库）
+          image: 'registry.cn-shenzhen.aliyuncs.com/fnuoos-prd/advertisement:0.0.1'
+          ports:
+            - name: ad-1002
+              # 容器端口号（注意与golang web server启动的端口一致）
+              containerPort: 1002
+              protocol: TCP
+          # 将前面volume声明的需要用到的pvc、config挂载上来
+          volumeMounts:
+            - name: host-time
+              readOnly: true
+              mountPath: /etc/localtime
+            - name: advertisement-cfg # 该名字对应前面volumes声明的名字
+              readOnly: true
+              # 挂载到容器的哪个路径
+              mountPath: /var/zyos
+          imagePullPolicy: Always
+        # Nginx 容器
+        - name: nginx
+          image: 'registry.cn-shenzhen.aliyuncs.com/fnuoos-prd/nginx:latest'
+          ports:
+            - name: http-80
+              containerPort: 80
+              protocol: TCP
+          volumeMounts:
+            # 时区校正
+            - name: host-time
+              readOnly: true
+              mountPath: /etc/localtime
+            # 存储卷 用于存放前端代码
+            - name: advertisement-pvc   # 前面volumes声明的名称
+              mountPath: /usr/share/nginx/html
+            - name: advertisement-nginx   # Nginx 配置
+              readOnly: true
+              mountPath: /etc/nginx/conf.d/default.conf
+              subPath: default.conf
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 30
+      dnsPolicy: ClusterFirst

k8s/ingress.yaml

@@ -0,0 +1,17 @@
+kind: Ingress
+apiVersion: extensions/v1beta1
+metadata:
+  name: advertisement   # ingress名称
+  namespace: advertisement
+  annotations:
+    kubesphere.io/creator: dengbiao
+spec:
+  rules:
+    - host: 123456.advertisement.dengbiao.top   #  使用的域名
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: advertisement   # 流量转发到的服务
+              servicePort: 80

k8s/mall-task-prd.yaml

@@ -1,56 +0,0 @@
-kind: Deployment
-apiVersion: apps/v1
-metadata:
-  name: mall-task
-  namespace: zhios
-  labels:
-    app: mall-task
-  annotations:
-    kubesphere.io/creator: wuhanqin
-    kubesphere.io/description: 自营商城go定时任务
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: mall-task
-  template:
-    metadata:
-      labels:
-        app: mall-task
-    spec:
-      volumes:
-        - name: host-time
-          hostPath:
-            path: /etc/localtime
-            type: ''
-        - name: mall-task-cfg1
-          configMap:
-            name: zhios-mall-task
-            items:
-              - key: task.yml
-                path: task.yml
-            defaultMode: 420
-      containers:
-        - name: container-mall-task
-          image: 'registry.cn-shenzhen.aliyuncs.com/fnuoos-prd/zyos-mall-task:0.3'
-          resources:
-            limits:
-              cpu: '1'
-              memory: 1000Mi
-            requests:
-              cpu: 200m
-              memory: 1000Mi
-          volumeMounts:
-            - name: host-time
-              readOnly: true
-              mountPath: /etc/localtime
-            - name: mall-task-cfg1
-              readOnly: true
-              mountPath: /var/zyos/task.yml
-              subPath: task.yml
-          terminationMessagePath: /dev/termination-log
-          terminationMessagePolicy: File
-          imagePullPolicy: Always
-      restartPolicy: Always
-      terminationGracePeriodSeconds: 30
-      dnsPolicy: ClusterFirst

k8s/mall-task.yaml

@@ -1,56 +0,0 @@
-kind: Deployment
-apiVersion: apps/v1
-metadata:
-  name: mall-task
-  namespace: dev
-  labels:
-    app: mall-task
-  annotations:
-    kubesphere.io/creator: wuhanqin
-    kubesphere.io/description: 自营商城go定时任务
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: mall-task
-  template:
-    metadata:
-      labels:
-        app: mall-task
-    spec:
-      volumes:
-        - name: host-time
-          hostPath:
-            path: /etc/localtime
-            type: ''
-        - name: mall-task-cfg1
-          configMap:
-            name: mall-task-cfg
-            items:
-              - key: task.yml
-                path: task.yml
-            defaultMode: 420
-      containers:
-        - name: container-mall-task
-          image: 'registry.cn-shenzhen.aliyuncs.com/fnuoos-prd/zyos-mall-task:0.1'
-          resources:
-            limits:
-              cpu: '1'
-              memory: 1000Mi
-            requests:
-              cpu: 200m
-              memory: 1000Mi
-          volumeMounts:
-            - name: host-time
-              readOnly: true
-              mountPath: /etc/localtime
-            - name: mall-task-cfg1
-              readOnly: true
-              mountPath: /var/zyos/task.yml
-              subPath: task.yml
-          terminationMessagePath: /dev/termination-log
-          terminationMessagePolicy: File
-          imagePullPolicy: Always
-      restartPolicy: Always
-      terminationGracePeriodSeconds: 30
-      dnsPolicy: ClusterFirst