Skip to content

Commit 94df7f3

Browse files
kir4hkir4h
authored
Merge pull request #23 from kir4h/develop
Release 1.3.0
2 parents 2cbe9f9 + cc41ff9 commit 94df7f3

File tree

5 files changed

+76
-59
lines changed

5 files changed

+76
-59
lines changed

‎CONTRIBUTING.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# CONTRIBUTING
2+
3+
* Please create your Pull Requests to the `develop` branch
4+
* Remember to update the chart's `README.md` whenever applicable (e.g: adding or editing parameters)
5+
* Charts are published when pushing to master

‎charts/registry-creds/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
appVersion: "1.10"
33
description: A Helm chart for registry creds
44
name: registry-creds
5-
version: 1.2.2
5+
version: 1.3.0
66
home: https://hub.docker.com/r/upmcenterprises/registry-creds
77
sources:
88
- https://github.com/upmc-enterprises/registry-creds

‎charts/registry-creds/README.md

+56-55
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
# registry-creds <!-- omit in toc -->
22

3-
- [Chart Details](#chart-details)
4-
- [Prerequisites](#prerequisites)
5-
- [Adding helm repository](#adding-helm-repository)
6-
- [Installing the Chart](#installing-the-chart)
7-
- [Using Docker Registry Provider](#using-docker-registry-provider)
8-
- [Using Elastic Container Registry](#using-elastic-container-registry)
9-
- [From AWS](#from-aws)
10-
- [Outside AWS](#outside-aws)
11-
- [Using Google Container Registry](#using-google-container-registry)
12-
- [Uninstalling the Chart](#uninstalling-the-chart)
13-
- [Using existing secrets](#using-existing-secrets)
14-
- [Using an existing secret for Docker Private Registry](#using-an-existing-secret-for-docker-private-registry)
15-
- [Configuration](#configuration)
3+
* [Chart Details](#chart-details)
4+
* [Prerequisites](#prerequisites)
5+
* [Adding helm repository](#adding-helm-repository)
6+
* [Installing the Chart](#installing-the-chart)
7+
* [Using Docker Registry Provider](#using-docker-registry-provider)
8+
* [Using Elastic Container Registry](#using-elastic-container-registry)
9+
* [From AWS](#from-aws)
10+
* [Outside AWS](#outside-aws)
11+
* [Using Google Container Registry](#using-google-container-registry)
12+
* [Uninstalling the Chart](#uninstalling-the-chart)
13+
* [Using existing secrets](#using-existing-secrets)
14+
* [Using an existing secret for Docker Private Registry](#using-an-existing-secret-for-docker-private-registry)
15+
* [Configuration](#configuration)
1616

1717
## Chart Details
1818

@@ -21,7 +21,7 @@ cluster
2121

2222
## Prerequisites
2323

24-
- Kubernetes 1.9+
24+
* Kubernetes 1.9+
2525

2626
## Adding helm repository
2727

@@ -122,44 +122,45 @@ kir4h/registry-creds
122122

123123
The following table lists the configurable parameters of this chart and their default values.
124124

125-
Parameter | Description | Default
126-
--- | --- | ---
127-
`replicaCount` | number of replicas | `1`
128-
`image.name` | container image repository | `"upmcenterprises/registry-creds"`
129-
`image.tag` | container image tag | `"1.9"`
130-
`image.pullPolicy` | container image pull policy | `"IfNotPresent"`
131-
`nameOverride` | override name of app |`""`
132-
`args` | container args |`{}`
133-
`fullnameOverride` | override full name of app | `""`
134-
`podLabels` | labels to be added to pods | `{}`
135-
`podAnnotations` | annotations to be added to pods | `{}`
136-
`dpr.enabled` | enable the injection of docker private registry credentials | `false`
137-
`dpr.existingSecretName` | defines an existing secret (in kube-system namespace) containing the credentials| `""`
138-
`dpr.user` | user for authenticating with docker private registry. Only applicable if dpr.existingSecretName is empty | `""`
139-
`dpr.server` | hostname/IP Address of the docker private registry. Only applicable if dpr.existingSecretName is empty | `""`
140-
`dpr.password` | password for authentication with the selected docker private registry. Only applicable if dpr.existingSecretName is empty | `""`
141-
`ecr.enabled` | enable the injection of elastic container registry credentials | `""`
142-
`ecr.existingSecretName` | defines an existing secret (in kube-system namespace) containing the credentials| `""`
143-
`ecr.awsAccessKeyId` | ID of the key used to access ECR. Not needed for machines within AWS. Only applicable if ecr.existingSecretName is empty | `""`
144-
`ecr.awsSecretAccessKey` | secret of the key used to access ECR. Not needed for machines within AWS. Only applicable if ecr.existingSecretName is empty | `""`
145-
`ecr.awsAccount` | comma separated list of AWS Account Ids. Only applicable if ecr.existingSecretName is empty | `""`
146-
`ecr.awsRegion` | optional AWS region to override the default. Only applicable if ecr.existingSecretName is empty | `""`
147-
`ecr.awsAssumeRole` | optional role to be assumed by AWS and used to retrieve tokens. Only applicable if ecr.existingSecretName is empty | `""`
148-
`gcr.enabled` | enables the injection of google container registry credentials | `false`
149-
`gcr.existingSecretName` | defines an existing secret (in kube-system namespace) containing the credentials| `""`
150-
`gcr.applicationDefaultCredentialsJson` | JSON representing google cloud credentials. Only applicable if gcr.existingSecretName is empty | `""`
151-
`gcr.url` | URL for google container registry. Only applicable if gcr.existingSecretName is empty | `"https://gcr.io"`
152-
`acr.enabled` | enables the injection of azure container registry credentials | `false`
153-
`acr.existingSecretName` | defines an existing secret (in kube-system namespace) containing the credentials| `""`
154-
`acr.url` | defines the url of azure container registry| Only applicable if acr.existingSecretName is empty | `""`
155-
`acr.clientId` | is the client id used to access azure container registry | Only applicable if acr.existingSecretName is empty | `""`
156-
`acr.password` | is the client password used to access azure container registry | Only applicable if acr.existingSecretName is empty | `""`
157-
`rbac.enabled` | enables the usage of RBAC for registry-creds (needed for clusters with RBAC enabled) | `true`
158-
`rbac.existingServiceAccountName` | name of an existing service account to be used for RBAC permissions. If not defined a new service account will be created by the chart | `""`
159-
`resources.limits`.memory | memory resource limit | `"100Mi"`
160-
`resources.limits`.cpu | cpui resource limit | `"200m"`
161-
`resources.requests`.memory | memory resource request | `"50Mi"`
162-
`resources.requests`.cpu | cpu resource request | `"40m"`
163-
`tolerations` | List of node taints to tolerate | `[]`
164-
`nodeSelector` | Node labels for pod assignment | `{}`
165-
`affinity` | Node affinity | `{}`
125+
| Parameter | Description | Default |
126+
| --------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------- |
127+
| `replicaCount` | number of replicas | `1` |
128+
| `image.name` | container image repository | `"upmcenterprises/registry-creds"` |
129+
| `image.tag` | container image tag | `"1.9"` |
130+
| `image.pullPolicy` | container image pull policy | `"IfNotPresent"` |
131+
| `nameOverride` | override name of app | `""` |
132+
| `args` | container args | `{}` |
133+
| `extraEnv` | container environment variables | `{}` |
134+
| `fullnameOverride` | override full name of app | `""` |
135+
| `podLabels` | labels to be added to pods | `{}` |
136+
| `podAnnotations` | annotations to be added to pods | `{}` |
137+
| `dpr.enabled` | enable the injection of docker private registry credentials | `false` |
138+
| `dpr.existingSecretName` | defines an existing secret (in kube-system namespace) containing the credentials | `""` |
139+
| `dpr.user` | user for authenticating with docker private registry. Only applicable if dpr.existingSecretName is empty | `""` |
140+
| `dpr.server` | hostname/IP Address of the docker private registry. Only applicable if dpr.existingSecretName is empty | `""` |
141+
| `dpr.password` | password for authentication with the selected docker private registry. Only applicable if dpr.existingSecretName is empty | `""` |
142+
| `ecr.enabled` | enable the injection of elastic container registry credentials | `""` |
143+
| `ecr.existingSecretName` | defines an existing secret (in kube-system namespace) containing the credentials | `""` |
144+
| `ecr.awsAccessKeyId` | ID of the key used to access ECR. Not needed for machines within AWS. Only applicable if ecr.existingSecretName is empty | `""` |
145+
| `ecr.awsSecretAccessKey` | secret of the key used to access ECR. Not needed for machines within AWS. Only applicable if ecr.existingSecretName is empty | `""` |
146+
| `ecr.awsAccount` | comma separated list of AWS Account Ids. Only applicable if ecr.existingSecretName is empty | `""` |
147+
| `ecr.awsRegion` | optional AWS region to override the default. Only applicable if ecr.existingSecretName is empty | `""` |
148+
| `ecr.awsAssumeRole` | optional role to be assumed by AWS and used to retrieve tokens. Only applicable if ecr.existingSecretName is empty | `""` |
149+
| `gcr.enabled` | enables the injection of google container registry credentials | `false` |
150+
| `gcr.existingSecretName` | defines an existing secret (in kube-system namespace) containing the credentials | `""` |
151+
| `gcr.applicationDefaultCredentialsJson` | JSON representing google cloud credentials. Only applicable if gcr.existingSecretName is empty | `""` |
152+
| `gcr.url` | URL for google container registry. Only applicable if gcr.existingSecretName is empty | `"https://gcr.io"` |
153+
| `acr.enabled` | enables the injection of azure container registry credentials | `false` |
154+
| `acr.existingSecretName` | defines an existing secret (in kube-system namespace) containing the credentials | `""` |
155+
| `acr.url` | defines the url of azure container registry. Only applicable if acr.existingSecretName is empty | `""` |
156+
| `acr.clientId` | is the client id used to access azure container registry. Only applicable if acr.existingSecretName is empty | `""` |
157+
| `acr.password` | is the client password used to access azure container registry. Only applicable if acr.existingSecretName is empty | `""` |
158+
| `rbac.enabled` | enables the usage of RBAC for registry-creds (needed for clusters with RBAC enabled) | `true` |
159+
| `rbac.existingServiceAccountName` | name of an existing service account to be used for RBAC permissions. If not defined a new service account will be created by the chart | `""` |
160+
| `resources.limits`.memory | memory resource limit | `"100Mi"` |
161+
| `resources.limits`.cpu | cpui resource limit | `"200m"` |
162+
| `resources.requests`.memory | memory resource request | `"50Mi"` |
163+
| `resources.requests`.cpu | cpu resource request | `"40m"` |
164+
| `tolerations` | List of node taints to tolerate | `[]` |
165+
| `nodeSelector` | Node labels for pod assignment | `{}` |
166+
| `affinity` | Node affinity | `{}` |

‎charts/registry-creds/templates/deployment.yaml

+8-2
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,16 @@ spec:
106106
name: {{ default (include "registry-creds.name" . | printf "%s-acr") .Values.acr.existingSecretName }}
107107
key: ACR_PASSWORD
108108
{{- end }}
109-
{{- range $key, $value := .Values.args }}
109+
{{- range $key, $value := .Values.extraEnv }}
110+
- name: {{ $key | quote }}
111+
value: {{ $value | quote }}
112+
{{- end }}
113+
{{- if .Values.args }}
110114
args:
115+
{{- range $key, $value := .Values.args }}
111116
- --{{ $key }}={{ $value }}
112-
{{- end }}
117+
{{- end }}
118+
{{- end}}
113119
{{- if .Values.gcr.enabled }}
114120
volumeMounts:
115121
- name: {{ template "registry-creds.name" . }}-gcr

‎charts/registry-creds/values.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,16 @@ nameOverride: ""
99
fullnameOverride: ""
1010
podLabels: {}
1111
podAnnotations: {}
12+
1213
## Container args (using container default if not set)
13-
## default: null
1414
args: {}
1515
# skip-kube-system: false
1616

17+
# Extra container environment variables
18+
extraEnv: {}
19+
# HTTP_PROXY: "http://<host>:<port>"
20+
# HTTPS_PROXY: "https://<host>:<port>"
21+
1722
dpr:
1823
# dpr.enabled enables the injection of docker private registry credentials
1924
enabled: false

0 commit comments

Comments
 (0)