公告上架下架

@@ -2,7 +2,7 @@
 export PATH=/root/local/bin:$PATH
 export PATH=/root/local/bin:$PATH
 kubectl -n mmm-suplus-dev get pods | grep -q oppmg
 kubectl -n mmm-suplus-dev get pods | grep -q oppmg
 if [ "$?" == "1" ];then
 if [ "$?" == "1" ];then
-	kubectl create -f /tmp/dev/oppmgmg/oppmg.yaml --record
+	kubectl create -f /tmp/dev/mmm-go-oppmg/oppmg.yaml --record
 	kubectl -n mmm-suplus-dev get svc | grep -q oppmg
 	kubectl -n mmm-suplus-dev get svc | grep -q oppmg
 	if [ "$?" == "0" ];then
 	if [ "$?" == "0" ];then
 		echo "oppmg service install success!"
 		echo "oppmg service install success!"
@@ -16,7 +16,7 @@ if [ "$?" == "1" ];then
 		echo "oppmg deployment install fail!"
 		echo "oppmg deployment install fail!"
 	fi
 	fi
 else
 else
-	kubectl delete -f /tmp/dev/oppmg/oppmg.yaml
+	kubectl delete -f /tmp/dev/mmm-go-oppmg/oppmg.yaml
 	kubectl -n mmm-suplus-dev get svc | grep -q oppmg
 	kubectl -n mmm-suplus-dev get svc | grep -q oppmg
 	while [ "$?" == "0" ]
 	while [ "$?" == "0" ]
 	do
 	do
@@ -27,7 +27,7 @@ else
 	do
 	do
 	kubectl -n mmm-suplus-dev get pods | grep -q oppmg
 	kubectl -n mmm-suplus-dev get pods | grep -q oppmg
 	done
 	done
-	kubectl create -f /tmp/dev/oppmg/oppmg.yaml --record
+	kubectl create -f /tmp/dev/mmm-go-oppmg/oppmg.yaml --record
 	kubectl -n mmm-suplus-dev get svc | grep -q oppmg
 	kubectl -n mmm-suplus-dev get svc | grep -q oppmg
 	if [ "$?" == "0" ];then
 	if [ "$?" == "0" ];then
 		echo "oppmg service update success!"
 		echo "oppmg service update success!"

@@ -46,17 +46,14 @@ spec:
         - name: oppmg
         - name: oppmg
           image: 192.168.0.243:5000/mmm/oppmg:dev
           image: 192.168.0.243:5000/mmm/oppmg:dev
           imagePullPolicy: Always
           imagePullPolicy: Always
-          ports:
-            - containerPort: 8080
           volumeMounts:
           volumeMounts:
-            - mountPath: /opt/logs
+            - mountPath:  /opt/logs
               name: accesslogs
               name: accesslogs
+            - mountPath: /var/www/oppmg/file
+              name: mmmjihuitest-pvc1
+          ports:
+            - containerPort: 8080
           env:
           env:
-            - name: ENTERPRISE_SERVICE_HOST
-              valueFrom:
-                configMapKeyRef:
-                  name: suplus-config
-                  key: service.enterprise
             - name: MYSQL_HOST
             - name: MYSQL_HOST
               valueFrom:
               valueFrom:
                 configMapKeyRef:
                 configMapKeyRef:
@@ -67,6 +64,16 @@ spec:
                 configMapKeyRef:
                 configMapKeyRef:
                   name: suplus-config
                   name: suplus-config
                   key: mysql.port
                   key: mysql.port
+            - name: REDIS_HOST
+              valueFrom:
+                configMapKeyRef:
+                  name: suplus-config
+                  key: redis.ip
+            - name: REDIS_PORT
+              valueFrom:
+                configMapKeyRef:
+                  name: suplus-config
+                  key: redis.port
             - name: MYSQL_USER
             - name: MYSQL_USER
               valueFrom:
               valueFrom:
                 configMapKeyRef:
                 configMapKeyRef:
@@ -79,16 +86,17 @@ spec:
                   key: mysql.password
                   key: mysql.password
             - name: MYSQL_DB_NAME
             - name: MYSQL_DB_NAME
               value: "opportunity_dev"
               value: "opportunity_dev"
-            - name: LOG_LEVEL
-              value: "debug"
             - name: RUN_MODE
             - name: RUN_MODE
               value: "test"
               value: "test"
-            - name: aliyun_logs_suplus
+            - name: LOG_LEVEL
+              value: "debug"
+            - name: aliyun_logs_suplusfile
               value: "stdout"
               value: "stdout"
             - name: aliyun_logs_access
             - name: aliyun_logs_access
-              value: "/opt/logs/oppmg.log"
-            - name: aliyun_logs_access
-              value: "/var/www/opp/file"
+              value: " /opt/logs/app.log"
       volumes:
       volumes:
         - name: accesslogs
         - name: accesslogs
           emptyDir: {}
           emptyDir: {}
+        - name: mmmjihuitest-pvc1
+          persistentVolumeClaim:
+            claimName: mmmjihuitest-pvc