修改部署配置文件

Author: yangmv

Dockerfile

@@ -14,7 +14,6 @@ RUN wget https://www.python.org/ftp/python/3.6.6/Python-3.6.6.tar.xz
 RUN xz -d Python-3.6.6.tar.xz && tar xvf Python-3.6.6.tar && cd Python-3.6.6 && ./configure && make && make install
 
 # 3. 复制代码
-#RUN mkdir -p /var/www/
 ADD . /var/www/CMDB/
 WORKDIR /var/www/CMDB/
 

apps/ws/__pycache__/handler.cpython-36.pyc

@@ -29,23 +29,21 @@ spec:
               subPath: cmdb.conf  #以文件的形式挂载
               readOnly: true
             - name: cmdbnginx
-              mountPath: /etc/nginx/conf.d/nginx_cmdb.conf
-              subPath: nginx_cmdb.conf
-              readOnly: true
+              mountPath: /etc/nginx/conf.d/
 
       volumes:
         - name: cmdbconf
           configMap:
             name: cmdb-conf   #configmap要提前创建好  kubectl create configmap cmdb-conf --from-file=./cmdb.conf -n qa
         - name: cmdbnginx
           configMap:
-            name: cmdb-nginx-conf  # kubectl create configmap cmdb-nginx-conf --from-file=./cmdb-nginx-conf -n qa
+            name: cmdb-nginx-conf  # kubectl create configmap cmdb-nginx-conf --from-file=./nginx_cmdb.conf -n qa
 
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: codo-cmdb
+  name: codo-cmdb       #k8s内网对应的域名为 codo-cmdb.qa.svc.cluster.local
   labels:
     app: codo-cmdb
 spec:
@@ -59,18 +57,19 @@ spec:
     targetPort: 80
 
 ---
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: codo-cmdb-ingress
-  annotations:
-    kubernetes.io/ingress.class: "nginx"
-spec:
-  rules:
-  - host: <DOMAIN>
-    http:
-      paths:
-      - path:
-        backend:
-          serviceName: codo-cmdb
-          servicePort: 80
+# api不需要通过ingress反代到外网
+#apiVersion: extensions/v1beta1
+#kind: Ingress
+#metadata:
+#  name: codo-cmdb-ingress
+#  annotations:
+#    kubernetes.io/ingress.class: "nginx"
+#spec:
+#  rules:
+#  - host: <DOMAIN>
+#    http:
+#      paths:
+#      - path:
+#        backend:
+#          serviceName: codo-cmdb
+#          servicePort: 80