Merge pull request #2696 from simonpasquier/pr/2695

openshift-merge-bot[bot] · web-flow · commit 231e593a99d9 · 2025-10-10T09:20:46.000Z
NO-ISSUE: Update jsonnet dependencies
diff --git a/assets/prometheus-k8s/prometheus.yaml b/assets/prometheus-k8s/prometheus.yaml
@@ -226,6 +226,7 @@ spec:
     runAsNonRoot: true
     runAsUser: 65534
   serviceAccountName: prometheus-k8s
+  serviceDiscoveryRole: Endpoints
   serviceMonitorNamespaceSelector:
     matchLabels:
       openshift.io/cluster-monitoring: "true"
diff --git a/assets/prometheus-k8s/role-specific-namespaces.yaml b/assets/prometheus-k8s/role-specific-namespaces.yaml
@@ -15,8 +15,15 @@ items:
   - apiGroups:
     - ""
     resources:
-    - services
     - endpoints
+    verbs:
+    - get
+    - list
+    - watch
+  - apiGroups:
+    - ""
+    resources:
+    - services
     - pods
     verbs:
     - get
@@ -53,8 +60,15 @@ items:
   - apiGroups:
     - ""
     resources:
-    - services
     - endpoints
+    verbs:
+    - get
+    - list
+    - watch
+  - apiGroups:
+    - ""
+    resources:
+    - services
     - pods
     verbs:
     - get
@@ -91,8 +105,15 @@ items:
   - apiGroups:
     - ""
     resources:
-    - services
     - endpoints
+    verbs:
+    - get
+    - list
+    - watch
+  - apiGroups:
+    - ""
+    resources:
+    - services
     - pods
     verbs:
     - get
@@ -129,8 +150,15 @@ items:
   - apiGroups:
     - ""
     resources:
-    - services
     - endpoints
+    verbs:
+    - get
+    - list
+    - watch
+  - apiGroups:
+    - ""
+    resources:
+    - services
     - pods
     verbs:
     - get
diff --git a/assets/prometheus-operator-user-workload/cluster-role.yaml b/assets/prometheus-operator-user-workload/cluster-role.yaml
@@ -106,6 +106,16 @@ rules:
   - create
   - update
   - delete
+- apiGroups:
+  - discovery.k8s.io
+  resources:
+  - endpointslices
+  verbs:
+  - get
+  - create
+  - list
+  - update
+  - delete
 - apiGroups:
   - authentication.k8s.io
   resources:
diff --git a/assets/prometheus-operator-user-workload/deployment.yaml b/assets/prometheus-operator-user-workload/deployment.yaml
@@ -34,7 +34,7 @@ spec:
       - args:
         - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.86.0
         - --kubelet-endpoints=true
-        - --kubelet-endpointslice=false
+        - --kubelet-endpointslice=true
         - --prometheus-instance-namespaces=openshift-user-workload-monitoring
         - --alertmanager-instance-namespaces=openshift-user-workload-monitoring
         - --thanos-ruler-instance-namespaces=openshift-user-workload-monitoring
diff --git a/assets/prometheus-operator/cluster-role.yaml b/assets/prometheus-operator/cluster-role.yaml
@@ -106,6 +106,16 @@ rules:
   - create
   - update
   - delete
+- apiGroups:
+  - discovery.k8s.io
+  resources:
+  - endpointslices
+  verbs:
+  - get
+  - create
+  - list
+  - update
+  - delete
 - apiGroups:
   - authentication.k8s.io
   resources:
diff --git a/assets/prometheus-operator/deployment.yaml b/assets/prometheus-operator/deployment.yaml
@@ -35,7 +35,7 @@ spec:
         - --kubelet-service=kube-system/kubelet
         - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.86.0
         - --kubelet-endpoints=true
-        - --kubelet-endpointslice=false
+        - --kubelet-endpointslice=true
         - --watch-referenced-objects-in-all-namespaces=true
         - --prometheus-instance-namespaces=openshift-monitoring
         - --thanos-ruler-instance-namespaces=openshift-monitoring
diff --git a/assets/prometheus-user-workload/prometheus.yaml b/assets/prometheus-user-workload/prometheus.yaml
@@ -281,6 +281,7 @@ spec:
     seccompProfile:
       type: RuntimeDefault
   serviceAccountName: prometheus-user-workload
+  serviceDiscoveryRole: Endpoints
   serviceMonitorNamespaceSelector:
     matchExpressions:
     - key: openshift.io/cluster-monitoring
diff --git a/assets/prometheus-user-workload/role-specific-namespaces.yaml b/assets/prometheus-user-workload/role-specific-namespaces.yaml
@@ -15,8 +15,15 @@ items:
   - apiGroups:
     - ""
     resources:
-    - services
     - endpoints
+    verbs:
+    - get
+    - list
+    - watch
+  - apiGroups:
+    - ""
+    resources:
+    - services
     - pods
     verbs:
     - get
diff --git a/jsonnet/jsonnetfile.lock.json b/jsonnet/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "353107914b9fa18b9d2e0477bb18b7eec5e210ce",
+      "version": "438ed969386b7ef258e0d5802ca5ce4a45e46d7b",
       "sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
     },
     {
@@ -48,7 +48,7 @@
           "subdir": "gen/grafonnet-latest"
         }
       },
-      "version": "5a8f3d6aa89b7e7513528371d2d1265aedc844bc",
+      "version": "42d098fae987f25f08480e203ca6ddc548c6efbf",
       "sum": "V9vAj21qJOc2DlMPDgB1eEjSQU4A+sAA4AXuJ6bd4xc="
     },
     {
@@ -58,7 +58,7 @@
           "subdir": "gen/grafonnet-v10.0.0"
         }
       },
-      "version": "5a8f3d6aa89b7e7513528371d2d1265aedc844bc",
+      "version": "42d098fae987f25f08480e203ca6ddc548c6efbf",
       "sum": "xdcrJPJlpkq4+5LpGwN4tPAuheNNLXZjE6tDcyvFjr0="
     },
     {
@@ -68,7 +68,7 @@
           "subdir": "gen/grafonnet-v11.4.0"
         }
       },
-      "version": "5a8f3d6aa89b7e7513528371d2d1265aedc844bc",
+      "version": "42d098fae987f25f08480e203ca6ddc548c6efbf",
       "sum": "aVAX09paQYNOoCSKVpuk1exVIyBoMt/C50QJI+Q/3nA="
     },
     {
@@ -129,8 +129,8 @@
           "subdir": ""
         }
       },
-      "version": "5dae7f6adf083639934a4a54aef451174dd84370",
-      "sum": "St7n7FXqoobaBFI+FvC1OTbcYFZKCKblcwP9jJEV704="
+      "version": "d6556e52d2762de47dc28ac0f9f2ffe93a50e785",
+      "sum": "jLkq96mnGjid6+aQFvT16Fspnvud7NM1edY33kDSpIE="
     },
     {
       "source": {
@@ -139,7 +139,7 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "941c6838fe19636355adbb14e0672e362f420145",
+      "version": "e332175940b8d8f76648c24d79c1e0d59a9b7926",
       "sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM="
     },
     {
@@ -149,7 +149,7 @@
           "subdir": "jsonnet/kube-state-metrics-mixin"
         }
       },
-      "version": "941c6838fe19636355adbb14e0672e362f420145",
+      "version": "e332175940b8d8f76648c24d79c1e0d59a9b7926",
       "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
     },
     {
@@ -181,8 +181,8 @@
           "subdir": "jsonnet/kube-prometheus"
         }
       },
-      "version": "68619d9afe02555c25b784ed2e73e907380f0876",
-      "sum": "zXJkWr2Fv+XINGqfp1KSMiaB1mbQkxWuT5P24wrW+rg="
+      "version": "d98c08e752f6ff143ee3a9491b774f55e572a83b",
+      "sum": "fKY/bBuoAikhIeljLNu54ut2SdtT4qCjxhlNLEQg7zo="
     },
     {
       "source": {
@@ -233,7 +233,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "c9e0e36701bcd1a7a6ccc372834e227fda31e616",
+      "version": "f4b8840f51bee8afa258e0d4e27fc7fc03358760",
       "sum": "JY9uhZWjDnMd6TYjgqyzEqXqBS1zIkJrDzauiXyaJ4A=",
       "name": "prometheus"
     },
@@ -244,7 +244,7 @@
           "subdir": "jsonnet/controller-gen"
         }
       },
-      "version": "634d5f1a7edf139368544be734799e410ecec182",
+      "version": "dec7d5cc8d55ed2c2bb6ce48b5eae8effc098947",
       "sum": "O3c9Uurei8MWAY0Ad7DOL1fMqSgdHyHB7MpHsxSITKM=",
       "name": "pyrra"
     },
diff --git a/jsonnet/main.jsonnet b/jsonnet/main.jsonnet
@@ -202,6 +202,7 @@ local inCluster =
           $.values.common.namespaceUserWorkload,
         ],
         namespaceSelector: $.values.common.clusterMonitoringNamespaceSelector,
+        serviceDiscoveryRole: 'Endpoints',
         mixin+: {
           ruleLabels: $.values.common.ruleLabels,
           _config+: {
@@ -444,6 +445,7 @@ local userWorkload =
         thanos: inCluster.values.prometheus.thanos,
         tlsCipherSuites: $.values.common.tlsCipherSuites,
         kubeRbacProxyImage: $.values.common.images.kubeRbacProxy,
+        serviceDiscoveryRole: 'Endpoints',
       },
       prometheusOperator: {
         namespace: $.values.common.namespace,
diff --git a/manifests/0000_50_cluster-monitoring-operator_02-role.yaml b/manifests/0000_50_cluster-monitoring-operator_02-role.yaml
@@ -515,8 +515,15 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - services
   - endpoints
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - services
   - pods
   verbs:
   - get
@@ -541,8 +548,15 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - services
   - endpoints
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - services
   - pods
   verbs:
   - get
@@ -567,8 +581,15 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - services
   - endpoints
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - services
   - pods
   verbs:
   - get
@@ -593,8 +614,15 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - services
   - endpoints
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - services
   - pods
   verbs:
   - get
@@ -719,6 +747,16 @@ rules:
   - create
   - update
   - delete
+- apiGroups:
+  - discovery.k8s.io
+  resources:
+  - endpointslices
+  verbs:
+  - get
+  - create
+  - list
+  - update
+  - delete
 - apiGroups:
   - authentication.k8s.io
   resources:

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`"subdir": "contrib/mixin"`
`19`	`19`	`}`
`20`	`20`	`},`
`21`		`- "version": "353107914b9fa18b9d2e0477bb18b7eec5e210ce",`
	`21`	`+ "version": "438ed969386b7ef258e0d5802ca5ce4a45e46d7b",`
`22`	`22`	`"sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="`
`23`	`23`	`},`
`24`	`24`	`{`
`@@ -48,7 +48,7 @@`
`48`	`48`	`"subdir": "gen/grafonnet-latest"`
`49`	`49`	`}`
`50`	`50`	`},`
`51`		`- "version": "5a8f3d6aa89b7e7513528371d2d1265aedc844bc",`
	`51`	`+ "version": "42d098fae987f25f08480e203ca6ddc548c6efbf",`
`52`	`52`	`"sum": "V9vAj21qJOc2DlMPDgB1eEjSQU4A+sAA4AXuJ6bd4xc="`
`53`	`53`	`},`
`54`	`54`	`{`
`@@ -58,7 +58,7 @@`
`58`	`58`	`"subdir": "gen/grafonnet-v10.0.0"`
`59`	`59`	`}`
`60`	`60`	`},`
`61`		`- "version": "5a8f3d6aa89b7e7513528371d2d1265aedc844bc",`
	`61`	`+ "version": "42d098fae987f25f08480e203ca6ddc548c6efbf",`
`62`	`62`	`"sum": "xdcrJPJlpkq4+5LpGwN4tPAuheNNLXZjE6tDcyvFjr0="`
`63`	`63`	`},`
`64`	`64`	`{`
`@@ -68,7 +68,7 @@`
`68`	`68`	`"subdir": "gen/grafonnet-v11.4.0"`
`69`	`69`	`}`
`70`	`70`	`},`
`71`		`- "version": "5a8f3d6aa89b7e7513528371d2d1265aedc844bc",`
	`71`	`+ "version": "42d098fae987f25f08480e203ca6ddc548c6efbf",`
`72`	`72`	`"sum": "aVAX09paQYNOoCSKVpuk1exVIyBoMt/C50QJI+Q/3nA="`
`73`	`73`	`},`
`74`	`74`	`{`
`@@ -129,8 +129,8 @@`
`129`	`129`	`"subdir": ""`
`130`	`130`	`}`
`131`	`131`	`},`
`132`		`- "version": "5dae7f6adf083639934a4a54aef451174dd84370",`
`133`		`- "sum": "St7n7FXqoobaBFI+FvC1OTbcYFZKCKblcwP9jJEV704="`
	`132`	`+ "version": "d6556e52d2762de47dc28ac0f9f2ffe93a50e785",`
	`133`	`+ "sum": "jLkq96mnGjid6+aQFvT16Fspnvud7NM1edY33kDSpIE="`
`134`	`134`	`},`
`135`	`135`	`{`
`136`	`136`	`"source": {`
`@@ -139,7 +139,7 @@`
`139`	`139`	`"subdir": "jsonnet/kube-state-metrics"`
`140`	`140`	`}`
`141`	`141`	`},`
`142`		`- "version": "941c6838fe19636355adbb14e0672e362f420145",`
	`142`	`+ "version": "e332175940b8d8f76648c24d79c1e0d59a9b7926",`
`143`	`143`	`"sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM="`
`144`	`144`	`},`
`145`	`145`	`{`
`@@ -149,7 +149,7 @@`
`149`	`149`	`"subdir": "jsonnet/kube-state-metrics-mixin"`
`150`	`150`	`}`
`151`	`151`	`},`
`152`		`- "version": "941c6838fe19636355adbb14e0672e362f420145",`
	`152`	`+ "version": "e332175940b8d8f76648c24d79c1e0d59a9b7926",`
`153`	`153`	`"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="`
`154`	`154`	`},`
`155`	`155`	`{`
`@@ -181,8 +181,8 @@`
`181`	`181`	`"subdir": "jsonnet/kube-prometheus"`
`182`	`182`	`}`
`183`	`183`	`},`
`184`		`- "version": "68619d9afe02555c25b784ed2e73e907380f0876",`
`185`		`- "sum": "zXJkWr2Fv+XINGqfp1KSMiaB1mbQkxWuT5P24wrW+rg="`
	`184`	`+ "version": "d98c08e752f6ff143ee3a9491b774f55e572a83b",`
	`185`	`+ "sum": "fKY/bBuoAikhIeljLNu54ut2SdtT4qCjxhlNLEQg7zo="`
`186`	`186`	`},`
`187`	`187`	`{`
`188`	`188`	`"source": {`
`@@ -233,7 +233,7 @@`
`233`	`233`	`"subdir": "documentation/prometheus-mixin"`
`234`	`234`	`}`
`235`	`235`	`},`
`236`		`- "version": "c9e0e36701bcd1a7a6ccc372834e227fda31e616",`
	`236`	`+ "version": "f4b8840f51bee8afa258e0d4e27fc7fc03358760",`
`237`	`237`	`"sum": "JY9uhZWjDnMd6TYjgqyzEqXqBS1zIkJrDzauiXyaJ4A=",`
`238`	`238`	`"name": "prometheus"`
`239`	`239`	`},`
`@@ -244,7 +244,7 @@`
`244`	`244`	`"subdir": "jsonnet/controller-gen"`
`245`	`245`	`}`
`246`	`246`	`},`
`247`		`- "version": "634d5f1a7edf139368544be734799e410ecec182",`
	`247`	`+ "version": "dec7d5cc8d55ed2c2bb6ce48b5eae8effc098947",`
`248`	`248`	`"sum": "O3c9Uurei8MWAY0Ad7DOL1fMqSgdHyHB7MpHsxSITKM=",`
`249`	`249`	`"name": "pyrra"`
`250`	`250`	`},`