Introduced a bug to the prometheus install, trying again.

kubernetes-sigs · Jun 26, 2024 · cd0c1e7 · cd0c1e7
1 parent f8e53f5
commit cd0c1e7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/.github/actions/install-prometheus/action.yaml b/.github/actions/install-prometheus/action.yaml
@@ -22,12 +22,4 @@ runs:
         --set "kubelet.serviceMonitor.cAdvisorRelabelings[0].targetLabel=metrics_path" \
         --set "kubelet.serviceMonitor.cAdvisorRelabelings[0].action=replace" \
         --set "kubelet.serviceMonitor.cAdvisorRelabelings[0].sourceLabels[0]=__metrics_path__" \
-        --set "kubelet.serviceMonitor.cAdvisorRelabelings[1].targetLabel=clusterName" \
-        --set "kubelet.serviceMonitor.cAdvisorRelabelings[1].replacement=$CLUSTER_NAME" \
-        --set "kubelet.serviceMonitor.cAdvisorRelabelings[2].targetLabel=gitRef" \
-        --set "kubelet.serviceMonitor.cAdvisorRelabelings[2].replacement=$(git rev-parse HEAD)" \
-        --set "kubelet.serviceMonitor.cAdvisorRelabelings[3].targetLabel=mostRecentTag" \
-        --set "kubelet.serviceMonitor.cAdvisorRelabelings[3].replacement=$(git describe --abbrev=0 --tags)" \
-        --set "kubelet.serviceMonitor.cAdvisorRelabelings[4].targetLabel=commitsAfterTag" \
-        --set "kubelet.serviceMonitor.cAdvisorRelabelings[4].replacement=\"$(git describe --tags | cut -d '-' -f 2)\"" \
         --wait
diff --git a/.github/actions/install-prometheus/valuesv3.yaml b/.github/actions/install-prometheus/valuesv3.yaml
@@ -3,7 +3,7 @@ prometheus:
     serviceMonitorSelector: {}
     serviceMonitorNamespaceSelector: {}
     additionalScrapeConfigs:
-      - job_name: serviceMonitor/karpenter/karpenter/0
+      - job_name: serviceMonitor/kube-system/karpenter/0
         honor_timestamps: true
         track_timestamps_staleness: false
         scrape_interval: 30s