From 073d3a8405054e05c228b2f9c9e691a9f3ed5442 Mon Sep 17 00:00:00 2001
From: Bernd Schorgers <me@bjw-s.dev>
Date: Tue, 30 Jul 2024 10:44:08 +0200
Subject: [PATCH] fix(common): Release v3.3.1

---
 .../common-test/tests/service/values_test.yaml  | 17 +++++++++++++++++
 charts/library/common/Chart.yaml                |  4 ++--
 charts/library/common/README.md                 |  4 ++--
 .../common/templates/classes/_service.tpl       |  5 +++++
 charts/library/common/values.schema.json        |  2 +-
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/charts/library/common-test/tests/service/values_test.yaml b/charts/library/common-test/tests/service/values_test.yaml
index 9d3e02a8..7dea1fa9 100644
--- a/charts/library/common-test/tests/service/values_test.yaml
+++ b/charts/library/common-test/tests/service/values_test.yaml
@@ -106,3 +106,20 @@ tests:
         equal:
           path: spec.allocateLoadBalancerNodePorts
           value: false
+
+  - it: externalName should pass for ExternalName service
+    values:
+      - ../_values/service_main_default.yaml
+    set:
+      service:
+        main:
+          type: ExternalName
+          externalName: my.database.example.com
+    asserts:
+      - documentIndex: &ServiceDocument 1
+        isKind:
+          of: Service
+      - documentIndex: *ServiceDocument
+        equal:
+          path: spec.externalName
+          value: my.database.example.com
diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index 22636643..74b44590 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 name: common
 description: Function library for Helm charts
 type: library
-version: 3.3.0
+version: 3.3.1
 kubeVersion: ">=1.22.0-0"
 keywords:
   - common
@@ -25,7 +25,7 @@ annotations:
         Added `persistentVolumeClaimRetentionPolicy` field to statefulset spec.
     - kind: fixed
       description: |-
-        Added `externalName` field to service schema.
+        Added `externalName` field to service schema. (fixed in v3.3.1)
     - kind: fixed
       description: |-
         Always allow specifying `nodePort` field on service ports.
diff --git a/charts/library/common/README.md b/charts/library/common/README.md
index a00b4039..c5543104 100644
--- a/charts/library/common/README.md
+++ b/charts/library/common/README.md
@@ -1,6 +1,6 @@
 # common
 
-![Version: 3.3.0](https://img.shields.io/badge/Version-3.3.0-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
+![Version: 3.3.1](https://img.shields.io/badge/Version-3.3.1-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
 
 Function library for Helm charts
 
@@ -27,7 +27,7 @@ Include this chart as a dependency in your `Chart.yaml` e.g.
 # Chart.yaml
 dependencies:
   - name: common
-    version: 3.3.0
+    version: 3.3.1
     repository: https://bjw-s.github.io/helm-charts/
 ```
 
diff --git a/charts/library/common/templates/classes/_service.tpl b/charts/library/common/templates/classes/_service.tpl
index efcee403..3517506d 100644
--- a/charts/library/common/templates/classes/_service.tpl
+++ b/charts/library/common/templates/classes/_service.tpl
@@ -49,6 +49,11 @@ spec:
   loadBalancerSourceRanges:
     {{ toYaml $serviceObject.loadBalancerSourceRanges | nindent 4 }}
   {{- end -}}
+  {{- else if eq $svcType "ExternalName" }}
+  type: {{ $svcType }}
+  {{- if $serviceObject.externalName }}
+  externalName: {{ $serviceObject.externalName }}
+  {{- end }}
   {{- else }}
   type: {{ $svcType }}
   {{- end }}
diff --git a/charts/library/common/values.schema.json b/charts/library/common/values.schema.json
index 17f0cd1e..d4b4f643 100644
--- a/charts/library/common/values.schema.json
+++ b/charts/library/common/values.schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
-  "$id": "https://raw.githubusercontent.com/bjw-s/helm-charts/common-3.3.0/charts/library/common/values.schema.json",
+  "$id": "https://raw.githubusercontent.com/bjw-s/helm-charts/common-3.3.1/charts/library/common/values.schema.json",
 
   "type": "object",
   "properties": {