Compare commits

..

No commits in common. "e211d43dc73f525977ade4ecae624346d9e531d1" and "2ae5f80aa42d5372bacdc5cb711040d48e01ebec" have entirely different histories.

4 changed files with 13 additions and 11 deletions

View File

@ -12,6 +12,11 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
name: Check out code name: Check out code
- name: Set up Helm
uses: azure/setup-helm@v4.2.0
with:
version: v3.14.4
- name: Get package name - name: Get package name
id: chart_name id: chart_name
uses: mikefarah/yq@master uses: mikefarah/yq@master
@ -27,11 +32,15 @@ jobs:
- name: build helm package - name: build helm package
shell: bash shell: bash
env: env:
PACKAGE_TOKEN: ${{ secrets.REPO_HOST }} REPO_PASSWORD: ${{ secrets.REPO_PASSWORD }}
REPO_USERNAME: ${{ secrets.REPO_USERNAME }}
REPO_HOST: ${{ secrets.REPO_HOST }}
CHART_NAME: ${{ steps.chart_name.outputs.result }} CHART_NAME: ${{ steps.chart_name.outputs.result }}
CHART_VERSION: ${{ steps.chart_version.outputs.result }} CHART_VERSION: ${{ steps.chart_version.outputs.result }}
run: | run: |
REPO_PATH=$(git rev-parse --show-toplevel) REPO_PATH=$(git rev-parse --show-toplevel)
mkdir /tmp/build mkdir /tmp/build
cd /tmp/build cd /tmp/build
curl -H "Authorization: token $PACKAGE_TOKEN" -X POST --upload-file $CHART_NAME-$CHART_VERSION.tgz https://git.rre.nu/api/packages/jonas/helm/api/charts helm package $REPO_PATH
helm registry login --username $REPO_USERNAME --password $REPO_PASSWORD $REPO_HOST
helm push ${CHART_NAME}-${CHART_VERSION}.tgz oci://$REPO_HOST/helm

1
.gitignore vendored
View File

@ -5,7 +5,6 @@ bin/*
.project .project
/.bin /.bin
/_test/secrets/*.json /_test/secrets/*.json
*.tgz
# OSX leaves these everywhere on SMB shares # OSX leaves these everywhere on SMB shares
._* ._*

View File

@ -3,7 +3,7 @@ apiVersion: v2
name: lib name: lib
description: Common functions for my helm charts at home description: Common functions for my helm charts at home
type: library type: library
version: 1.0.3 version: 1.0.2
kubeVersion: ">=1.27.0" kubeVersion: ">=1.27.0"
home: git.rre.nu home: git.rre.nu
sources: sources:

View File

@ -40,14 +40,8 @@ create the environment varable list
resources: resources:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- if or .Values.volumeMounts .Values.volumeClaimTemplates }}
volumeMounts:
{{- end }}
{{- with .Values.volumeMounts }} {{- with .Values.volumeMounts }}
volumeMounts:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- range $v := .Values.volumeClaimTemplates }}
- name: {{ $v.name }}
mountPath: {{ $v.mountPath }}
{{- end }}
{{- end }} {{- end }}