Cyborg: Enable custom annotations
Enable custom annotations for pods [deployments, daemonsets] Change-Id: Ie81ad2f8ad184549ad464bf5993294ca361ef1e9
This commit is contained in:
parent
dcc80fb3e7
commit
af62b18599
@ -14,7 +14,7 @@ apiVersion: v1
|
|||||||
appVersion: v1.0.0
|
appVersion: v1.0.0
|
||||||
description: OpenStack-Helm Cyborg
|
description: OpenStack-Helm Cyborg
|
||||||
name: cyborg
|
name: cyborg
|
||||||
version: 0.1.3
|
version: 0.1.4
|
||||||
home: https://docs.openstack.org/cyborg
|
home: https://docs.openstack.org/cyborg
|
||||||
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cyborg/OpenStack_Project_Cyborg_vertical.png
|
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cyborg/OpenStack_Project_Cyborg_vertical.png
|
||||||
sources:
|
sources:
|
||||||
|
@ -43,6 +43,7 @@ spec:
|
|||||||
annotations:
|
annotations:
|
||||||
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
|
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
|
||||||
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
|
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
|
||||||
|
{{ tuple "cyborg_agent" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
|
||||||
spec:
|
spec:
|
||||||
serviceAccountName: {{ $serviceAccountName }}
|
serviceAccountName: {{ $serviceAccountName }}
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
|
@ -43,6 +43,7 @@ spec:
|
|||||||
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
|
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
|
||||||
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 "cyborg_api" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
|
||||||
{{ dict "envAll" $envAll "podName" "cyborg-api" "containerNames" (list "cyborg" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
|
{{ dict "envAll" $envAll "podName" "cyborg-api" "containerNames" (list "cyborg" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
|
||||||
spec:
|
spec:
|
||||||
serviceAccountName: {{ $serviceAccountName }}
|
serviceAccountName: {{ $serviceAccountName }}
|
||||||
|
@ -43,6 +43,7 @@ spec:
|
|||||||
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
|
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
|
||||||
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 "cyborg_conductor" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
|
||||||
{{ dict "envAll" $envAll "podName" "cyborg-conductor" "containerNames" (list "cyborg-conductor" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
|
{{ dict "envAll" $envAll "podName" "cyborg-conductor" "containerNames" (list "cyborg-conductor" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
|
||||||
spec:
|
spec:
|
||||||
serviceAccountName: {{ $serviceAccountName }}
|
serviceAccountName: {{ $serviceAccountName }}
|
||||||
|
9
cyborg/values_overrides/annotations.yaml
Normal file
9
cyborg/values_overrides/annotations.yaml
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
---
|
||||||
|
annotations:
|
||||||
|
pod:
|
||||||
|
default:
|
||||||
|
custom.tld/key: "value"
|
||||||
|
custom.tld/key2: "value2"
|
||||||
|
cyborg_api:
|
||||||
|
another.tld/foo: "bar"
|
||||||
|
...
|
@ -4,4 +4,5 @@ cyborg:
|
|||||||
- 0.1.1 Migrated PodDisruptionBudget resource to policy/v1 API version
|
- 0.1.1 Migrated PodDisruptionBudget resource to policy/v1 API version
|
||||||
- 0.1.2 Added OCI registry authentication
|
- 0.1.2 Added OCI registry authentication
|
||||||
- 0.1.3 Define service_type in keystone_authtoken to support application credentials with access rules
|
- 0.1.3 Define service_type in keystone_authtoken to support application credentials with access rules
|
||||||
|
- 0.1.4 Enable custom annotations for Openstack pods
|
||||||
...
|
...
|
||||||
|
Loading…
Reference in New Issue
Block a user