feat: add global labels and anotations

Author: Demonsthere

hacks/values/hydra-maester/default.yaml

@@ -1,4 +1,13 @@
 ---
+global:
+  podMetadata:
+    labels:
+      ory.sh/global: "mylabel"
+    annotations:
+      ory.sh/global: |
+        {
+          "foo": "bar"
+        }
 adminService:
   name: hydra-admin.default
 deployment:

hacks/values/hydra/default.yaml

@@ -1,5 +1,13 @@
 global:
   dnsDomain: example.com
+  podMetadata:
+    labels:
+      ory.sh/global: "mylabel"
+    annotations:
+      ory.sh/global: |
+        {
+          "foo": "bar"
+        }
 
 ingress:
   admin:

hacks/values/keto/default.yaml

@@ -1,4 +1,13 @@
 ---
+global:
+  podMetadata:
+    labels:
+      ory.sh/global: "mylabel"
+    annotations:
+      ory.sh/global: |
+        {
+          "foo": "bar"
+        }
 keto:
   automigration:
     enabled: true

hacks/values/kratos/default.yaml

@@ -1,6 +1,14 @@
 ---
 global:
   dnsDomain: example.com
+  podMetadata:
+    labels:
+      ory.sh/global: "mylabel"
+    annotations:
+      ory.sh/global: |
+        {
+          "foo": "bar"
+        }
 
 autoscaling:
   enabled: true

hacks/values/oathkeeper-maester/default.yaml

@@ -1,4 +1,13 @@
 ---
+global:
+  podMetadata:
+    labels:
+      ory.sh/global: "mylabel"
+    annotations:
+      ory.sh/global: |
+        {
+          "foo": "bar"
+        }
 # singleNamespaceMode: true
 priorityClassName: "system-cluster-critical"
 deployment:

hacks/values/oathkeeper/default.yaml

@@ -1,4 +1,14 @@
 ---
+global:
+  podMetadata:
+    labels:
+      ory.sh/global: "mylabel"
+    annotations:
+      ory.sh/global: |
+        {
+          "foo": "bar"
+        }
+
 demo: false
 maester:
   enabled: false

helm/charts/example-idp/values.yaml

@@ -24,8 +24,7 @@ service:
 ingress:
   enabled: false
   className: ""
-  annotations:
-    {}
+  annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   hosts:

helm/charts/hydra-maester/README.md

@@ -51,6 +51,10 @@ A Helm chart for Kubernetes
 | deployment.topologySpreadConstraints | list | `[]` | Configure pod topologySpreadConstraints. |
 | enabledNamespaces | list | `[]` | The Controller have CREATE and READ access to all Secrets in the namespaces listed below. |
 | forwardedProto | string | `nil` |  |
+| global | object | `{"podMetadata":{"annotations":{},"labels":{}}}` | Global setting, passed down to all pods |
+| global.podMetadata | object | `{"annotations":{},"labels":{}}` | Specify pod metadata, this metadata is added directly to the pod, and not higher objects |
+| global.podMetadata.annotations | object | `{}` | Extra pod level annotations |
+| global.podMetadata.labels | object | `{}` | Extra pod level labels |
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
 | image.repository | string | `"oryd/hydra-maester"` | Ory Hydra-maester image |
 | image.tag | string | `"v0.0.38"` | Ory Hydra-maester version |

helm/charts/hydra-maester/templates/deployment.yaml

@@ -29,17 +29,23 @@ spec:
         control-plane: controller-manager
         app.kubernetes.io/name: {{ include "hydra-maester.fullname" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-        {{- with .Values.deployment.extraLabels }}
+        {{- with $.Values.deployment.extraLabels }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
-        {{- with .Values.deployment.podMetadata.labels }}
+        {{- with $.Values.deployment.podMetadata.labels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+        {{- with $.Values.global.podMetadata.labels }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
       annotations:
-        {{- with .Values.deployment.extraAnnotations }}
+        {{- with $.Values.deployment.extraAnnotations }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+        {{- with $.Values.deployment.podMetadata.annotations }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
-        {{- with .Values.deployment.podMetadata.annotations }}
+        {{- with $.Values.global.podMetadata.annotations }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:

helm/charts/hydra-maester/values.yaml

@@ -1,3 +1,12 @@
+# -- Global setting, passed down to all pods
+global:
+  # -- Specify pod metadata, this metadata is added directly to the pod, and not higher objects
+  podMetadata:
+    # -- Extra pod level labels
+    labels: {}
+    # -- Extra pod level annotations
+    annotations: {}
+
 # -- Number of replicas in deployment
 replicaCount: 1
 # -- Number of revisions kept in history
@@ -43,8 +52,7 @@ forwardedProto:
 
 ## -- Deployment specific config
 deployment:
-  resources:
-    {}
+  resources: {}
     #  We usually recommend not to specify default resources and to leave this as a conscious
     #  choice for the user. This also increases chances charts run on environments with little
     #  resources, such as Minikube. If you do want to specify resources, uncomment the following