Split broker.image into separate repository and tag fields (#243)

- Separates broker.image into broker.image.repository and broker.image.tag
- Bumps chart version to 6.0.0 (breaking change)
- Updates renovate image matcher for new schema

Author: sbs-dev1

charts/pact-broker/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: pact-broker
 description: The Pact Broker is an application for sharing for Pact contracts and verification results.
 type: application
-version: 5.5.1
+version: 6.0.0
 appVersion: 2.118.0
 dependencies:
   - name: common

charts/pact-broker/README.md

@@ -1,6 +1,6 @@
 # pact-broker
 
-![Version: 5.5.1](https://img.shields.io/badge/Version-5.5.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.118.0](https://img.shields.io/badge/AppVersion-2.118.0-informational?style=flat-square)
+![Version: 6.0.0](https://img.shields.io/badge/Version-6.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.118.0](https://img.shields.io/badge/AppVersion-2.118.0-informational?style=flat-square)
 
 The Pact Broker is an application for sharing for Pact contracts and verification results.
 
@@ -122,7 +122,9 @@ helm upgrade -i <release_name> oci://ghcr.io/pact-foundation/pact-broker-chart/p
 | broker.containerSecurityContext.runAsNonRoot | Set Pact Broker container's Security Context runAsNonRoot | bool | `true` |
 | broker.containerSecurityContext.runAsUser | Set Pact Broker container's Security Context runAsUser | int | `1001` |
 | broker.extraContainers | Additional containers to add to the Pact Broker pods | list | `[]` |
-| broker.image | Pact Broker image url | string | `"ghcr.io/pact-foundation/pact-broker:2.137.0-pactbroker2.118.0"` |
+| broker.image | Pact Broker image configuration | object | `{"repository":"ghcr.io/pact-foundation/pact-broker","tag":"2.137.0-pactbroker2.118.0"}` |
+| broker.image.repository | Pact Broker image repository | string | `"ghcr.io/pact-foundation/pact-broker"` |
+| broker.image.tag | Pact Broker image tag | string | `"2.137.0-pactbroker2.118.0"` |
 | broker.imagePullPolicy | Specify a imagePullPolicy Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' more info [here](https://kubernetes.io/docs/user-guide/images/#pre-pulling-images)  | string | `"IfNotPresent"` |
 | broker.imagePullSecrets | Array of imagePullSecrets to allow pulling the Pact Broker image from private registries. PS: Secret's must exist in the namespace to which you deploy the Pact Broker. more info [here](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/)  Example:   pullSecrets:    - mySecretName  | list | `[]` |
 | broker.labels | Additional labels that can be added to the Broker deployment | object | `{}` |
@@ -182,6 +184,10 @@ helm upgrade -i <release_name> oci://ghcr.io/pact-foundation/pact-broker-chart/p
 
 ## Configuration and Installation Details
 
+### Image Configuration
+
+> **⚠️ BREAKING CHANGE in v6.0.0:** `broker.image` is now an object with `repository` and `tag` sub-fields. The previous single-string format is still accepted for backward compatibility.
+
 ### Database Configuration
 
 > **⚠️ BREAKING CHANGE in v4.0.0:** The bundled PostgreSQL subchart has been removed due to licensing changes. You must now provide your own PostgreSQL instance.

charts/pact-broker/README.md.gotmpl

@@ -56,6 +56,10 @@ helm upgrade -i <release_name> oci://ghcr.io/pact-foundation/pact-broker-chart/p
 
 ## Configuration and Installation Details
 
+### Image Configuration
+
+> **⚠️ BREAKING CHANGE in v6.0.0:** `broker.image` is now an object with `repository` and `tag` sub-fields. The previous single-string format is still accepted for backward compatibility.
+
 ### Database Configuration
 
 > **⚠️ BREAKING CHANGE in v4.0.0:** The bundled PostgreSQL subchart has been removed due to licensing changes. You must now provide your own PostgreSQL instance.

charts/pact-broker/templates/_helpers.tpl

@@ -29,7 +29,11 @@ This allows us to not have image: .Values.xxxx.ssss/.Values.xxx.xxx:.Values.ssss
 in every single template.
 */}}
 {{- define "broker.image" -}}
+{{- if kindIs "string" .Values.broker.image -}}
 {{- .Values.broker.image -}}
+{{- else -}}
+{{- printf "%s:%s" .Values.broker.image.repository .Values.broker.image.tag -}}
+{{- end -}}
 {{- end -}}
 
 {{/*

charts/pact-broker/values.yaml

@@ -1,8 +1,12 @@
 # Broker configuration
 broker:
 
-  # -- Pact Broker image url
-  image: ghcr.io/pact-foundation/pact-broker:2.137.0-pactbroker2.118.0
+  # -- Pact Broker image configuration
+  image:
+    # -- Pact Broker image repository
+    repository: ghcr.io/pact-foundation/pact-broker
+    # -- Pact Broker image tag
+    tag: 2.137.0-pactbroker2.118.0
 
   # -- Specify a imagePullPolicy
   # Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'

renovate.json

@@ -23,10 +23,9 @@
         "charts/pact-broker/values\\.yaml"
       ],
       "matchStrings": [
-        "image: ghcr\\.io/pact-foundation/pact-broker:(?<currentValue>[0-9]+\\.[0-9]+\\.[0-9]+-pactbroker[0-9]+\\.[0-9]+\\.[0-9]+)"
+        "repository:\\s*(?<depName>ghcr\\.io/pact-foundation/pact-broker)\\s*\\n(?:\\s*#.*\\n)*\\s*tag:\\s*(?<currentValue>[^\\s]+)"
       ],
       "datasourceTemplate": "docker",
-      "packageNameTemplate": "ghcr.io/pact-foundation/pact-broker",
       "versioningTemplate": "loose"
     }
   ]