Merge pull request #2467 from CatherineF-dev/patch-12

fix: e2e test failure
kubernetes · Aug 5, 2024 · b1c2e0c · b1c2e0c
2 parents 312b298 + b43702e
commit b1c2e0c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/...ding/deployment-no-node-pods-service.yaml → ...nt-unscheduled-pods-fetching-service.yaml b/...ding/deployment-no-node-pods-service.yaml → ...nt-unscheduled-pods-fetching-service.yaml
@@ -3,9 +3,9 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/component: exporter
-    app.kubernetes.io/name: kube-state-metrics-no-node-pods
+    app.kubernetes.io/name: kube-state-metrics-unscheduled-pods-fetching
     app.kubernetes.io/version: 2.13.0
-  name: kube-state-metrics-no-node-pods
+  name: kube-state-metrics-unscheduled-pods-fetching
   namespace: kube-system
 spec:
   clusterIP: None
@@ -17,4 +17,4 @@ spec:
     port: 8081
     targetPort: telemetry
   selector:
-    app.kubernetes.io/name: kube-state-metrics-no-node-pods
+    app.kubernetes.io/name: kube-state-metrics-unscheduled-pods-fetching
diff --git a/...nsetsharding/deployment-no-node-pods.yaml → ...deployment-unscheduled-pods-fetching.yaml b/...nsetsharding/deployment-no-node-pods.yaml → ...deployment-unscheduled-pods-fetching.yaml
diff --git a/jsonnet/kube-state-metrics/kube-state-metrics.libsonnet b/jsonnet/kube-state-metrics/kube-state-metrics.libsonnet
@@ -415,7 +415,7 @@
           '--track-unscheduled-pods',
         ],
       };
-      local shardksmname = ksm.name + '-no-node-pods';
+      local shardksmname = ksm.name + '-unscheduled-pods-fetching';
       std.mergePatch(
         ksm.service,
         {

diff --git a/tests/e2e.sh b/tests/e2e.sh
@@ -122,11 +122,11 @@ function kube_pod_up() {
 function test_daemonset() {
     sed -i "s|${KUBE_STATE_METRICS_CURRENT_IMAGE_NAME}:v.*|${KUBE_STATE_METRICS_IMAGE_NAME}:${KUBE_STATE_METRICS_IMAGE_TAG}|g" ./examples/daemonsetsharding/deployment.yaml
     sed -i "s|${KUBE_STATE_METRICS_CURRENT_IMAGE_NAME}:v.*|${KUBE_STATE_METRICS_IMAGE_NAME}:${KUBE_STATE_METRICS_IMAGE_TAG}|g" ./examples/daemonsetsharding/daemonset.yaml
-    sed -i "s|${KUBE_STATE_METRICS_CURRENT_IMAGE_NAME}:v.*|${KUBE_STATE_METRICS_IMAGE_NAME}:${KUBE_STATE_METRICS_IMAGE_TAG}|g" ./examples/daemonsetsharding/deployment-no-node-pods.yaml
+    sed -i "s|${KUBE_STATE_METRICS_CURRENT_IMAGE_NAME}:v.*|${KUBE_STATE_METRICS_IMAGE_NAME}:${KUBE_STATE_METRICS_IMAGE_TAG}|g" ./examples/daemonsetsharding/deployment-unscheduled-pods-fetching.yaml
 
     kubectl get deployment -n kube-system
     kubectl create -f ./examples/daemonsetsharding
-    kube_state_metrics_up kube-state-metrics-no-node-pods
+    kube_state_metrics_up kube-state-metrics-unscheduled-pods-fetching
     kube_state_metrics_up kube-state-metrics
     kube_state_metrics_up kube-state-metrics-shard
     kubectl apply -f ./tests/e2e/testdata/pods.yaml
@@ -147,11 +147,11 @@ function test_daemonset() {
         exit 1
     fi
 
-    kubectl logs deployment/kube-state-metrics-no-node-pods -n kube-system
+    kubectl logs deployment/kube-state-metrics-unscheduled-pods-fetching -n kube-system
     sleep 2
     kubectl get pods -A --field-selector spec.nodeName=""
     sleep 2
-    pendingpod2="$(curl -s "http://localhost:8001/api/v1/namespaces/kube-system/services/kube-state-metrics-no-node-pods:http-metrics/proxy/metrics"  | grep "pendingpod2" | grep -c "kube_pod_info" )"
+    pendingpod2="$(curl -s "http://localhost:8001/api/v1/namespaces/kube-system/services/kube-state-metrics-unscheduled-pods-fetching:http-metrics/proxy/metrics"  | grep "pendingpod2" | grep -c "kube_pod_info" )"
     if [ "${pendingpod2}" != "${expected_num_pod}" ]; then
         echo "metric kube_pod_info for pendingpod2 doesn't show up only once, got ${runningpod1} times"
         exit 1