Merge remote-tracking branch 'origin/master' into test

@@ -44,13 +44,13 @@ spec:
                       - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
                       - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
       containers:
       containers:
         - name: mmmopp
         - name: mmmopp
-          image: 192.168.0.243:5000/mmm/mmmopp:dev
+          image: 192.168.0.243:5000/mmm/mmmopp:master
           imagePullPolicy: Always
           imagePullPolicy: Always
           volumeMounts:
           volumeMounts:
             - mountPath:  /opt/logs
             - mountPath:  /opt/logs
               name: accesslogs
               name: accesslogs
             - mountPath: /var/www/opp/file
             - mountPath: /var/www/opp/file
-              name: mmmjihuitest2-pvc1
+              name: opportunity-pvc1
           ports:
           ports:
             - containerPort: 8080
             - containerPort: 8080
           env:
           env:
@@ -97,6 +97,6 @@ spec:
       volumes:
       volumes:
         - name: accesslogs
         - name: accesslogs
           emptyDir: {}
           emptyDir: {}
-        - name: mmmjihuitest2-pvc1
+        - name: opportunity-pvc1
           persistentVolumeClaim:
           persistentVolumeClaim:
-            claimName: mmmjihuitest2-pvc
+            claimName: opportunity-pvc