[common] Release common 4.0.1 (#90)

* fix: include custom ingress labels
k8s-at-home · Sep 15, 2021 · bfd8402 · bfd8402
1 parent 5a05c6c
commit bfd8402
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/charts/stable/common/Chart.yaml b/charts/stable/common/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: common
 description: Function library for k8s-at-home charts
 type: library
-version: 4.0.0
+version: 4.0.1
 kubeVersion: ">=1.16.0-0"
 keywords:
   - k8s-at-home

diff --git a/charts/stable/common/README.md b/charts/stable/common/README.md
@@ -1,6 +1,6 @@
 # common
 
-![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
+![Version: 4.0.1](https://img.shields.io/badge/Version-4.0.1-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
 
 Function library for k8s-at-home charts
 
@@ -211,6 +211,12 @@ All notable changes to this library Helm chart will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [4.0.1]
+
+#### Fixed
+
+- Fixed an issue where users weren't able to set custom ingress labels.
+
 ### [4.0.0]
 
 #### Added

diff --git a/charts/stable/common/README_CHANGELOG.md.gotmpl b/charts/stable/common/README_CHANGELOG.md.gotmpl
@@ -10,6 +10,12 @@ All notable changes to this library Helm chart will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [4.0.1]
+
+#### Fixed
+
+- Fixed an issue where users weren't able to set custom ingress labels.
+
 ### [4.0.0]
 
 #### Added

diff --git a/charts/stable/common/templates/classes/_ingress.tpl b/charts/stable/common/templates/classes/_ingress.tpl
@@ -31,6 +31,9 @@ metadata:
   name: {{ $ingressName }}
   labels:
     {{- include "common.labels" . | nindent 4 }}
+    {{- with $values.labels }}
+       {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with $values.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/charts/stable/common/templates/classes/_service.tpl b/charts/stable/common/templates/classes/_service.tpl
@@ -23,9 +23,9 @@ metadata:
   name: {{ $serviceName }}
   labels:
     {{- include "common.labels" . | nindent 4 }}
-  {{- if $values.labels }}
-    {{ toYaml $values.labels | nindent 4 }}
-  {{- end }}
+    {{- with $values.labels }}
+       {{- toYaml . | nindent 4 }}
+    {{- end }}
   annotations:
   {{- if eq ( $primaryPort.protocol | default "" ) "HTTPS" }}
     traefik.ingress.kubernetes.io/service.serversscheme: https