Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ONPREM-665] Add base64 encoded favicon to improve UI of the helm management tools #445

Draft
wants to merge 14 commits into
base: develop
Choose a base branch
from
Draft
2 changes: 2 additions & 0 deletions charts/dgtt/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ maintainers:
- name: 2gis
url: https://github.com/2gis
email: [email protected]

icon: data:image/x-icon;base64,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
4 changes: 4 additions & 0 deletions charts/pro-ui/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,7 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{ end }}
{{- end -}}

{{- define "pro.ui.importer.hook.annotations" -}}
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
{{- end -}}
3 changes: 3 additions & 0 deletions charts/pro-ui/templates/ui/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: {{ include "pro.ui.service-account-name" . }}-role
annotations:
{{- include "pro.ui.importer.hook.annotations" $ | nindent 4 }}
"helm.sh/hook-weight": "-2"
rules:
- apiGroups:
- batch
Expand Down
3 changes: 3 additions & 0 deletions charts/pro-ui/templates/ui/rolebinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ include "pro.ui.service-account-name" . }}-binding
annotations:
{{- include "pro.ui.importer.hook.annotations" $ | nindent 4 }}
"helm.sh/hook-weight": "-1"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
Expand Down
3 changes: 3 additions & 0 deletions charts/pro-ui/templates/ui/secrets-styles-importer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ apiVersion: v1
kind: Secret
metadata:
name: {{ include "pro.ui.name" . }}-secret
annotations:
{{- include "pro.ui.importer.hook.annotations" $ | nindent 4 }}
"helm.sh/hook-weight": "-1"
type: Opaque
data:
s3AccessKey: {{ required "Valid .Values.dgctlStorage.accessKey required!" .Values.dgctlStorage.accessKey | b64enc }}
Expand Down
3 changes: 3 additions & 0 deletions charts/pro-ui/templates/ui/service-account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "pro.ui.service-account-name" . }}
annotations:
{{- include "pro.ui.importer.hook.annotations" $ | nindent 4 }}
"helm.sh/hook-weight": "-1"
{{ end }}
4 changes: 2 additions & 2 deletions charts/pro-ui/templates/ui/styles-import-starter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ kind: Job
metadata:
name: {{ include "pro.ui.styles-importer-name" . }}-starter
annotations:
"helm.sh/hook": pre-install,pre-upgrade
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
{{- include "pro.ui.importer.hook.annotations" $ | nindent 4 }}
"helm.sh/hook-weight": "1"
spec:
backoffLimit: {{ .Values.stylesImporter.backoffLimit }}
template:
Expand Down
8 changes: 4 additions & 4 deletions charts/pro-ui/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,10 @@ ui:
enabled: false
className: nginx
hosts:
- host: pro-ui.example.com
paths:
- path: /
pathType: Prefix
- host: pro-ui.example.com
paths:
- path: /
pathType: Prefix
tls: []
# - hosts:
# - pro-ui.example.com
Expand Down
Loading