-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into feat/verify-blob
Signed-off-by: Marco Lecheler <[email protected]>
- Loading branch information
Showing
10 changed files
with
161 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,16 +9,16 @@ jobs: | |
|
|
||
| name: Install chart-testing and test presence in path | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 | ||
| - name: Install chart-testing | ||
| uses: ./ | ||
| - name: Check install! | ||
| run: | | ||
| ct version | ||
| CT_VERSION_OUTPUT=$(ct version 2>&1 /dev/null) | ||
| ACTUAL_VERSION=$(echo "$CT_VERSION_OUTPUT" | grep Version | rev | cut -d ' ' -f1 | rev) | ||
| if [[ $ACTUAL_VERSION != 'v3.10.0' ]]; then | ||
| echo 'should be v3.10.0' | ||
| if [[ $ACTUAL_VERSION != 'v3.12.0' ]]; then | ||
| echo 'should be v3.12.0' | ||
| exit 1 | ||
| else | ||
| exit 0 | ||
|
|
@@ -38,7 +38,7 @@ jobs: | |
|
|
||
| name: Install Custom chart-testing and test presence in path | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 | ||
| - name: Install chart-testing | ||
| uses: ./ | ||
| with: | ||
|
|
@@ -66,12 +66,60 @@ jobs: | |
| exit 0 | ||
| fi | ||
| test_ct_action_with_helm: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| name: run action to test a helm chart | ||
| steps: | ||
| - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Set up Helm | ||
| uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0 | ||
| with: | ||
| version: v3.17.0 | ||
|
|
||
| - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0 | ||
| with: | ||
| python-version: '3.x' | ||
| check-latest: true | ||
|
|
||
| - name: Install chart-testing | ||
| uses: ./ | ||
|
|
||
| - run: | | ||
| sed -i "s/version: .*/version: 2.0.0/" testdata/simple-deployment/Chart.yaml | ||
| cat testdata/simple-deployment/Chart.yaml | ||
| - name: Run chart-testing (list-changed) | ||
| id: list-changed | ||
| run: | | ||
| changed=$(ct list-changed --chart-dirs=testdata --target-branch ${{ github.event.repository.default_branch }}) | ||
| if [[ -n "$changed" ]]; then | ||
| echo "changed=true" >> "$GITHUB_OUTPUT" | ||
| fi | ||
| - name: Run chart-testing (lint) | ||
| if: steps.list-changed.outputs.changed == 'true' | ||
| run: ct lint --chart-dirs=testdata --target-branch ${{ github.event.repository.default_branch }} | ||
|
|
||
| - name: Create kind cluster | ||
| if: steps.list-changed.outputs.changed == 'true' | ||
| uses: helm/[email protected] | ||
|
|
||
| - name: Run chart-testing (install) | ||
| if: steps.list-changed.outputs.changed == 'true' | ||
| run: ct install --chart-dirs=testdata --target-branch ${{ github.event.repository.default_branch }} | ||
|
|
||
| test_ct_action_noverify: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| name: Install chart-testing without verifiing blob and test presence in path | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 | ||
| with: | ||
| fetch-depth: 0 | ||
| - name: Install chart-testing | ||
| uses: ./ | ||
| with: | ||
|
|
@@ -95,4 +143,4 @@ jobs: | |
| exit 1 | ||
| else | ||
| exit 0 | ||
| fi | ||
| fi | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| apiVersion: v1 | ||
| appVersion: "1.0" | ||
| description: A Helm chart for Kubernetes | ||
| name: nginx | ||
| version: 0.1.0 | ||
| maintainers: | ||
| - name: cpanato | ||
| - name: davidkarlsen |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| Simple chart with a Deployment. | ||
|
|
||
| The integration test will install first simple-deployment and then try to upgrade | ||
| to simple-deployment-different-selector failing as expected |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| {{/* vim: set filetype=mustache: */}} | ||
| {{/* | ||
| Expand the name of the chart. | ||
| */}} | ||
| {{- define "nginx.name" -}} | ||
| {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} | ||
| {{- end -}} | ||
|
|
||
| {{/* | ||
| Create a default fully qualified app name. | ||
| We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). | ||
| If release name contains chart name it will be used as a full name. | ||
| */}} | ||
| {{- define "nginx.fullname" -}} | ||
| {{- if .Values.fullnameOverride -}} | ||
| {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} | ||
| {{- else -}} | ||
| {{- $name := default .Chart.Name .Values.nameOverride -}} | ||
| {{- if contains $name .Release.Name -}} | ||
| {{- .Release.Name | trunc 63 | trimSuffix "-" -}} | ||
| {{- else -}} | ||
| {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} | ||
| {{- end -}} | ||
| {{- end -}} | ||
| {{- end -}} | ||
|
|
||
| {{/* | ||
| Create chart name and version as used by the chart label. | ||
| */}} | ||
| {{- define "nginx.chart" -}} | ||
| {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} | ||
| {{- end -}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: {{ include "nginx.fullname" . }} | ||
| labels: | ||
| app.kubernetes.io/name: {{ include "nginx.name" . }} | ||
| helm.sh/chart: {{ include "nginx.chart" . }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| app.kubernetes.io/managed-by: {{ .Release.Service }} | ||
| spec: | ||
| replicas: 1 | ||
| selector: | ||
| matchLabels: | ||
| app.kubernetes.io/name: {{ include "nginx.name" . }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| template: | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/name: {{ include "nginx.name" . }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| spec: | ||
| containers: | ||
| - name: {{ .Chart.Name }} | ||
| image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" | ||
| imagePullPolicy: {{ .Values.image.pullPolicy }} | ||
| ports: | ||
| - name: http | ||
| containerPort: 80 | ||
| protocol: TCP |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| # Default values for nginx. | ||
| # This is a YAML-formatted file. | ||
| # Declare variables to be passed into your templates. | ||
|
|
||
| image: | ||
| repository: nginx | ||
| tag: stable | ||
| pullPolicy: IfNotPresent | ||
|
|
||
| nameOverride: "" | ||
| fullnameOverride: "" |