diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml deleted file mode 100644 index 38918bd..0000000 --- a/.github/workflows/lint-test.yaml +++ /dev/null @@ -1,42 +0,0 @@ -# name: Lint and Test Charts - -# on: pull_request - -# jobs: -# lint-test: -# runs-on: ubuntu-latest -# steps: -# - name: Checkout -# uses: actions/checkout@v2 -# with: -# fetch-depth: 0 - -# - name: Set up Helm -# uses: azure/setup-helm@v1 -# with: -# version: v3.4.0 - -# - uses: actions/setup-python@v2 -# with: -# python-version: 3.7 - -# - name: Set up chart-testing -# uses: helm/chart-testing-action@v2.0.1 - -# - name: Run chart-testing (list-changed) -# id: list-changed -# run: | -# changed=$(ct list-changed) -# if [[ -n "$changed" ]]; then -# echo "::set-output name=changed::true" -# fi - -# - name: Run chart-testing (lint) -# run: ct lint - -# - name: Create kind cluster -# uses: helm/kind-action@v1.0.0 -# if: steps.list-changed.outputs.changed == 'true' - -# - name: Run chart-testing (install) -# run: ct install diff --git a/charts/nodejs/Chart.yaml b/charts/nodejs/Chart.yaml index 56f62e5..2828dd2 100644 --- a/charts/nodejs/Chart.yaml +++ b/charts/nodejs/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 appVersion: "1.0" description: A Helm chart for Deploying NoodeJS applications to Kubernetes name: nodejs -version: 0.2.0 +version: 0.2.1 diff --git a/charts/nodejs/templates/_helpers.tpl b/charts/nodejs/templates/_helpers.tpl index fa26ea6..e94279d 100644 --- a/charts/nodejs/templates/_helpers.tpl +++ b/charts/nodejs/templates/_helpers.tpl @@ -46,10 +46,9 @@ Create chart name and version as used by the chart label. Common labels */}} {{- define "nodejs.labels" -}} -app.kubernetes.io/name: {{ include "nodejs.name" . }} helm.sh/chart: {{ include "nodejs.chart" . }} -app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/name: {{ include "nodejs.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} {{- if (and false .Chart.AppVersion) }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }}