From ac8c50eabdd5d13c9c445c537487b28e4d0c755b Mon Sep 17 00:00:00 2001 From: Mohammed Date: Thu, 25 Mar 2021 17:36:09 -0500 Subject: [PATCH 1/6] Update ClusterRole to include 'get' for pods --- .../helm/aws-node-termination-handler/templates/clusterrole.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/helm/aws-node-termination-handler/templates/clusterrole.yaml b/config/helm/aws-node-termination-handler/templates/clusterrole.yaml index 0583f5f5..eaa19713 100644 --- a/config/helm/aws-node-termination-handler/templates/clusterrole.yaml +++ b/config/helm/aws-node-termination-handler/templates/clusterrole.yaml @@ -18,6 +18,7 @@ rules: - pods verbs: - list + - get - apiGroups: - "" resources: From cdd8a71a13ed791253597281058396db8e373c4c Mon Sep 17 00:00:00 2001 From: Abdul Muqtadir Mohammed Date: Fri, 26 Mar 2021 02:05:55 -0500 Subject: [PATCH 2/6] retrigger tests --- .../helm/aws-node-termination-handler/templates/clusterrole.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/helm/aws-node-termination-handler/templates/clusterrole.yaml b/config/helm/aws-node-termination-handler/templates/clusterrole.yaml index eaa19713..6e37b816 100644 --- a/config/helm/aws-node-termination-handler/templates/clusterrole.yaml +++ b/config/helm/aws-node-termination-handler/templates/clusterrole.yaml @@ -19,6 +19,7 @@ rules: verbs: - list - get + - watch - apiGroups: - "" resources: From d07536771a324200770232fd7d19e944d852643e Mon Sep 17 00:00:00 2001 From: Abdul Muqtadir Mohammed Date: Fri, 26 Mar 2021 02:06:30 -0500 Subject: [PATCH 3/6] retrigger test --- .../helm/aws-node-termination-handler/templates/clusterrole.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/helm/aws-node-termination-handler/templates/clusterrole.yaml b/config/helm/aws-node-termination-handler/templates/clusterrole.yaml index 6e37b816..eaa19713 100644 --- a/config/helm/aws-node-termination-handler/templates/clusterrole.yaml +++ b/config/helm/aws-node-termination-handler/templates/clusterrole.yaml @@ -19,7 +19,6 @@ rules: verbs: - list - get - - watch - apiGroups: - "" resources: From 1784aa5c6cfceb3679d7bc9a830258210d43df07 Mon Sep 17 00:00:00 2001 From: Abdul Muqtadir Mohammed Date: Fri, 26 Mar 2021 10:40:23 -0500 Subject: [PATCH 4/6] Update clusterrole.yaml --- .../templates/prometheus-operator/clusterrole.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/helm/prometheus-operator/templates/prometheus-operator/clusterrole.yaml b/config/helm/prometheus-operator/templates/prometheus-operator/clusterrole.yaml index 64fac28c..49fa057e 100644 --- a/config/helm/prometheus-operator/templates/prometheus-operator/clusterrole.yaml +++ b/config/helm/prometheus-operator/templates/prometheus-operator/clusterrole.yaml @@ -49,6 +49,7 @@ rules: - pods verbs: - list + - get - delete - apiGroups: - "" From 60206a12d9c27487807c364fa0a13b719bc557cc Mon Sep 17 00:00:00 2001 From: Abdul Muqtadir Mohammed Date: Fri, 26 Mar 2021 11:42:28 -0500 Subject: [PATCH 5/6] Increase sleep time so the pods could be evicted --- test/e2e/prometheus-metrics-test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/prometheus-metrics-test b/test/e2e/prometheus-metrics-test index 0f7682bf..9e42da83 100755 --- a/test/e2e/prometheus-metrics-test +++ b/test/e2e/prometheus-metrics-test @@ -143,7 +143,7 @@ PORT_FORWARD_PID=$! trap 'kill ${PORT_FORWARD_PID}' EXIT SIGINT SIGTERM ERR echo "✅ Port-forwarded pod $POD_NAME" -sleep 1 +sleep 30 METRICS_RESPONSE=$(curl -L localhost:7000/metrics) echo "✅ Fetched /metrics." From 446ac72fca5d75f523eae249f768a92bb5a79f06 Mon Sep 17 00:00:00 2001 From: Abdul Muqtadir Mohammed Date: Fri, 26 Mar 2021 12:16:56 -0500 Subject: [PATCH 6/6] remove get permissions for pods --- .../templates/prometheus-operator/clusterrole.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/helm/prometheus-operator/templates/prometheus-operator/clusterrole.yaml b/config/helm/prometheus-operator/templates/prometheus-operator/clusterrole.yaml index 49fa057e..64fac28c 100644 --- a/config/helm/prometheus-operator/templates/prometheus-operator/clusterrole.yaml +++ b/config/helm/prometheus-operator/templates/prometheus-operator/clusterrole.yaml @@ -49,7 +49,6 @@ rules: - pods verbs: - list - - get - delete - apiGroups: - ""