Merge pull request #681 from mgirgisf/kube-metrics

Update kube-state-metrics port

Author: openshift-merge-bot[bot]

pkg/availability/const.go

@@ -20,10 +20,10 @@ const (
 	// KSMServiceName -
 	KSMServiceName = "kube-state-metrics"
 
-	// KSMHealthPort -
-	KSMHealthPort = 8081
+	// KSMReadyPort - (/readyz)
+	KSMReadyPort = 8081
 
-	// KSMMetricsPort -
+	// KSMMetricsPort - (/metrics, /healthz, /livez)
 	KSMMetricsPort = 8080
 )
 

pkg/availability/service.go

@@ -49,7 +49,7 @@ func KSMService(
 				Name: "http-metrics",
 			},
 			{
-				Port: KSMHealthPort,
+				Port: KSMReadyPort,
 				Name: "telemetry",
 			},
 		}

pkg/availability/statefulset.go

@@ -42,8 +42,8 @@ func KSMStatefulSet(
 	livenessProbe := &corev1.Probe{
 		ProbeHandler: corev1.ProbeHandler{
 			HTTPGet: &corev1.HTTPGetAction{
-				Path: "/healthz",
-				Port: intstr.FromInt(KSMHealthPort),
+				Path: "/livez",
+				Port: intstr.FromInt(KSMMetricsPort),
 			},
 		},
 		InitialDelaySeconds: 5,
@@ -53,8 +53,8 @@ func KSMStatefulSet(
 	readinessProbe := &corev1.Probe{
 		ProbeHandler: corev1.ProbeHandler{
 			HTTPGet: &corev1.HTTPGetAction{
-				Path: "/",
-				Port: intstr.FromInt(KSMMetricsPort),
+				Path: "/readyz",
+				Port: intstr.FromInt(KSMReadyPort),
 			},
 		},
 		InitialDelaySeconds: 5,
@@ -138,7 +138,7 @@ func KSMStatefulSet(
 				Name:          "http-metrics",
 			},
 			{
-				ContainerPort: KSMHealthPort,
+				ContainerPort: KSMReadyPort,
 				Name:          "telemetry",
 			},
 		},