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

Use lakefs-enterprise in lakefs charts #314

Merged
merged 4 commits into from
Feb 10, 2025
Merged

Use lakefs-enterprise in lakefs charts #314

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
30d9428
Release chart 1.3.33
N-o-Z Feb 5, 2025
ae3d1e3
Merge remote-tracking branch 'origin/master' into task/add-lakefs-ent…
N-o-Z Feb 6, 2025
5ed962d
Release chart 1.4.0
N-o-Z Feb 6, 2025
6faffef
PR Fixes
N-o-Z Feb 10, 2025
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
2 changes: 1 addition & 1 deletion charts/lakefs/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: lakefs
description: A Helm chart for running LakeFS on Kubernetes
type: application
version: 1.3.33
version: 1.4.0
appVersion: 1.49.1

home: https://lakefs.io
Expand Down
18 changes: 18 additions & 0 deletions charts/lakefs/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,21 @@ Create the name of the service account to use
{{- default "default" .Values.serviceAccount.name }}
{{- end }}
{{- end }}

{{/*
Define which repository to use according to the following:
1. Explicitly defined
2. Otherwise if fluffy is enabled - take enterprise image
3. Otherwise use OSS image
*/}}
{{- define "lakefs.repository" -}}
{{- if not .Values.image.repository }}
{{- if (.Values.fluffy).enabled }}
{{- default "treeverse/lakefs-enterprise" .Values.image.repository }}
{{- else }}
{{- default "treeverse/lakefs" .Values.image.repository }}
{{- end }}
{{- else }}
{{- default .Values.image.repository }}
{{- end }}
{{- end }}
12 changes: 11 additions & 1 deletion charts/lakefs/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@ spec:
labels:
{{- include "lakefs.selectorLabels" . | nindent 8 }}
spec:
{{- if eq ( include "lakefs.fullname" .) "treeverse/lakefs-enterprise" }}
{{- if (.Values.fluffy.image.privateRegistry).enabled }}
imagePullSecrets:
{{- if (.Values.fluffy.image.privateRegistry).secretToken }}
- name: "docker-registry"
{{- else }}
- name: {{ .Values.fluffy.image.privateRegistry.secretName }}
{{- end }}
{{- end }}
{{- end }}
serviceAccountName: {{ include "lakefs.serviceAccountName" . }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
Expand All @@ -31,7 +41,7 @@ spec:
{{- end }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
image: "{{ include "lakefs.repository" . }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- name: http
Expand Down
1 change: 0 additions & 1 deletion charts/lakefs/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
replicaCount: 1

image:
repository: treeverse/lakefs
pullPolicy: IfNotPresent

nameOverride: ""
Expand Down
Loading