Support annotatiosn for services (#130)

* Support annotatiosn for services * Fix comment Co-authored-by: Hans Kristian Flaatten <hans.flaatten@tietoevry.com> * Update libchart/templates/_service.tpl Co-authored-by: Hans Kristian Flaatten <hans.flaatten@tietoevry.com> Co-authored-by: Hans Kristian Flaatten <hans.flaatten@tietoevry.com>
evry-ace · Jan 19, 2022 · f653908 · f653908
1 parent 287c6f1
commit f653908
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 11 deletions.
diff --git a/dotnet/Chart.yaml b/dotnet/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 description: .NET Core Helm Chart
 name: dotnet
-version: 9.0.0
+version: 9.1.0
 dependencies:
   - name: libchart
-    version: 0.1.0
+    version: 0.2.0
     repository: file://../libchart
diff --git a/dotnet/values.yaml b/dotnet/values.yaml
@@ -122,6 +122,7 @@ service:
   targetPort: 8080
   name: http
   extraPorts: []
+  annotations: {}
 
 # Ingress
 ingress:

diff --git a/golang/Chart.yaml b/golang/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 description: golan Helm Chart
 name: golang
-version: 13.0.0
+version: 13.1.0
 dependencies:
   - name: libchart
-    version: 0.1.0
+    version: 0.2.0
     repository: file://../libchart
diff --git a/golang/values.yaml b/golang/values.yaml
@@ -122,6 +122,7 @@ service:
   targetPort: 8080
   name: http
   extraPorts: []
+  annotations: {}
 
 # Ingress
 ingress:

diff --git a/java/Chart.yaml b/java/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 description: Java Helm Chart
 name: java
-version: 6.0.0
+version: 6.1.0
 dependencies:
   - name: libchart
-    version: 0.1.0
+    version: 0.2.0
     repository: file://../libchart
diff --git a/java/values.yaml b/java/values.yaml
@@ -122,6 +122,7 @@ service:
   targetPort: 8080
   name: http
   extraPorts: []
+  annotations: {}
 
 # Ingress
 ingress:

diff --git a/libchart/Chart.yaml b/libchart/Chart.yaml
@@ -15,7 +15,7 @@ type: library
 # 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: 0.1.0
+version: 0.2.0
 
 # 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

diff --git a/libchart/templates/_service.tpl b/libchart/templates/_service.tpl
@@ -5,6 +5,10 @@ metadata:
   name: {{ template "libchart.name" . }}
   labels:
     {{- include "libchart.labels" . | nindent 4 }}
+{{- if .Values.service.annotations }}
+  annotations:
+  {{ toYaml .Values.service.annotations | nindent 4 }}
+{{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:

diff --git a/libchart/values.yaml b/libchart/values.yaml
@@ -123,6 +123,7 @@ service:
   targetPort: 8080
   name: http
   extraPorts: []
+  annotations: {}
 
 # Ingress
 ingress:

diff --git a/nodejs/Chart.yaml b/nodejs/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 description: Node.js Helm Chart
 name: nodejs
-version: 13.0.0
+version: 13.1.0
 dependencies:
   - name: libchart
-    version: 0.1.0
+    version: 0.2.0
     repository: file://../libchart
diff --git a/nodejs/values.yaml b/nodejs/values.yaml
@@ -122,6 +122,7 @@ service:
   targetPort: 8080
   name: http
   extraPorts: []
+  annotations: {}
 
 # Ingress
 ingress:

diff --git a/web/Chart.yaml b/web/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 appVersion: "1.0"
 description: Helm chart for deployment of web servers
 name: web
-version: 10.0.0
+version: 10.1.0
 dependencies:
   - name: libchart
-    version: 0.1.0
+    version: 0.2.0
     repository: file://../libchart
diff --git a/web/values.yaml b/web/values.yaml
@@ -122,6 +122,7 @@ service:
   targetPort: 8080
   name: http
   extraPorts: []
+  annotations: {}
 
 # Ingress
 ingress: