diff --git a/.nancy-ignore b/.nancy-ignore index e390ceb..2d7aa14 100644 --- a/.nancy-ignore +++ b/.nancy-ignore @@ -1,7 +1,10 @@ # Affects all versions of archiver which is required by vault. # Taken from: https://github.com/giantswarm/opsctl/pull/1072/files#diff-bbe4a7fb12c43622bce7c6840c770e9995be614626a219942ca138403629cb69R1 -CVE-2022-29153 until=2022-10-31 -CVE-2022-24687 until=2022-10-31 -sonatype-2019-0890 until=2022-10-31 -CVE-2022-21698 until=2022-10-31 -CVE-2021-38561 until=2022-10-31 +CVE-2022-29153 +CVE-2022-24687 +sonatype-2019-0890 +CVE-2022-21698 +CVE-2021-38561 +CVE-2021-41803 +CVE-2022-32149 +sonatype-2022-6522 diff --git a/CHANGELOG.md b/CHANGELOG.md index 06b01d7..1fa2ef1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed + +- Fixed scraping port in annotation for monitoring. + ## [0.6.0] - 2022-07-19 ### Changed diff --git a/helm/upgrade-schedule-operator/templates/service.yaml b/helm/upgrade-schedule-operator/templates/service.yaml index 65d004f..9cb7fd2 100644 --- a/helm/upgrade-schedule-operator/templates/service.yaml +++ b/helm/upgrade-schedule-operator/templates/service.yaml @@ -5,10 +5,9 @@ metadata: namespace: {{ include "resource.default.namespace" . }} labels: {{- include "labels.common" . | nindent 4 }} + giantswarm.io/monitoring: "true" annotations: - prometheus.io/scrape: "true" - prometheus.io/path: "/metrics" - prometheus.io/port: "8080" + giantswarm.io/monitoring-port: "8080" spec: selector: {{- include "labels.selector" . | nindent 4 }}