Skip to content

Commit

Permalink
Add proxy env vars to deployment template (#752)
Browse files Browse the repository at this point in the history
* add proxy env vars

* add changelog
  • Loading branch information
tfussell authored May 20, 2021
1 parent e56f76f commit 215536b
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 0 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s

## [Unreleased]

### Added

- Proxy support in helm template.

## [2.14.0] - 2021-04-30

### Changed
Expand Down
15 changes: 15 additions & 0 deletions helm/chart-operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,21 @@ spec:
{{ end }}
containers:
- name: {{ .Chart.Name }}
{{- if .Values.proxy.enabled }}
env:
{{- if .Values.proxy.http }}
- name: HTTP_PROXY
value: {{ .Values.proxy.http }}
{{- end }}
{{- if .Values.proxy.https }}
- name: HTTPS_PROXY
value: {{ .Values.proxy.https }}
{{- end }}
{{- if .Values.proxy.noProxy }}
- name: NO_PROXY
value: {{ join "," .Values.proxy.noProxy }}
{{- end }}
{{- end }}
{{ if (.Values.Installation) }}
image: "{{ .Values.Installation.V1.Registry.Domain }}/{{ .Values.image.name }}:{{ .Values.image.tag }}"
{{ else }}
Expand Down
3 changes: 3 additions & 0 deletions helm/chart-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ project:
branch: "[[ .Branch ]]"
commit: "[[ .SHA ]]"

proxy:
enabled: false

# Resource names are truncated to 47 characters. Kubernetes allows 63 characters
# limit for resource names. When pods for deployments are created they have
# additional 16 characters suffix, e.g. "-957c9d6ff-pkzgw" and we want to have
Expand Down

0 comments on commit 215536b

Please sign in to comment.