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.

Sign up for GitHub

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

Jump to bottom

feat: pin version of superset in helm chart #18668

Closed
wants to merge 3 commits into from
Closed

feat: pin version of superset in helm chart #18668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4b029d
feat: pin version of superset in helm chart
ad-m Feb 11, 2022
092a6b6
chore: bump chart vesion
ad-m Feb 11, 2022
11b673c
chore(helm): bump version
ad-m Feb 17, 2022
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
4 changes: 2 additions & 2 deletions helm/superset/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
# limitations under the License.
#
apiVersion: v2
appVersion: "1.0"
appVersion: "1.4.1"
description: Apache Superset is a modern, enterprise-ready business intelligence web application
name: superset
maintainers:
- name: craig-rueda
email: craig@craigrueda.com
url: https://github.com/craig-rueda
version: 0.5.8
version: 0.5.10
dependencies:
- name: postgresql
version: 10.2.0
Expand Down
2 changes: 1 addition & 1 deletion helm/superset/templates/deployment-beat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec:
{{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion ) }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
command: {{ tpl (toJson .Values.supersetCeleryBeat.command) . }}
env:
Expand Down
2 changes: 1 addition & 1 deletion helm/superset/templates/deployment-worker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ spec:
{{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion ) }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
command: {{ tpl (toJson .Values.supersetWorker.command) . }}
env:
Expand Down
2 changes: 1 addition & 1 deletion helm/superset/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ spec:
{{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion ) }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
command: {{ tpl (toJson .Values.supersetNode.command) . }}
env:
Expand Down
2 changes: 1 addition & 1 deletion helm/superset/templates/init-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
{{- end }}
containers:
- name: {{ template "superset.name" . }}-init-db
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion ) }}"
{{- if or .Values.extraEnv .Values.extraEnvRaw }}
env:
{{- range $key, $value := .Values.extraEnv }}
Expand Down
7 changes: 2 additions & 5 deletions helm/superset/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,15 @@
"type": "string"
},
"tag": {
"type": "string"
"type": "string",
"description": "Defaults to version match to Chart.appVersion"
},
"pullPolicy": {
"$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.Container/properties/imagePullPolicy"
}
},
"required": [
"repository",
"tag",
"pullPolicy"
]
},
Expand Down Expand Up @@ -169,9 +169,6 @@
"pathType": {
"type": "string"
},
"ingressClassName": {
"$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.networking.v1.IngressSpec/properties/ingressClassName"
},
"hosts": {
"type": "array",
"items": {
Expand Down
2 changes: 1 addition & 1 deletion helm/superset/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ extraConfigMountPath: "/app/configs"

image:
repository: apache/superset
tag: latest
# tag: "v{{ $.Chart.AppVersion }}"
Copy link
Member

Choose a reason for hiding this comment

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

Can we just use this templated value? I think that adding the ability to template these fields would be useful.
i.e.:

tag: "v{{ $.Chart.AppVersion }}"

and then in deployment template, etc:

image: "{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}"

Copy link

Choose a reason for hiding this comment

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

BTW, I'm not sure that the referencing "v{{ $.Chart.AppVersion }}" will work at all, since Helm values don't support any templating besides include and template via plane YAML AFAIR

Copy link
Member

Choose a reason for hiding this comment

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

Could be, but it's worth a try :). I've found that in general, the more fields that support templating, the better.

pullPolicy: IfNotPresent

imagePullSecrets: []
Expand Down