Use lakefs-enterprise in lakefs charts (#314)

treeverse · Feb 10, 2025 · ee76f4e · ee76f4e
1 parent dff8d8d
commit ee76f4e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/charts/lakefs/Chart.yaml b/charts/lakefs/Chart.yaml
@@ -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

diff --git a/charts/lakefs/templates/_helpers.tpl b/charts/lakefs/templates/_helpers.tpl
@@ -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 }}
diff --git a/charts/lakefs/templates/deployment.yaml b/charts/lakefs/templates/deployment.yaml
@@ -19,6 +19,16 @@ spec:
       labels:
         {{- include "lakefs.selectorLabels" . | nindent 8 }}
     spec:
+      {{- if eq ( include "lakefs.repository" .) "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 }}
@@ -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

diff --git a/charts/lakefs/values.yaml b/charts/lakefs/values.yaml
@@ -5,7 +5,6 @@
 replicaCount: 1
 
 image:
-  repository: treeverse/lakefs
   pullPolicy: IfNotPresent
 
 nameOverride: ""