Merge branch 'temp20200207' of https://github.com/fewdan/chaos-mesh i…

…nto temp20200207

CONTRIBUTORS

@@ -7,6 +7,7 @@
 #
 # Please keep the list sorted.
 
+Anglenet <[email protected]>
 Ben Ye <[email protected]>
 Cwen <[email protected]>
 Genboku <[email protected]>
@@ -23,4 +24,4 @@ Song Gao <[email protected]>
 Wenbo Zhang <[email protected]>
 Xuwei Fu <[email protected]>
 Yihao Fu <[email protected]>
-Yujun Zhang <[email protected]>
+Yujun Zhang <[email protected]>

cmd/controller-manager/main.go

@@ -64,7 +64,7 @@ func init() {
 }
 
 func parseFlags() {
-	flag.StringVar(&metricsAddr, "metrics-addr", ":8080", "The address the metric endpoint binds to.")
+	flag.StringVar(&metricsAddr, "metrics-addr", ":10080", "The address the metric endpoint binds to.")
 	flag.BoolVar(&enableLeaderElection, "enable-leader-election", false,
 		"Enable leader election for controller manager. Enabling this will ensure there is only one active controller manager.")
 	flag.StringVar(&certsDir, "certs", "/etc/webhook/certs",

helm/chaos-mesh/templates/controller-manager-deployment.yaml

@@ -53,8 +53,10 @@ spec:
             mountPath: /etc/webhook/certs
             readOnly: true
         ports:
-          - name: webhook-api
+          - name: webhook
             containerPort: 9443 # Customize containerPort
+          - name: http
+            containerPort: 10080
       volumes:
         - name: webhook-certs
           secret:

helm/chaos-mesh/templates/controller-manager-service.yaml

@@ -11,12 +11,12 @@ metadata:
 spec:
   type: {{ .Values.controllerManager.service.type }}
   ports:
-#    - port: {{ .Values.controllerManager.service.port }}
-#      targetPort: http
-#      protocol: TCP
-#      name: http
+    - port: 10080
+      targetPort: http
+      protocol: TCP
+      name: http
     - port: 443
-      targetPort: 9443
+      targetPort: webhook
       protocol: TCP
       name: webhook
   selector:

helm/chaos-mesh/values.yaml

@@ -23,7 +23,6 @@ controllerManager:
 
   service:
     type: ClusterIP
-    port: 10080
 
   resources:
     # We usually recommend not to specify default resources and to leave this as a conscious