Expose metrics port for karmadactl installation

Signed-off-by: whitewindmills <[email protected]>
whitewindmills · Jul 10, 2024 · e2afe37 · e2afe37
1 parent 7982275
commit e2afe37
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 0 deletions.
diff --git a/pkg/karmadactl/addons/descheduler/manifests.go b/pkg/karmadactl/addons/descheduler/manifests.go
@@ -60,6 +60,10 @@ spec:
             initialDelaySeconds: 15
             periodSeconds: 15
             timeoutSeconds: 5
+          ports:
+            - containerPort: 10358
+              name: metrics
+              protocol: TCP
           volumeMounts:
             - name: k8s-certs
               mountPath: /etc/karmada/pki

diff --git a/pkg/karmadactl/addons/estimator/manifests.go b/pkg/karmadactl/addons/estimator/manifests.go
@@ -61,6 +61,10 @@ spec:
             initialDelaySeconds: 15
             periodSeconds: 15
             timeoutSeconds: 5
+          ports:
+            - containerPort: 10351
+              name: metrics
+              protocol: TCP
           volumeMounts:
             - name: k8s-certs
               mountPath: /etc/karmada/pki

diff --git a/pkg/karmadactl/cmdinit/kubernetes/deployments.go b/pkg/karmadactl/cmdinit/kubernetes/deployments.go
@@ -35,6 +35,8 @@ const (
 	deploymentAPIVersion = "apps/v1"
 	deploymentKind       = "Deployment"
 	portName             = "server"
+	metricsPortName      = "metrics"
+	defaultMetricsPort   = 8080
 
 	// KubeConfigSecretAndMountName is the secret and volume mount name of karmada kubeconfig
 	KubeConfigSecretAndMountName                                = "kubeconfig"
@@ -461,6 +463,13 @@ func (i *CommandInitOption) makeKarmadaSchedulerDeployment() *appsv1.Deployment
 					"--v=4",
 				},
 				LivenessProbe: livenessProbe,
+				Ports: []corev1.ContainerPort{
+					{
+						Name:          metricsPortName,
+						ContainerPort: 10351,
+						Protocol:      corev1.ProtocolTCP,
+					},
+				},
 				VolumeMounts: []corev1.VolumeMount{
 					{
 						Name:      KubeConfigSecretAndMountName,
@@ -595,6 +604,11 @@ func (i *CommandInitOption) makeKarmadaControllerManagerDeployment() *appsv1.Dep
 						ContainerPort: controllerManagerSecurePort,
 						Protocol:      corev1.ProtocolTCP,
 					},
+					{
+						Name:          metricsPortName,
+						ContainerPort: defaultMetricsPort,
+						Protocol:      corev1.ProtocolTCP,
+					},
 				},
 				VolumeMounts: []corev1.VolumeMount{
 					{
@@ -712,6 +726,11 @@ func (i *CommandInitOption) makeKarmadaWebhookDeployment() *appsv1.Deployment {
 						ContainerPort: webhookTargetPort,
 						Protocol:      corev1.ProtocolTCP,
 					},
+					{
+						Name:          metricsPortName,
+						ContainerPort: defaultMetricsPort,
+						Protocol:      corev1.ProtocolTCP,
+					},
 				},
 				VolumeMounts: []corev1.VolumeMount{
 					{

diff --git a/pkg/karmadactl/register/register.go b/pkg/karmadactl/register/register.go
@@ -714,6 +714,13 @@ func (o *CommandRegisterOption) makeKarmadaAgentDeployment() *appsv1.Deployment
 					"--secure-port=10357",
 					"--v=4",
 				},
+				Ports: []corev1.ContainerPort{
+					{
+						Name:          "metrics",
+						ContainerPort: 8080,
+						Protocol:      corev1.ProtocolTCP,
+					},
+				},
 				VolumeMounts: []corev1.VolumeMount{
 					{
 						Name:      "kubeconfig",