diff --git a/config/prow/cluster/monitoring/prometheus_operator_deployment.yaml b/config/prow/cluster/monitoring/prometheus_operator_deployment.yaml index 31bdc63ce8f5..084a36a15bf9 100644 --- a/config/prow/cluster/monitoring/prometheus_operator_deployment.yaml +++ b/config/prow/cluster/monitoring/prometheus_operator_deployment.yaml @@ -20,10 +20,9 @@ spec: - args: - --kubelet-service=kube-system/kubelet - --logtostderr=true - - --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1 - - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.29.0 + - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.45.0 - --namespaces=prow-monitoring - image: quay.io/coreos/prometheus-operator:v0.29.0 + image: quay.io/prometheus-operator/prometheus-operator:v0.45.0 name: prometheus-operator ports: - containerPort: 8080 diff --git a/config/prow/cluster/monitoring/prometheus_operator_rbac.yaml b/config/prow/cluster/monitoring/prometheus_operator_rbac.yaml index c79b03ac71db..bd5e69fcc8f7 100644 --- a/config/prow/cluster/monitoring/prometheus_operator_rbac.yaml +++ b/config/prow/cluster/monitoring/prometheus_operator_rbac.yaml @@ -17,21 +17,20 @@ kind: ClusterRole metadata: name: prow-prometheus-operator rules: -- apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - '*' - apiGroups: - monitoring.coreos.com resources: - alertmanagers - alertmanagers/finalizers + - alertmanagerconfigs - prometheuses - prometheuses/finalizers - - prometheusrules + - thanosrulers + - thanosrulers/finalizers - servicemonitors + - podmonitors + - probes + - prometheusrules verbs: - '*' - apiGroups: @@ -52,18 +51,17 @@ rules: resources: - pods verbs: - - delete - list + - delete - apiGroups: - "" - attributeRestrictions: null resources: - - endpoints - services - services/finalizers + - endpoints verbs: - - create - get + - create - update - delete - apiGroups: @@ -81,6 +79,14 @@ rules: - get - list - watch +- apiGroups: + - networking.k8s.io + resources: + - ingresses + verbs: + - get + - list + - watch --- apiVersion: v1 kind: ServiceAccount diff --git a/config/prow/cluster/monitoring/prow_alertmanager.yaml b/config/prow/cluster/monitoring/prow_alertmanager.yaml index a2f0db7e869a..eae27788fa10 100644 --- a/config/prow/cluster/monitoring/prow_alertmanager.yaml +++ b/config/prow/cluster/monitoring/prow_alertmanager.yaml @@ -5,7 +5,7 @@ metadata: namespace: prow-monitoring spec: replicas: 3 - baseImage: docker.io/prom/alertmanager + image: docker.io/prom/alertmanager listenLocal: false nodeSelector: {} securityContext: diff --git a/config/prow/cluster/monitoring/prow_prometheus.yaml b/config/prow/cluster/monitoring/prow_prometheus.yaml index e16f835b6242..57f4be447a6a 100644 --- a/config/prow/cluster/monitoring/prow_prometheus.yaml +++ b/config/prow/cluster/monitoring/prow_prometheus.yaml @@ -33,7 +33,7 @@ spec: - key: app operator: Exists version: v2.7.1 - baseImage: docker.io/prom/prometheus + image: docker.io/prom/prometheus externalLabels: {} listenLocal: false nodeSelector: {}