diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ef17ebb..f3f1fad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,6 @@ on: push: branches: [master] pull_request: - branches: [] jobs: lint: runs-on: ubuntu-latest @@ -29,10 +28,10 @@ jobs: - name: Create kind cluster uses: helm/kind-action@v1.0.0 # Only build a kind cluster if there are chart changes to test. - if: ${{ steps.list-changed.outputs.changed == 'true' && github.event_name == 'push' }} + if: ${{ steps.list-changed.outputs.changed == 'true' }} - name: Run chart-testing (install) run: ct install - if: ${{ steps.list-changed.outputs.changed == 'true' && github.event_name == 'push' }} + if: ${{ steps.list-changed.outputs.changed == 'true' }} release: runs-on: ubuntu-latest needs: lint diff --git a/charts/lakefs/Chart.yaml b/charts/lakefs/Chart.yaml index 295e5d9..c509bfb 100644 --- a/charts/lakefs/Chart.yaml +++ b/charts/lakefs/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: lakefs description: A Helm chart for Kubernetes type: application -version: 0.4.3 +version: 0.4.4 appVersion: 0.16.2 home: https://lakefs.io diff --git a/charts/lakefs/ci/empty-values.yaml b/charts/lakefs/ci/empty-values.yaml new file mode 100644 index 0000000..e69de29 diff --git a/charts/lakefs/ci/secret-values.yaml b/charts/lakefs/ci/secret-values.yaml new file mode 100644 index 0000000..8b4fed1 --- /dev/null +++ b/charts/lakefs/ci/secret-values.yaml @@ -0,0 +1,3 @@ +secrets: + databaseConnectionString: postgres://postgres:password@localhost:5432/postgres?sslmode=disable + authEncryptSecretKey: abcdefghi diff --git a/charts/lakefs/templates/deployment.yaml b/charts/lakefs/templates/deployment.yaml index 447ccd8..c1ecbfa 100644 --- a/charts/lakefs/templates/deployment.yaml +++ b/charts/lakefs/templates/deployment.yaml @@ -55,7 +55,7 @@ spec: mountPath: "/lakefs/data" {{- end }} env: - {{- if .Values.lakefsConfig }} + {{- if .Values.secrets }} - name: LAKEFS_DATABASE_CONNECTION_STRING valueFrom: secretKeyRef: @@ -66,11 +66,13 @@ spec: secretKeyRef: name: {{ include "lakefs.fullname" . }} key: auth_encrypt_secret_key - {{- else }} + {{- else if not .Values.lakefsConfig }} - name: LAKEFS_DATABASE_CONNECTION_STRING value: postgres://postgres:password@localhost:5432/postgres?sslmode=disable - name: LAKEFS_AUTH_ENCRYPT_SECRET_KEY value: asdjfhjaskdhuioaweyuiorasdsjbaskcbkj + {{- end }} + {{- if not .Values.lakefsConfig }} - name: LAKEFS_BLOCKSTORE_LOCAL_PATH value: /lakefs/data {{- end }} diff --git a/charts/lakefs/templates/secret.yaml b/charts/lakefs/templates/secret.yaml index 486e51a..79d32ab 100644 --- a/charts/lakefs/templates/secret.yaml +++ b/charts/lakefs/templates/secret.yaml @@ -1,4 +1,4 @@ -{{- if .Values.lakefsConfig }} +{{- if .Values.secrets }} apiVersion: v1 kind: Secret metadata: