openstack/openstack-helm
Code Issues Proposed changes

Octavia: Enable custom annotations

Browse Source 
Enable custom annotations for pods [deployments, daemonsets]

Change-Id: I41df99691bf80878bb393f0b5e131cfdba890d6a
This commit is contained in:
Tadas Sutkaitis 2024-04-01 23:22:39 +03:00
parent f30931d026
commit bb049d9ee1
No known key found for this signature in database
GPG Key ID: C123CD627D02FD57
7 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octavia/Chart.yaml
View File

@ -16,7 +16,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Octavia description: OpenStack-Helm Octavia
name: octavia name: octavia
version: 0.2.11 version: 0.2.12
home: https://docs.openstack.org/octavia/latest/ home: https://docs.openstack.org/octavia/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Octavia/OpenStack_Project_Octavia_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Octavia/OpenStack_Project_Octavia_vertical.png
sources: sources:

1
octavia/templates/daemonset-health-manager.yaml
View File

@ -45,6 +45,7 @@ spec:
annotations: annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
{{ tuple "octavia_health_manager" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
spec: spec:
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet

1
octavia/templates/deployment-api.yaml
View File

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

1
octavia/templates/deployment-housekeeping.yaml
View File

@ -44,6 +44,7 @@ spec:
annotations: annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
{{ tuple "octavia_housekeeping" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
spec: spec:
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet

1
octavia/templates/deployment-worker.yaml
View File

@ -44,6 +44,7 @@ spec:
annotations: annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
{{ tuple "octavia_worker" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
spec: spec:
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet

9
octavia/values_overrides/annotations.yaml Normal file
View File

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

1
releasenotes/notes/octavia.yaml
View File

@ -15,4 +15,5 @@ octavia:
- 0.2.9 Use default timeout and retry configs for haproxy_amphora - 0.2.9 Use default timeout and retry configs for haproxy_amphora
- 0.2.10 Fix generating health_manager Role and RoleBinding - 0.2.10 Fix generating health_manager Role and RoleBinding
- 0.2.11 Uses uWSGI for API service - 0.2.11 Uses uWSGI for API service
- 0.2.12 Enable custom annotations for Openstack pods
... ...