[pxc-db] Add prometheus scrape annotations to backup jobs and deploym…

…ents

Add prometheus scrape labels to backup jobs and deployments
This will enable metrics scraping for binlog-collector deployments

common/pxc-db/Chart.yaml

@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.0
+version: 0.2.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

common/pxc-db/templates/cluster.yaml

@@ -274,7 +274,7 @@ spec:
       s3-backups-{{ $storage }}:
         type: s3
         annotations:
-{{ merge (include "pxc-db.linkerdPodAnnotations" $ | fromYaml) ($backup.annotations) | toYaml | indent 10 }}
+{{ merge (include "pxc-db.linkerdPodAnnotations" $ | fromYaml) (include "pxc-db.metricsAnnotations" $ | fromYaml) ($backup.annotations) | toYaml | indent 10 }}
         labels:
 {{ merge (include "pxc-db.backupLabels" $ | fromYaml) ($backup.labels) | toYaml | indent 10 }}
         resources:

common/pxc-db/values.yaml

@@ -345,7 +345,6 @@ backup:
     limits: {}
   pitr:
     enabled: false
-    annotations: {}
     storageName: s3-backups-binlogs
     timeBetweenUploads: 300
     timeoutSeconds: 60