From afdb4b21a392d906d3437013faba0ec7852fb905 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Fri, 24 Dec 2021 00:34:40 +0100
Subject: [PATCH] [Chart] Fix service selectors for multiple linkups

---
 CHANGELOG.md                                | 7 +++++++
 charts/k8s-linkup/Chart.yaml                | 8 ++++----
 charts/k8s-linkup/templates/deployment.yaml | 1 +
 charts/k8s-linkup/templates/service.yaml    | 1 +
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 381589a..fd60247 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project 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).
 
+## [2.2.1] - 2021-12-23
+
+### Fixed
+
+- \[Chart\] Fix service selectors for multiple linkups
+
 ## [2.2.0] - 2021-12-23
 
 ### Added
@@ -64,6 +70,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial release
 
+[2.2.1]: https://edugit.org/AlekSIS/libs/k8s-linkup/-/tags/2.2.1
 [2.2.0]: https://edugit.org/AlekSIS/libs/k8s-linkup/-/tags/2.2.0
 [2.1.3]: https://edugit.org/AlekSIS/libs/k8s-linkup/-/tags/2.1.3
 [2.1.2]: https://edugit.org/AlekSIS/libs/k8s-linkup/-/tags/2.1.2
diff --git a/charts/k8s-linkup/Chart.yaml b/charts/k8s-linkup/Chart.yaml
index f2503bd..f92a52f 100644
--- a/charts/k8s-linkup/Chart.yaml
+++ b/charts/k8s-linkup/Chart.yaml
@@ -11,8 +11,8 @@ annotations:
   artifacthub.io/screenshots: |
     - title: k8s-linkup running with OpenVPN backend in k9s
       url: https://edugit.org/AlekSIS/libs/k8s-linkup/-/raw/master/screenshot.webp
-  artifacthub.io/changes: |
-    - Allow configuration of timeouts per linkup and per port mapping
+  artifacthub.io/changes:
+    - Fix service selectors for multiple linkups
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -27,9 +27,9 @@ 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: 2.2.0
+version: 2.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
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 2.2.0
+appVersion: 2.2.1
diff --git a/charts/k8s-linkup/templates/deployment.yaml b/charts/k8s-linkup/templates/deployment.yaml
index 2bb66ac..e8c0b3e 100644
--- a/charts/k8s-linkup/templates/deployment.yaml
+++ b/charts/k8s-linkup/templates/deployment.yaml
@@ -17,6 +17,7 @@ spec:
         {{- toYaml . | nindent 8 }}
     {{- end }}
       labels:
+        aleksis.edugit.io/k8s-linkup-name: {{ .name }}
         {{- include "k8s-linkup.selectorLabels" $ | nindent 8 }}
     spec:
       {{- with $.Values.imagePullSecrets }}
diff --git a/charts/k8s-linkup/templates/service.yaml b/charts/k8s-linkup/templates/service.yaml
index d19f5b1..2b16148 100644
--- a/charts/k8s-linkup/templates/service.yaml
+++ b/charts/k8s-linkup/templates/service.yaml
@@ -16,6 +16,7 @@ spec:
       name: {{ .name }}
     {{- end }}
   selector:
+    aleksis.edugit.io/k8s-linkup-name: {{ .name }}
     {{- include "k8s-linkup.selectorLabels" $ | nindent 4 }}
 ---
 {{- end }}
-- 
GitLab