Merge pull request #52 from foomo/squadron-pod-labels

feat(squadron): add podlabels
foomo · Dec 12, 2024 · 4359545 · 4359545
2 parents 776d241 + dee9d5b
commit 4359545
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 6 deletions.
diff --git a/charts/squadron-keel-server/Chart.yaml b/charts/squadron-keel-server/Chart.yaml
@@ -15,5 +15,5 @@ annotations:
     - name: Chart Source
       url: https://github.com/foomo/helm-charts
 
-version: 0.1.15
-appVersion: 0.1.15
+version: 0.1.16
+appVersion: 0.1.16
diff --git a/charts/squadron-keel-server/README.md b/charts/squadron-keel-server/README.md
@@ -1,6 +1,6 @@
 # squadron-keel-server
 
-![Version: 0.1.15](https://img.shields.io/badge/Version-0.1.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.15](https://img.shields.io/badge/AppVersion-0.1.15-informational?style=flat-square)
+![Version: 0.1.16](https://img.shields.io/badge/Version-0.1.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.16](https://img.shields.io/badge/AppVersion-0.1.16-informational?style=flat-square)
 
 Squadron Keel Server Chart
 
@@ -170,6 +170,7 @@ Squadron Keel Server Chart
 | server.hostAliases | list | `[]` | Host aliases |
 | server.livenessProbe | object | `{"httpGet":{"path":"/healthz/liveness","port":"healthz"}}` | Liveness probe settings |
 | server.podAnnotations | object | `{}` | Pod annotations |
+| server.podLabels | object | `{}` | Pod labels |
 | server.readinessProbe | object | `{"httpGet":{"path":"/healthz/readiness","port":"healthz"}}` | Readiness probe settings |
 | server.resources | object | `{}` | Resource settings |
 | server.startupProbe | object | `{"httpGet":{"path":"/healthz/startup","port":"healthz"}}` | Startup probe settings |

diff --git a/charts/squadron-keel-server/templates/deployment.yaml b/charts/squadron-keel-server/templates/deployment.yaml
@@ -25,6 +25,9 @@ spec:
       labels:
         {{- include "keel.server.labels" . | nindent 8 }}
         {{- include "keel.server.networkingLabels" . | nindent 8 }}
+        {{- with .Values.server.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
         {{- include "keel.server.annotations.recreatePod" . | nindent 8 }}
         {{- with .Values.server.podAnnotations }}

diff --git a/charts/squadron-keel-server/values.schema.json b/charts/squadron-keel-server/values.schema.json
@@ -932,6 +932,13 @@
           "title": "podAnnotations",
           "type": "object"
         },
+        "podLabels": {
+          "additionalProperties": true,
+          "description": "Pod labels",
+          "required": [],
+          "title": "podLabels",
+          "type": "object"
+        },
         "readinessProbe": {
           "additionalProperties": true,
           "description": "Readiness probe settings",

diff --git a/charts/squadron-keel-server/values.yaml b/charts/squadron-keel-server/values.yaml
@@ -473,6 +473,13 @@ server:
   # @section -- Server
   podAnnotations: { }
   # @schema
+  # type: object
+  # additionalProperties: true
+  # @schema
+  # -- Pod labels
+  # @section -- Server
+  podLabels: { }
+  # @schema
   # type: array
   # items:
   #   type: object

diff --git a/charts/squadron-nextjs-server/Chart.yaml b/charts/squadron-nextjs-server/Chart.yaml
@@ -14,5 +14,5 @@ annotations:
     - name: Chart Source
       url: https://github.com/foomo/helm-charts/tree/main/charts/squadron-nextjs-server
 
-version: 0.1.9
-appVersion: 0.1.9
+version: 0.1.10
+appVersion: 0.1.10
diff --git a/charts/squadron-nextjs-server/README.md b/charts/squadron-nextjs-server/README.md
@@ -1,6 +1,6 @@
 # squadron-nextjs-server
 
-![Version: 0.1.9](https://img.shields.io/badge/Version-0.1.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.9](https://img.shields.io/badge/AppVersion-0.1.9-informational?style=flat-square)
+![Version: 0.1.10](https://img.shields.io/badge/Version-0.1.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.10](https://img.shields.io/badge/AppVersion-0.1.10-informational?style=flat-square)
 
 Squadron NextJS Server Chart
 
@@ -178,6 +178,7 @@ Squadron NextJS Server Chart
 | server.hostAliases | list | `[]` | Host aliases |
 | server.livenessProbe | object | `{"tcpSocket":{"port":3000}}` | Liveness probe settings |
 | server.podAnnotations | object | `{}` | Pod annotations |
+| server.podLabels | object | `{}` | Pod labels |
 | server.readinessProbe | object | `{"tcpSocket":{"port":3000}}` | Readiness probe settings |
 | server.resources | object | `{}` | Resource settings |
 | server.startupProbe | object | `{"tcpSocket":{"port":3000}}` | Startup probe settings |

diff --git a/charts/squadron-nextjs-server/templates/deployment.yaml b/charts/squadron-nextjs-server/templates/deployment.yaml
@@ -25,6 +25,9 @@ spec:
       labels:
         {{- include "nextjs.server.labels" . | nindent 8 }}
         {{- include "nextjs.server.networkingLabels" . | nindent 8 }}
+        {{- with .Values.server.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
         {{- include "nextjs.server.annotations.recreatePod" . | nindent 8 }}
         {{- with .Values.server.podAnnotations }}

diff --git a/charts/squadron-nextjs-server/values.schema.json b/charts/squadron-nextjs-server/values.schema.json
@@ -959,6 +959,13 @@
           "title": "podAnnotations",
           "type": "object"
         },
+        "podLabels": {
+          "additionalProperties": true,
+          "description": "Pod labels",
+          "required": [],
+          "title": "podLabels",
+          "type": "object"
+        },
         "readinessProbe": {
           "additionalProperties": true,
           "description": "Readiness probe settings",

diff --git a/charts/squadron-nextjs-server/values.yaml b/charts/squadron-nextjs-server/values.yaml
@@ -464,6 +464,13 @@ server:
   # @section -- Server
   podAnnotations: { }
   # @schema
+  # type: object
+  # additionalProperties: true
+  # @schema
+  # -- Pod labels
+  # @section -- Server
+  podLabels: { }
+  # @schema
   # type: array
   # items:
   #   type: object