Merge pull request #318 from alexandrevilain/release/v0.12.1

Release v0.12.1
alexandrevilain · Mar 22, 2023 · 9d5ea70 · 9d5ea70
2 parents a96b43f + 5eb3ca8
commit 9d5ea70
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 All notable changes to this project are documented in this file.
 
+## 0.12.1
+
+**Release date:** 2023-03-22
+
+Improvements:
+- Allow ServiceMonitor endpoint override [#316](https://github.com/alexandrevilain/temporal-operator/pull/316)
+- fix(ServiceMonitor): remove endpoint override and add metricRelabelConfigs [#317](https://github.com/alexandrevilain/temporal-operator/pull/317)
+
+Fixes:
+- Updated clusterservice version replace was set to wrong version, need to update build [#307](https://github.com/alexandrevilain/temporal-operator/pull/307)
+
+Updates:
+- Bump actions/setup-go from 3 to 4 [#310](https://github.com/alexandrevilain/temporal-operator/pull/310)
+
 ## 0.12.0
 
 **Release date:** 2023-03-08

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.12.0
+0.12.1
diff --git a/bundle/manifests/temporal-operator.clusterserviceversion.yaml b/bundle/manifests/temporal-operator.clusterserviceversion.yaml
@@ -118,11 +118,10 @@ metadata:
       ]
     capabilities: Seamless Upgrades
     categories: Application Runtime, Developer Tools, AI/Machine Learning
-    containerImage: ghcr.io/alexandrevilain/temporal-operator:v0.12.0
-    createdAt: "2023-03-08T18:39:50Z"
-    operators.operatorframework.io/builder: operator-sdk-v1.26.1
+    containerImage: ghcr.io/alexandrevilain/temporal-operator:v0.12.1
+    operators.operatorframework.io/builder: operator-sdk-v1.23.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
-  name: temporal-operator.v0.12.0
+  name: temporal-operator.v0.12.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -471,7 +470,7 @@ spec:
                 - --leader-elect
                 command:
                 - /manager
-                image: ghcr.io/alexandrevilain/temporal-operator:v0.12.0
+                image: ghcr.io/alexandrevilain/temporal-operator:v0.12.1
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -575,8 +574,8 @@ spec:
   provider:
     name: Temporal Community
     url: https://temporal.io/
-  replaces: temporal-operator.v0.11.0
-  version: 0.12.0
+  replaces: temporal-operator.v0.9.1
+  version: 0.12.1
   webhookdefinitions:
   - admissionReviewVersions:
     - v1

diff --git a/bundle/manifests/temporal.io_temporalclusters.yaml b/bundle/manifests/temporal.io_temporalclusters.yaml
@@ -227,6 +227,82 @@ spec:
                                 description: Enabled defines if the operator should
                                   create a ServiceMonitor for each services.
                                 type: boolean
+                              metricRelabelings:
+                                description: MetricRelabelConfigs to apply to samples
+                                  before ingestion.
+                                items:
+                                  description: 'RelabelConfig allows dynamic rewriting
+                                    of the label set, being applied to samples before
+                                    ingestion. It defines `<metric_relabel_configs>`-section
+                                    of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
+                                  properties:
+                                    action:
+                                      default: replace
+                                      description: Action to perform based on regex
+                                        matching. Default is 'replace'. uppercase
+                                        and lowercase actions require Prometheus >=
+                                        2.36.
+                                      enum:
+                                      - replace
+                                      - Replace
+                                      - keep
+                                      - Keep
+                                      - drop
+                                      - Drop
+                                      - hashmod
+                                      - HashMod
+                                      - labelmap
+                                      - LabelMap
+                                      - labeldrop
+                                      - LabelDrop
+                                      - labelkeep
+                                      - LabelKeep
+                                      - lowercase
+                                      - Lowercase
+                                      - uppercase
+                                      - Uppercase
+                                      type: string
+                                    modulus:
+                                      description: Modulus to take of the hash of
+                                        the source label values.
+                                      format: int64
+                                      type: integer
+                                    regex:
+                                      description: Regular expression against which
+                                        the extracted value is matched. Default is
+                                        '(.*)'
+                                      type: string
+                                    replacement:
+                                      description: Replacement value against which
+                                        a regex replace is performed if the regular
+                                        expression matches. Regex capture groups are
+                                        available. Default is '$1'
+                                      type: string
+                                    separator:
+                                      description: Separator placed between concatenated
+                                        source label values. default is ';'.
+                                      type: string
+                                    sourceLabels:
+                                      description: The source labels select values
+                                        from existing labels. Their content is concatenated
+                                        using the configured separator and matched
+                                        against the configured regular expression
+                                        for the replace, keep, and drop actions.
+                                      items:
+                                        description: LabelName is a valid Prometheus
+                                          label name which may only contain ASCII
+                                          letters, numbers, as well as underscores.
+                                        pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
+                                        type: string
+                                      type: array
+                                    targetLabel:
+                                      description: Label to which the resulting value
+                                        is written in a replace action. It is mandatory
+                                        for replace actions. Regex capture groups
+                                        are available.
+                                      type: string
+                                  type: object
+                                type: array
                               override:
                                 description: Override allows customization of the
                                   created ServiceMonitor. All fields can be overritten

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -4,4 +4,4 @@ resources:
 - manager.yaml
 images:
 - name: ghcr.io/alexandrevilain/temporal-operator
-  newTag: v0.12.0
+  newTag: v0.12.1
diff --git a/config/manifests/bases/temporal-operator.clusterserviceversion.yaml b/config/manifests/bases/temporal-operator.clusterserviceversion.yaml
@@ -118,7 +118,7 @@ metadata:
       ]
     capabilities: Seamless Upgrades
     categories: Application Runtime, Developer Tools, AI/Machine Learning
-    containerImage: ghcr.io/alexandrevilain/temporal-operator:v0.12.0
+    containerImage: ghcr.io/alexandrevilain/temporal-operator:v0.12.1
     operators.operatorframework.io/builder: operator-sdk-v1.23.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
   name: temporal-operator.v0.11.2
@@ -467,7 +467,7 @@ spec:
                 - --leader-elect
                 command:
                 - /manager
-                image: ghcr.io/alexandrevilain/temporal-operator:v0.12.0
+                image: ghcr.io/alexandrevilain/temporal-operator:v0.12.1
                 livenessProbe:
                   httpGet:
                     path: /healthz

diff --git a/examples/cluster-postgres/02-temporal-cluster.yaml b/examples/cluster-postgres/02-temporal-cluster.yaml
@@ -31,17 +31,17 @@ spec:
     enabled: true
   admintools:
     enabled: true
-  metrics:
-    enabled: true
-    prometheus:
-      listenPort: 9090
-      scrapeConfig:
-        serviceMonitor:
-          enabled: true
-          metricRelabelings:
-          - sourceLabels: [__name__]
-            targetLabel: __name__
-            replacement: temporal_$1
+  # metrics:
+  #   enabled: true
+  #   prometheus:
+  #     listenPort: 9090
+  #     scrapeConfig:
+  #       serviceMonitor:
+  #         enabled: true
+  #         metricRelabelings:
+  #         - sourceLabels: [__name__]
+  #           targetLabel: __name__
+  #           replacement: temporal_$1
   dynamicConfig:
     pollInterval: 10s
     values: