From cd52798a518840a97842c380b2e09560c12d4c69 Mon Sep 17 00:00:00 2001 From: Daniel-Pivonka Date: Tue, 27 Aug 2019 14:55:15 -0400 Subject: [PATCH] Change default csi liveness ports to ones less common Signed-off-by: Daniel-Pivonka --- .../kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml | 4 ++-- deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin.yaml | 4 ++-- .../kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml | 4 ++-- deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin.yaml | 4 ++-- deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml | 4 ++-- deploy/rbd/kubernetes/v1.13/csi-rbdplugin.yaml | 4 ++-- deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml | 5 +++-- deploy/rbd/kubernetes/v1.14+/csi-rbdplugin.yaml | 4 ++-- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml index aa4679ea4..e88952a95 100644 --- a/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin-provisioner.yaml @@ -12,7 +12,7 @@ spec: - name: http-metrics port: 8080 protocol: TCP - targetPort: 8081 + targetPort: 8681 - name: grpc-metrics port: 8090 protocol: TCP @@ -116,7 +116,7 @@ spec: args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" - - "--metricsport=8081" + - "--metricsport=8681" - "--metricspath=/metrics" - "--polltime=60s" - "--timeout=3s" diff --git a/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin.yaml index c20c649ba..f0851bcb0 100644 --- a/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/v1.13/csi-cephfsplugin.yaml @@ -106,7 +106,7 @@ spec: args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" - - "--metricsport=8081" + - "--metricsport=8681" - "--metricspath=/metrics" - "--polltime=60s" - "--timeout=3s" @@ -169,7 +169,7 @@ spec: - name: http-metrics port: 8080 protocol: TCP - targetPort: 8081 + targetPort: 8681 - name: grpc-metrics port: 8090 protocol: TCP diff --git a/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml index 067ee995f..b13c50185 100644 --- a/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin-provisioner.yaml @@ -12,7 +12,7 @@ spec: - name: http-metrics port: 8080 protocol: TCP - targetPort: 8081 + targetPort: 8681 - name: grpc-metrics port: 8090 protocol: TCP @@ -119,7 +119,7 @@ spec: args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" - - "--metricsport=8081" + - "--metricsport=8681" - "--metricspath=/metrics" - "--polltime=60s" - "--timeout=3s" diff --git a/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin.yaml index fa022ef90..09f258668 100644 --- a/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/v1.14+/csi-cephfsplugin.yaml @@ -105,7 +105,7 @@ spec: args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" - - "--metricsport=8081" + - "--metricsport=8681" - "--metricspath=/metrics" - "--polltime=60s" - "--timeout=3s" @@ -168,7 +168,7 @@ spec: - name: http-metrics port: 8080 protocol: TCP - targetPort: 8081 + targetPort: 8681 - name: grpc-metrics port: 8090 protocol: TCP diff --git a/deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml index 33a6b8821..6b501707c 100644 --- a/deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/v1.13/csi-rbdplugin-provisioner.yaml @@ -12,7 +12,7 @@ spec: - name: http-metrics port: 8080 protocol: TCP - targetPort: 8080 + targetPort: 8680 - name: grpc-metrics port: 8090 protocol: TCP @@ -130,7 +130,7 @@ spec: args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" - - "--metricsport=8080" + - "--metricsport=8680" - "--metricspath=/metrics" - "--polltime=60s" - "--timeout=3s" diff --git a/deploy/rbd/kubernetes/v1.13/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/v1.13/csi-rbdplugin.yaml index d7345d452..3d1740eb2 100644 --- a/deploy/rbd/kubernetes/v1.13/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/v1.13/csi-rbdplugin.yaml @@ -100,7 +100,7 @@ spec: args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" - - "--metricsport=8080" + - "--metricsport=8680" - "--metricspath=/metrics" - "--polltime=60s" - "--timeout=3s" @@ -161,7 +161,7 @@ spec: - name: http-metrics port: 8080 protocol: TCP - targetPort: 8080 + targetPort: 8680 - name: grpc-metrics port: 8090 protocol: TCP diff --git a/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml index a8157f471..92622544f 100644 --- a/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin-provisioner.yaml @@ -12,11 +12,12 @@ spec: - name: http-metrics port: 8080 protocol: TCP - targetPort: 8080 + targetPort: 8680 - name: grpc-metrics port: 8090 protocol: TCP targetPort: 8090 + --- kind: Deployment apiVersion: apps/v1 @@ -133,7 +134,7 @@ spec: args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" - - "--metricsport=8080" + - "--metricsport=8680" - "--metricspath=/metrics" - "--polltime=60s" - "--timeout=3s" diff --git a/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin.yaml index d7345d452..3d1740eb2 100644 --- a/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/v1.14+/csi-rbdplugin.yaml @@ -100,7 +100,7 @@ spec: args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" - - "--metricsport=8080" + - "--metricsport=8680" - "--metricspath=/metrics" - "--polltime=60s" - "--timeout=3s" @@ -161,7 +161,7 @@ spec: - name: http-metrics port: 8080 protocol: TCP - targetPort: 8080 + targetPort: 8680 - name: grpc-metrics port: 8090 protocol: TCP