diff --git a/class/defaults.yml b/class/defaults.yml index 494ac37..9fb7625 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -7,7 +7,7 @@ parameters: createNamespace: true charts: - blackbox_exporter: 7.2.0 + blackbox_exporter: 9.0.1 helmValues: pspEnabled: false diff --git a/tests/golden/defaults/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/configmap.yaml b/tests/golden/defaults/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/configmap.yaml index 0be04eb..91d04e3 100644 --- a/tests/golden/defaults/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/configmap.yaml +++ b/tests/golden/defaults/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/configmap.yaml @@ -17,7 +17,7 @@ metadata: app.kubernetes.io/instance: blackbox-exporter app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: prometheus-blackbox-exporter - app.kubernetes.io/version: 0.23.0 - helm.sh/chart: prometheus-blackbox-exporter-7.2.0 + app.kubernetes.io/version: v0.25.0 + helm.sh/chart: prometheus-blackbox-exporter-9.0.1 name: blackbox-exporter-prometheus-blackbox-exporter namespace: syn-blackbox-exporter diff --git a/tests/golden/defaults/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/deployment.yaml b/tests/golden/defaults/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/deployment.yaml index cea5768..508bc54 100644 --- a/tests/golden/defaults/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/deployment.yaml +++ b/tests/golden/defaults/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/deployment.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/instance: blackbox-exporter app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: prometheus-blackbox-exporter - app.kubernetes.io/version: 0.23.0 - helm.sh/chart: prometheus-blackbox-exporter-7.2.0 + app.kubernetes.io/version: v0.25.0 + helm.sh/chart: prometheus-blackbox-exporter-9.0.1 name: blackbox-exporter-prometheus-blackbox-exporter namespace: syn-blackbox-exporter spec: @@ -23,24 +23,21 @@ spec: template: metadata: annotations: - checksum/config: d6143e767e5177d7dd281387cddbbace20582756c95ac252e0d57a898d283493 + checksum/config: f43e733459690a84886aec93596a01748c2f936776a534eeaeb9f084e62ebb91 labels: app.kubernetes.io/instance: blackbox-exporter - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: prometheus-blackbox-exporter - app.kubernetes.io/version: 0.23.0 - helm.sh/chart: prometheus-blackbox-exporter-7.2.0 spec: automountServiceAccountToken: false containers: - args: - --config.file=/config/blackbox.yaml - env: null - image: prom/blackbox-exporter:v0.22.0 + image: quay.io/prometheus/blackbox-exporter:v0.25.0 imagePullPolicy: IfNotPresent livenessProbe: + failureThreshold: 3 httpGet: - path: /health + path: /-/healthy port: http name: blackbox-exporter ports: @@ -48,9 +45,8 @@ spec: name: http readinessProbe: httpGet: - path: /health + path: /-/healthy port: http - resources: {} securityContext: allowPrivilegeEscalation: false capabilities: @@ -63,7 +59,6 @@ spec: name: config hostNetwork: false restartPolicy: Always - securityContext: {} serviceAccountName: blackbox-exporter-prometheus-blackbox-exporter volumes: - configMap: diff --git a/tests/golden/defaults/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/service.yaml b/tests/golden/defaults/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/service.yaml index 2171144..a97b4ff 100644 --- a/tests/golden/defaults/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/service.yaml +++ b/tests/golden/defaults/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/service.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/instance: blackbox-exporter app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: prometheus-blackbox-exporter - app.kubernetes.io/version: 0.23.0 - helm.sh/chart: prometheus-blackbox-exporter-7.2.0 + app.kubernetes.io/version: v0.25.0 + helm.sh/chart: prometheus-blackbox-exporter-9.0.1 name: blackbox-exporter-prometheus-blackbox-exporter namespace: syn-blackbox-exporter spec: diff --git a/tests/golden/defaults/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/serviceaccount.yaml b/tests/golden/defaults/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/serviceaccount.yaml index 4a7d20f..adec038 100644 --- a/tests/golden/defaults/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/serviceaccount.yaml +++ b/tests/golden/defaults/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/serviceaccount.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/instance: blackbox-exporter app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: prometheus-blackbox-exporter - app.kubernetes.io/version: 0.23.0 - helm.sh/chart: prometheus-blackbox-exporter-7.2.0 + app.kubernetes.io/version: v0.25.0 + helm.sh/chart: prometheus-blackbox-exporter-9.0.1 name: blackbox-exporter-prometheus-blackbox-exporter namespace: syn-blackbox-exporter diff --git a/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/configmap.yaml b/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/configmap.yaml index 0eda184..70cad40 100644 --- a/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/configmap.yaml +++ b/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/configmap.yaml @@ -31,7 +31,7 @@ metadata: app.kubernetes.io/instance: blackbox-exporter app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: prometheus-blackbox-exporter - app.kubernetes.io/version: 0.23.0 - helm.sh/chart: prometheus-blackbox-exporter-7.2.0 + app.kubernetes.io/version: v0.25.0 + helm.sh/chart: prometheus-blackbox-exporter-9.0.1 name: blackbox-exporter-prometheus-blackbox-exporter namespace: syn-blackbox-exporter diff --git a/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/deployment.yaml b/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/deployment.yaml index a51fb88..a1ae017 100644 --- a/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/deployment.yaml +++ b/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/deployment.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/instance: blackbox-exporter app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: prometheus-blackbox-exporter - app.kubernetes.io/version: 0.23.0 - helm.sh/chart: prometheus-blackbox-exporter-7.2.0 + app.kubernetes.io/version: v0.25.0 + helm.sh/chart: prometheus-blackbox-exporter-9.0.1 name: blackbox-exporter-prometheus-blackbox-exporter namespace: syn-blackbox-exporter spec: @@ -23,24 +23,21 @@ spec: template: metadata: annotations: - checksum/config: b90d5663387c997a691e9ba48020352a2d9c5d9ab99c2aac37c9385bfd8237e8 + checksum/config: 8cde962135c70bb9d827544a62df83a171a490963bcdd461c589cacde54e7c88 labels: app.kubernetes.io/instance: blackbox-exporter - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: prometheus-blackbox-exporter - app.kubernetes.io/version: 0.23.0 - helm.sh/chart: prometheus-blackbox-exporter-7.2.0 spec: automountServiceAccountToken: false containers: - args: - --config.file=/config/blackbox.yaml - env: null - image: prom/blackbox-exporter:v0.22.0 + image: quay.io/prometheus/blackbox-exporter:v0.25.0 imagePullPolicy: IfNotPresent livenessProbe: + failureThreshold: 3 httpGet: - path: /health + path: /-/healthy port: http name: blackbox-exporter ports: @@ -48,9 +45,8 @@ spec: name: http readinessProbe: httpGet: - path: /health + path: /-/healthy port: http - resources: {} securityContext: allowPrivilegeEscalation: false capabilities: @@ -63,7 +59,6 @@ spec: name: config hostNetwork: false restartPolicy: Always - securityContext: {} serviceAccountName: blackbox-exporter-prometheus-blackbox-exporter volumes: - configMap: diff --git a/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/service.yaml b/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/service.yaml index 2171144..a97b4ff 100644 --- a/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/service.yaml +++ b/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/service.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/instance: blackbox-exporter app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: prometheus-blackbox-exporter - app.kubernetes.io/version: 0.23.0 - helm.sh/chart: prometheus-blackbox-exporter-7.2.0 + app.kubernetes.io/version: v0.25.0 + helm.sh/chart: prometheus-blackbox-exporter-9.0.1 name: blackbox-exporter-prometheus-blackbox-exporter namespace: syn-blackbox-exporter spec: diff --git a/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/serviceaccount.yaml b/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/serviceaccount.yaml index 4a7d20f..adec038 100644 --- a/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/serviceaccount.yaml +++ b/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/serviceaccount.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/instance: blackbox-exporter app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: prometheus-blackbox-exporter - app.kubernetes.io/version: 0.23.0 - helm.sh/chart: prometheus-blackbox-exporter-7.2.0 + app.kubernetes.io/version: v0.25.0 + helm.sh/chart: prometheus-blackbox-exporter-9.0.1 name: blackbox-exporter-prometheus-blackbox-exporter namespace: syn-blackbox-exporter diff --git a/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/servicemonitor.yaml b/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/servicemonitor.yaml index ac0a7d0..d795692 100644 --- a/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/servicemonitor.yaml +++ b/tests/golden/servicemonitor-added-fields/blackbox-exporter/blackbox-exporter/10_blackbox_exporter_helmchart/prometheus-blackbox-exporter/templates/servicemonitor.yaml @@ -5,19 +5,21 @@ metadata: app.kubernetes.io/instance: blackbox-exporter app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: prometheus-blackbox-exporter - app.kubernetes.io/version: 0.23.0 - helm.sh/chart: prometheus-blackbox-exporter-7.2.0 + app.kubernetes.io/version: v0.25.0 + helm.sh/chart: prometheus-blackbox-exporter-9.0.1 name: blackbox-exporter-prometheus-blackbox-exporter-http namespace: syn-blackbox-exporter spec: endpoints: - interval: 30s metricRelabelings: - - replacement: https://my-url + - action: replace + replacement: https://my-url sourceLabels: - instance targetLabel: instance - - replacement: http + - action: replace + replacement: http sourceLabels: - target targetLabel: target @@ -46,19 +48,21 @@ metadata: app.kubernetes.io/instance: blackbox-exporter app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: prometheus-blackbox-exporter - app.kubernetes.io/version: 0.23.0 - helm.sh/chart: prometheus-blackbox-exporter-7.2.0 + app.kubernetes.io/version: v0.25.0 + helm.sh/chart: prometheus-blackbox-exporter-9.0.1 name: blackbox-exporter-prometheus-blackbox-exporter-openid namespace: syn-blackbox-exporter spec: endpoints: - interval: 30s metricRelabelings: - - replacement: https://my-url:13342/openid/ + - action: replace + replacement: https://my-url:13342/openid/ sourceLabels: - instance targetLabel: instance - - replacement: openid + - action: replace + replacement: openid sourceLabels: - target targetLabel: target @@ -87,19 +91,21 @@ metadata: app.kubernetes.io/instance: blackbox-exporter app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: prometheus-blackbox-exporter - app.kubernetes.io/version: 0.23.0 - helm.sh/chart: prometheus-blackbox-exporter-7.2.0 + app.kubernetes.io/version: v0.25.0 + helm.sh/chart: prometheus-blackbox-exporter-9.0.1 name: blackbox-exporter-prometheus-blackbox-exporter-api namespace: syn-blackbox-exporter spec: endpoints: - interval: 30s metricRelabelings: - - replacement: https://my-url:13344/api + - action: replace + replacement: https://my-url:13344/api sourceLabels: - instance targetLabel: instance - - replacement: api + - action: replace + replacement: api sourceLabels: - target targetLabel: target