feat(charts)!: helm support for custom annotations and serviceAccount #1741
Conversation
mo-auto
added
comp-charts-flex
|
There was a problem hiding this comment.
I think there is a misunderstanding here. The custom annotations are per resource per service. You shouldn’t be applying the same custom annotations for every resource.
Per deployment, per configMap, per secrets, per service. For the gluu-all-in-one this is easier since its one service. For the microservices chart you need to add them per service under the global key depending on what resources are there for each service. Forexample, taking auth-server you have 7different resources that need to have custom annotations. Each service(sub chart) might have a different number of resources that need custom annotations.
global:
auth-server:
# — Add custom annotations for kubernetes resources for the auth server service
customAnnotations:
destinationRule:
podDisruptionBudget:
virtualService:
deployment:
horizontalPodAutoscaler:
service:
secret:
| {{ toYaml .Values.additionalAnnotations | indent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.customAnnotations.configMaps }} |
There was a problem hiding this comment.
only the configMap . These annotations are per resource so here you would just add the annoatation for the configmap only not both secrets and configmaps otherwise the additionalAnnotations would suffice
| {{- if .Values.additionalAnnotations }} | ||
| {{ toYaml .Values.additionalAnnotations | indent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.customAnnotations.configMaps }} |
There was a problem hiding this comment.
same comment as before but this time this shouuld be customAnnotations.cronjobs not certmanager or secret. Per resource
| {{- if .Values.customAnnotations.configMaps }} | ||
| {{ toYaml .Values.customAnnotations.configMaps | indent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.customAnnotations.secrets }} | ||
| {{ toYaml .Values.customAnnotations.secrets | indent 4 }} | ||
| {{- end }} | ||
| {{- end }} |
There was a problem hiding this comment.
same comment as before . it should be customAnnotations.deployment
…uFederation/flex into feat-flex-helm-customization
This reverts commit 9afb0ab.
charts/gluu-all-in-one/values.yaml
Outdated
| destinationRule: {} | ||
| horizontalPodAutoscaler: {} | ||
| gateway: {} | ||
| ingress: {} |
There was a problem hiding this comment.
Please review all ingresses as per ingress additional annotations exist which means this is a duplicate. Same goes for the microservices chart
Signed-off-by: moabu <47318409+moabu@users.noreply.github.com>
remove duplicate ingress and move them under their respective service
| {{- if index .Values "auth-server" "ingress" "authServerLabels" }} | ||
| {{ toYaml (index .Values "auth-server" "ingress" "authServerLabels") | indent 4 }} | ||
| {{- end }} |
There was a problem hiding this comment.
this is a duplicate and wrong entry that should be removed. This is not the auth -server service .
| {{- if index .Values "auth-server" "ingress" "webfingerAdditionalAnnotations" }} | ||
| {{ toYaml (index .Values "auth-server" "ingress" "webfingerAdditionalAnnotations") | indent 4 }} | ||
| {{- end }} |
moabu
changed the title
|
closes #1740
This introduces breaking changes to the helm chart as it:
PLEASE BE ADVISED.