Skip to content

Commit

Permalink
Merge pull request #17 from kir4h/develop
Browse files Browse the repository at this point in the history
Version 1.2.2
  • Loading branch information
kir4h authored Sep 18, 2021
2 parents df7a00a + 51ff8fe commit 2cbe9f9
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,17 @@ jobs:
- name: Set up Helm
uses: azure/setup-helm@v1
with:
version: v3.4.1
version: v3.6.3

# Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and
# yamllint (https://github.com/adrienverge/yamllint) which require Python
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: 3.8

- name: Set up chart-testing
uses: helm/[email protected]
with:
version: v3.3.0
uses: helm/[email protected]

- name: Run chart-testing (list-changed)
id: list-changed
Expand All @@ -40,7 +38,7 @@ jobs:
run: ct lint --config ct.yaml

- name: Create kind cluster
uses: helm/kind-action@v1.1.0
uses: helm/kind-action@v1.2.0
if: steps.list-changed.outputs.changed == 'true'

- name: Run chart-testing (install)
Expand Down
2 changes: 1 addition & 1 deletion charts/registry-creds/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
appVersion: "1.10"
description: A Helm chart for registry creds
name: registry-creds
version: 1.2.1
version: 1.2.2
home: https://hub.docker.com/r/upmcenterprises/registry-creds
sources:
- https://github.com/upmc-enterprises/registry-creds
Expand Down
1 change: 1 addition & 0 deletions charts/registry-creds/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ Parameter | Description | Default
`image.tag` | container image tag | `"1.9"`
`image.pullPolicy` | container image pull policy | `"IfNotPresent"`
`nameOverride` | override name of app |`""`
`args` | container args |`{}`
`fullnameOverride` | override full name of app | `""`
`podLabels` | labels to be added to pods | `{}`
`podAnnotations` | annotations to be added to pods | `{}`
Expand Down
4 changes: 4 additions & 0 deletions charts/registry-creds/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ spec:
name: {{ default (include "registry-creds.name" . | printf "%s-acr") .Values.acr.existingSecretName }}
key: ACR_PASSWORD
{{- end }}
{{- range $key, $value := .Values.args }}
args:
- --{{ $key }}={{ $value }}
{{- end }}
{{- if .Values.gcr.enabled }}
volumeMounts:
- name: {{ template "registry-creds.name" . }}-gcr
Expand Down
4 changes: 4 additions & 0 deletions charts/registry-creds/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ nameOverride: ""
fullnameOverride: ""
podLabels: {}
podAnnotations: {}
## Container args (using container default if not set)
## default: null
args: {}
# skip-kube-system: false

dpr:
# dpr.enabled enables the injection of docker private registry credentials
Expand Down

0 comments on commit 2cbe9f9

Please sign in to comment.