weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #680 from fllaca/allow_http_proxy_envvars

Browse Source 
Allow setting http_proxy and https_proxy in cert-manager deployment
This commit is contained in:
jetstack-bot 2018-07-05 12:37:41 +01:00 committed by GitHub
commit d7bcb62256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/charts/cert-manager/Chart.yaml
View File

@ -1,5 +1,5 @@
name: cert-manager
version: v0.4.0-dev.1
version: v0.4.0-dev.2
appVersion: v0.4.0-dev.0
description: A Helm chart for cert-manager
home: https://github.com/jetstack/cert-manager

3
contrib/charts/cert-manager/README.md
View File

@ -78,6 +78,9 @@ The following table lists the configurable parameters of the cert-manager chart
| `podDnsPolicy` | Optional cert-manager pod [DNS policy](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pods-dns-policy) | |
| `podDnsConfig` | Optional cert-manager pod [DNS configurations](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pods-dns-config) | |
| `podLabels` | Labels to add to the cert-manager pod | `{}` |
| `http_proxy` | Value of the `HTTP_PROXY` environment variable in the cert-manager pod | |
| `https_proxy` | Value of the `HTTPS_PROXY` environment variable in the cert-manager pod | |
| `no_proxy` | Value of the `NO_PROXY` environment variable in the cert-manager pod | |
Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.

12
contrib/charts/cert-manager/templates/deployment.yaml
View File

@ -68,6 +68,18 @@ spec:
{{- if .Values.extraEnv }}
{{ toYaml .Values.extraEnv | indent 10 }}
{{- end }}
{{- if .Values.http_proxy }}
- name: HTTP_PROXY
value: {{ .Values.http_proxy }}
{{- end }}
{{- if .Values.https_proxy }}
- name: HTTPS_PROXY
value: {{ .Values.https_proxy }}
{{- end }}
{{- if .Values.no_proxy }}
- name: NO_PROXY
value: {{ .Values.no_proxy }}
{{- end }}
resources:
{{ toYaml .Values.resources | indent 12 }}
{{- with .Values.nodeSelector }}

5
contrib/charts/cert-manager/values.yaml
View File

@ -73,3 +73,8 @@ ingressShim: {}
# namespace manifest for the namespace that cert-manager is being installed
# within. It should **not** be used if you are using Helm for deployment.
createNamespaceResource: false
# Use these variables to configure the HTTP_PROXY environment variables
# http_proxy: "http://proxy:8080"
# http_proxy: "http://proxy:8080"
# no_proxy: 127.0.0.1,localhost

14
contrib/manifests/cert-manager/with-rbac.yaml
View File

@ -15,7 +15,7 @@ metadata:
namespace: "cert-manager"
labels:
app: cert-manager
chart: cert-manager-v0.4.0-dev.1
chart: cert-manager-v0.4.0-dev.2
release: cert-manager
heritage: Tiller
---
@ -26,7 +26,7 @@ metadata:
name: certificates.certmanager.k8s.io
labels:
app: cert-manager
chart: cert-manager-v0.4.0-dev.1
chart: cert-manager-v0.4.0-dev.2
release: cert-manager
heritage: Tiller
spec:
@ -48,7 +48,7 @@ metadata:
name: clusterissuers.certmanager.k8s.io
labels:
app: cert-manager
chart: cert-manager-v0.4.0-dev.1
chart: cert-manager-v0.4.0-dev.2
release: cert-manager
heritage: Tiller
spec:
@ -66,7 +66,7 @@ metadata:
name: issuers.certmanager.k8s.io
labels:
app: cert-manager
chart: cert-manager-v0.4.0-dev.1
chart: cert-manager-v0.4.0-dev.2
release: cert-manager
heritage: Tiller
spec:
@ -84,7 +84,7 @@ metadata:
name: cert-manager
labels:
app: cert-manager
chart: cert-manager-v0.4.0-dev.1
chart: cert-manager-v0.4.0-dev.2
release: cert-manager
heritage: Tiller
rules:
@ -109,7 +109,7 @@ metadata:
name: cert-manager
labels:
app: cert-manager
chart: cert-manager-v0.4.0-dev.1
chart: cert-manager-v0.4.0-dev.2
release: cert-manager
heritage: Tiller
roleRef:
@ -129,7 +129,7 @@ metadata:
namespace: "cert-manager"
labels:
app: cert-manager
chart: cert-manager-v0.4.0-dev.1
chart: cert-manager-v0.4.0-dev.2
release: cert-manager
heritage: Tiller
spec:

8
contrib/manifests/cert-manager/without-rbac.yaml
View File

@ -14,7 +14,7 @@ metadata:
name: certificates.certmanager.k8s.io
labels:
app: cert-manager
chart: cert-manager-v0.4.0-dev.1
chart: cert-manager-v0.4.0-dev.2
release: cert-manager
heritage: Tiller
spec:
@ -36,7 +36,7 @@ metadata:
name: clusterissuers.certmanager.k8s.io
labels:
app: cert-manager
chart: cert-manager-v0.4.0-dev.1
chart: cert-manager-v0.4.0-dev.2
release: cert-manager
heritage: Tiller
spec:
@ -54,7 +54,7 @@ metadata:
name: issuers.certmanager.k8s.io
labels:
app: cert-manager
chart: cert-manager-v0.4.0-dev.1
chart: cert-manager-v0.4.0-dev.2
release: cert-manager
heritage: Tiller
spec:
@ -73,7 +73,7 @@ metadata:
namespace: "cert-manager"
labels:
app: cert-manager
chart: cert-manager-v0.4.0-dev.1
chart: cert-manager-v0.4.0-dev.2
release: cert-manager
heritage: Tiller
spec: