diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index fa2bca0592b971c19f5e8d6b8a98dec0a8c8a19e..499cc7df209cd439b851755d5e2f4be404d55f43 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -6,7 +6,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; namespace: 'default', versions+:: { - prometheus: 'v2.20.0', + prometheus: 'v2.22.0', }, imageRepos+:: { @@ -256,11 +256,11 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; { port: 'https-metrics', interval: '30s', - scheme: "https", - bearerTokenFile: "/var/run/secrets/kubernetes.io/serviceaccount/token", + scheme: 'https', + bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token', tlsConfig: { - insecureSkipVerify: true - } + insecureSkipVerify: true, + }, }, ], selector: { @@ -380,10 +380,10 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; { port: 'https-metrics', interval: '30s', - scheme: "https", - bearerTokenFile: "/var/run/secrets/kubernetes.io/serviceaccount/token", + scheme: 'https', + bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token', tlsConfig: { - insecureSkipVerify: true + insecureSkipVerify: true, }, metricRelabelings: (import 'kube-prometheus/dropping-deprecated-metrics-relabelings.libsonnet') + [ { diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 9899a5689d409b7f0f963d9ee5347f81c3a65cf6..56e1f0d808a3a930d5ae1257c7376f38529f9b56 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -99,7 +99,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "f6ce472ecd6064fb6769e306b55b149dfb6af903", + "version": "b4ecadf26f10acb14fcd87c5d288e94e2eaced14", "sum": "6reUygVmQrLEWQzTKcH8ceDbvM+2ztK3z2VBR2K2l+U=" }, { @@ -109,8 +109,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "633ea519b2ce86396f6e006f7fd967c04bc45bda", - "sum": "P8EcWO33RCyVTfwMdpy4S4jFZjJVHiu190j8yd/CGfs=" + "version": "5871079854c0c9db963f953a4c690e09a4b4bb0a", + "sum": "tmnX7IS6b139Pb6WxODP5w7x5LdqefYM1S7KHWQkpEY=" }, { "source": { diff --git a/manifests/prometheus-operator-serviceMonitor.yaml b/manifests/prometheus-operator-serviceMonitor.yaml index b8422326bffcec4f70b2d1706edd1c32b4411588..974ebef058cdce418bb68e8b7c02691c20f336e4 100644 --- a/manifests/prometheus-operator-serviceMonitor.yaml +++ b/manifests/prometheus-operator-serviceMonitor.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.43.0 + app.kubernetes.io/version: v0.43.1 name: prometheus-operator namespace: monitoring spec: @@ -19,4 +19,4 @@ spec: matchLabels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.43.0 + app.kubernetes.io/version: v0.43.1 diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index 4b99429ee0b19f69306b2151ef92ebb2dec2f7d9..c232df5e3adaaeebff8dd02162e537116bca0f72 100644 --- a/manifests/prometheus-prometheus.yaml +++ b/manifests/prometheus-prometheus.yaml @@ -11,7 +11,7 @@ spec: - name: alertmanager-main namespace: monitoring port: web - image: quay.io/prometheus/prometheus:v2.20.0 + image: quay.io/prometheus/prometheus:v2.22.0 nodeSelector: kubernetes.io/os: linux podMonitorNamespaceSelector: {} @@ -33,4 +33,4 @@ spec: serviceAccountName: prometheus-k8s serviceMonitorNamespaceSelector: {} serviceMonitorSelector: {} - version: v2.20.0 + version: v2.22.0 diff --git a/manifests/setup/prometheus-operator-clusterRole.yaml b/manifests/setup/prometheus-operator-clusterRole.yaml index fc3a62f358c244101b4d6b4c16ad33f706c00836..03d58b3c03877fe917c3684411657e2b24b2b795 100644 --- a/manifests/setup/prometheus-operator-clusterRole.yaml +++ b/manifests/setup/prometheus-operator-clusterRole.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.43.0 + app.kubernetes.io/version: v0.43.1 name: prometheus-operator rules: - apiGroups: diff --git a/manifests/setup/prometheus-operator-clusterRoleBinding.yaml b/manifests/setup/prometheus-operator-clusterRoleBinding.yaml index 2cd3d33ce1c54d1f011f86b8ea835051f389bc99..befd40428e3faa96ee40615abbb33678f0bd7847 100644 --- a/manifests/setup/prometheus-operator-clusterRoleBinding.yaml +++ b/manifests/setup/prometheus-operator-clusterRoleBinding.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.43.0 + app.kubernetes.io/version: v0.43.1 name: prometheus-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/setup/prometheus-operator-deployment.yaml b/manifests/setup/prometheus-operator-deployment.yaml index d2266cb37413c7cd9087df4701e448fb0a32369e..91bdbfa77c1c064a4268e65687237418ab834684 100644 --- a/manifests/setup/prometheus-operator-deployment.yaml +++ b/manifests/setup/prometheus-operator-deployment.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.43.0 + app.kubernetes.io/version: v0.43.1 name: prometheus-operator namespace: monitoring spec: @@ -18,14 +18,14 @@ spec: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.43.0 + app.kubernetes.io/version: v0.43.1 spec: containers: - args: - --kubelet-service=kube-system/kubelet - --logtostderr=true - - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.43.0 - image: quay.io/prometheus-operator/prometheus-operator:v0.43.0 + - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.43.1 + image: quay.io/prometheus-operator/prometheus-operator:v0.43.1 name: prometheus-operator ports: - containerPort: 8080 diff --git a/manifests/setup/prometheus-operator-service.yaml b/manifests/setup/prometheus-operator-service.yaml index b76a542c29caa6b73867d071bb592dd2e72752d4..794d6b35c190ece000432af7d54759ebc53a8b3c 100644 --- a/manifests/setup/prometheus-operator-service.yaml +++ b/manifests/setup/prometheus-operator-service.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.43.0 + app.kubernetes.io/version: v0.43.1 name: prometheus-operator namespace: monitoring spec: diff --git a/manifests/setup/prometheus-operator-serviceAccount.yaml b/manifests/setup/prometheus-operator-serviceAccount.yaml index ad635b9e4ea22489ce04a26886e4364c5c5efa27..c251d57890ac4e60f733c962424aba79ed0309b1 100644 --- a/manifests/setup/prometheus-operator-serviceAccount.yaml +++ b/manifests/setup/prometheus-operator-serviceAccount.yaml @@ -4,6 +4,6 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.43.0 + app.kubernetes.io/version: v0.43.1 name: prometheus-operator namespace: monitoring