Skip to content

Commit

Permalink
Merge pull request #2135 from rhobs/automated-updates-master-versions…
Browse files Browse the repository at this point in the history
…-generate

[bot] Synchronize versions of the downstream components
  • Loading branch information
openshift-ci[bot] committed Oct 31, 2023
2 parents c7b4692 + 7738696 commit 9cbc518
Show file tree
Hide file tree
Showing 29 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion assets/prometheus-k8s/cluster-role-binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-k8s/cluster-role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
rules:
- apiGroups:
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-k8s/pod-disruption-budget.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: openshift-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-k8s/prometheus-rule-thanos-sidecar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
prometheus: k8s
role: alert-rules
name: prometheus-k8s-thanos-sidecar-rules
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-k8s/prometheus-rule.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
prometheus: k8s
role: alert-rules
name: prometheus-k8s-prometheus-rules
Expand Down
8 changes: 4 additions & 4 deletions assets/prometheus-k8s/prometheus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: k8s
namespace: openshift-monitoring
spec:
Expand Down Expand Up @@ -157,7 +157,7 @@ spec:
enableFeatures: []
externalLabels: {}
externalURL: https://prometheus-k8s.openshift-monitoring.svc:9091
image: quay.io/prometheus/prometheus:v2.47.0
image: quay.io/prometheus/prometheus:v2.47.2
listenLocal: true
nodeSelector:
kubernetes.io/os: linux
Expand All @@ -169,7 +169,7 @@ spec:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
podMonitorNamespaceSelector:
matchLabels:
openshift.io/cluster-monitoring: "true"
Expand Down Expand Up @@ -210,7 +210,7 @@ spec:
cpu: 1m
memory: 100Mi
version: 0.32.5
version: 2.47.0
version: 2.47.2
web:
httpConfig:
headers:
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-k8s/role-binding-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s-config
namespace: openshift-monitoring
roleRef:
Expand Down
10 changes: 5 additions & 5 deletions assets/prometheus-k8s/role-binding-specific-namespaces.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: default
roleRef:
Expand All @@ -27,7 +27,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: kube-system
roleRef:
Expand All @@ -46,7 +46,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: openshift-monitoring
roleRef:
Expand All @@ -65,7 +65,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: openshift-etcd
roleRef:
Expand All @@ -84,7 +84,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: openshift-user-workload-monitoring
roleRef:
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-k8s/role-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s-config
namespace: openshift-monitoring
rules:
Expand Down
10 changes: 5 additions & 5 deletions assets/prometheus-k8s/role-specific-namespaces.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: default
rules:
Expand Down Expand Up @@ -46,7 +46,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: kube-system
rules:
Expand Down Expand Up @@ -84,7 +84,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: openshift-monitoring
rules:
Expand Down Expand Up @@ -122,7 +122,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: openshift-etcd
rules:
Expand Down Expand Up @@ -160,7 +160,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: openshift-user-workload-monitoring
rules:
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-k8s/service-account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: openshift-monitoring
2 changes: 1 addition & 1 deletion assets/prometheus-k8s/service-monitor-thanos-sidecar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: thanos-sidecar
namespace: openshift-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-k8s/service-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: openshift-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-k8s/service-thanos-sidecar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s-thanos-sidecar
namespace: openshift-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-k8s/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: openshift-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-user-workload/cluster-role-binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-user-workload
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-user-workload/cluster-role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-user-workload
rules:
- apiGroups:
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-user-workload/pod-disruption-budget.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-user-workload
namespace: openshift-user-workload-monitoring
spec:
Expand Down
8 changes: 4 additions & 4 deletions assets/prometheus-user-workload/prometheus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: user-workload
namespace: openshift-user-workload-monitoring
spec:
Expand Down Expand Up @@ -167,7 +167,7 @@ spec:
enforcedNamespaceLabel: namespace
externalLabels: {}
ignoreNamespaceSelectors: true
image: quay.io/prometheus/prometheus:v2.47.0
image: quay.io/prometheus/prometheus:v2.47.2
listenLocal: true
nodeSelector:
kubernetes.io/os: linux
Expand All @@ -181,7 +181,7 @@ spec:
app.kubernetes.io/instance: user-workload
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
podMonitorNamespaceSelector:
matchExpressions:
- key: openshift.io/cluster-monitoring
Expand Down Expand Up @@ -253,4 +253,4 @@ spec:
cpu: 1m
memory: 100Mi
version: 0.32.5
version: 2.47.0
version: 2.47.2
2 changes: 1 addition & 1 deletion assets/prometheus-user-workload/role-binding-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-user-workload-config
namespace: openshift-user-workload-monitoring
roleRef:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ items:
app.kubernetes.io/instance: user-workload
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-user-workload
namespace: openshift-user-workload-monitoring
roleRef:
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-user-workload/role-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-user-workload-config
namespace: openshift-user-workload-monitoring
rules:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ items:
app.kubernetes.io/instance: user-workload
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-user-workload
namespace: openshift-user-workload-monitoring
rules:
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-user-workload/service-account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-user-workload
namespace: openshift-user-workload-monitoring
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: thanos-sidecar
namespace: openshift-user-workload-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-user-workload/service-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-user-workload
namespace: openshift-user-workload-monitoring
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-user-workload-thanos-sidecar
namespace: openshift-user-workload-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-user-workload/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 2.47.0
app.kubernetes.io/version: 2.47.2
name: prometheus-user-workload
namespace: openshift-user-workload-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion jsonnet/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ versions:
monitoringPlugin: 1.0.0
nodeExporter: 1.6.1
promLabelProxy: 0.7.0
prometheus: 2.47.0
prometheus: 2.47.2
prometheusAdapter: 0.11.1
prometheusOperator: 0.68.0
thanos: 0.32.5

0 comments on commit 9cbc518

Please sign in to comment.