Merge "Magnum: Enable custom annotations"

magnum/Chart.yaml

@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Magnum
 name: magnum
-version: 0.2.10
+version: 0.2.11
 home: https://docs.openstack.org/magnum/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Magnum/OpenStack_Project_Magnum_vertical.png
 sources:

magnum/templates/deployment-api.yaml

@@ -43,6 +43,7 @@ spec:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
+{{ tuple "magnum_api" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
       affinity:

magnum/values_overrides/annotations.yaml

@@ -0,0 +1,9 @@
+---
+annotations:
+  pod:
+    default:
+      custom.tld/key: "value"
+      custom.tld/key2: "value2"
+    magnum_api:
+      another.tld/foo: "bar"
+...

releasenotes/notes/magnum.yaml

@@ -14,4 +14,5 @@ magnum:
   - 0.2.8 Remove default policy rules
   - 0.2.9 Define service_type in keystone_authtoken to support application credentials with access rules
   - 0.2.10 Uses uWSGI for API service
+  - 0.2.11 Enable custom annotations for Openstack pods
 ...