Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions helm/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ limits:
{{- end }}
{{- end }}


{{/*
Define labels for cache server and its service
*/}}
Expand Down
4 changes: 4 additions & 0 deletions helm/templates/deployment-router.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ spec:
metadata:
labels:
{{- include "chart.routerLabels" . | nindent 8 }}
{{- with .Values.routerSpec.podAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
serviceAccountName: {{ .Release.Name }}-router-service-account
{{- if .Values.routerSpec.priorityClassName }}
Expand Down
6 changes: 6 additions & 0 deletions helm/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,12 @@
"type": "string"
}
}
},
"podAnnotations": {
"type": "object",
"additionalProperties": {
"type": "string"
}
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,9 @@ routerSpec:
environment: "router"
release: "router"

# -- Customized pod annotations for the router pods
podAnnotations: {}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does service need annotation under some conditions too? If there is a possibility, would it be better to make this annotation more general to service too?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are only 2 annotations that are Service specific in istio so far and one that is global to any resource.

I can add another property serviceAnnotations but I don't think they should be shared for all annoation.

What do you want me to do ?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. If there is no need right now for serviceAnnotation, then it is okay to leave it like this. Could you add this new field to the helm readme values section?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Voilà


ingress:
# -- Enable ingress controller resource
enabled: false
Expand Down