Synchronize upstreamed folder to 7a9d149fa

This commit is contained in:
bitnami-bot
2019-10-09 07:35:19 +00:00
parent e83451529e
commit 6c7a31802b
8 changed files with 28 additions and 9 deletions

View File

@@ -1,6 +1,6 @@
apiVersion: v1
name: dokuwiki
version: 5.2.8
version: 5.2.9
appVersion: 0.20180422.201901061035
description: DokuWiki is a standards-compliant, simple to use wiki optimized for creating
documentation. It is targeted at developer teams, workgroups, and small companies.

View File

@@ -14,7 +14,7 @@
image:
registry: docker.io
repository: bitnami/dokuwiki
tag: 0.20180422.201901061035-debian-9-r214
tag: 0.20180422.201901061035-debian-9-r244
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -193,7 +193,7 @@ metrics:
image:
registry: docker.io
repository: bitnami/apache-exporter
tag: 0.7.0-debian-9-r50
tag: 0.7.0-debian-9-r79
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.

View File

@@ -1,6 +1,6 @@
apiVersion: v1
name: external-dns
version: 2.7.0
version: 2.8.0
appVersion: 0.5.17
description: ExternalDNS is a Kubernetes addon that configures public DNS servers with information about exposed Kubernetes services to make them discoverable.
keywords:

View File

@@ -74,6 +74,7 @@ The following table lists the configurable parameters of the external-dns chart
| `azure.aadClientId` | When using the Azure provider, set the Azure AAD Client ID | `""` |
| `azure.aadClientSecret` | When using the Azure provider, set the Azure AAD Client Secret | `""` |
| `azure.useManagedIdentityExtension` | When using the Azure provider, set if you use Azure MSI | `""` |
| `cloudflare.apiToken` | When using the Cloudflare provider, `CF_API_TOKEN` to set (optional) | `""` |
| `cloudflare.apiKey` | When using the Cloudflare provider, `CF_API_KEY` to set (optional) | `""` |
| `cloudflare.email` | When using the Cloudflare provider, `CF_API_EMAIL` to set (optional) | `""` |
| `cloudflare.proxied` | When using the Cloudflare provider, enable the proxy feature (DDOS protection, CDN...) (optional) | `true` |

View File

@@ -14,7 +14,7 @@ spec:
{{- if or .Values.podAnnotations .Values.metrics.enabled }}
{{ include "external-dns.podAnnotations" . | nindent 8 }}
{{- end }}
{{- if or (and .Values.aws.credentials.secretKey .Values.aws.credentials.accessKey) .Values.cloudflare.apiKey .Values.digitalocean.apiToken (and .Values.infoblox.wapiUsername .Values.infoblox.wapiPassword) .Values.rfc2136.tsigSecret .Values.extraEnv .Values.google.serviceAccountKey }}
{{- if or (and .Values.aws.credentials.secretKey .Values.aws.credentials.accessKey) (or .Values.cloudflare.apiToken .Values.cloudflare.apiKey) .Values.digitalocean.apiToken (and .Values.infoblox.wapiUsername .Values.infoblox.wapiPassword) .Values.rfc2136.tsigSecret .Values.extraEnv .Values.google.serviceAccountKey }}
checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
{{- end }}
{{- if and (eq .Values.provider "designate") .Values.designate.customCA.enabled }}
@@ -185,13 +185,21 @@ spec:
{{- end }}
# Cloudflare environment variables
{{- if eq .Values.provider "cloudflare" }}
{{- if .Values.cloudflare.apiToken }}
- name: CF_API_TOKEN
valueFrom:
secretKeyRef:
name: {{ template "external-dns.fullname" . }}
key: cloudflare_api_token
{{- else }}
- name: CF_API_KEY
valueFrom:
secretKeyRef:
name: {{ template "external-dns.fullname" . }}
key: cloudflare_api_key
- name: CF_API_EMAIL
value: {{ .Values.cloudflare.email | quote }}
value: {{ required "cloudflare.email is required if cloudflare.apiToken is not provided" .Values.cloudflare.email | quote }}
{{- end }}
{{- end }}
# CoreDNS environment variables
{{- if eq .Values.provider "coredns" }}

View File

@@ -1,4 +1,4 @@
{{- if or .Values.aws.assumeRoleArn (and .Values.aws.credentials.secretKey .Values.aws.credentials.accessKey) .Values.cloudflare.apiKey .Values.digitalocean.apiToken .Values.google.serviceAccountKey (and .Values.infoblox.wapiUsername .Values.infoblox.wapiPassword) .Values.rfc2136.tsigSecret .Values.pdns.apiKey (and .Values.azure.resourceGroup .Values.azure.tenantId .Values.azure.subscriptionId .Values.azure.aadClientId .Values.azure.aadClientSecret (not .Values.azure.useManagedIdentityExtension)) (and .Values.azure.resourceGroup .Values.azure.tenantId .Values.azure.subscriptionId .Values.azure.useManagedIdentityExtension) }}
{{- if or .Values.aws.assumeRoleArn (and .Values.aws.credentials.secretKey .Values.aws.credentials.accessKey) (or .Values.cloudflare.apiToken .Values.cloudflare.apiKey) .Values.digitalocean.apiToken .Values.google.serviceAccountKey (and .Values.infoblox.wapiUsername .Values.infoblox.wapiPassword) .Values.rfc2136.tsigSecret .Values.pdns.apiKey (and .Values.azure.resourceGroup .Values.azure.tenantId .Values.azure.subscriptionId .Values.azure.aadClientId .Values.azure.aadClientSecret (not .Values.azure.useManagedIdentityExtension)) (and .Values.azure.resourceGroup .Values.azure.tenantId .Values.azure.subscriptionId .Values.azure.useManagedIdentityExtension) }}
apiVersion: v1
kind: Secret
metadata:
@@ -17,8 +17,12 @@ data:
{{- if and (eq .Values.provider "google") .Values.google.serviceAccountKey }}
credentials.json: {{ .Values.google.serviceAccountKey | b64enc | quote }}
{{- end }}
{{- if .Values.cloudflare.apiKey }}
cloudflare_api_key: {{ .Values.cloudflare.apiKey | b64enc | quote }}
{{- if eq .Values.provider "cloudflare" }}
{{- if .Values.cloudflare.apiToken }}
cloudflare_api_token: {{ .Values.cloudflare.apiToken | b64enc | quote }}
{{- else }}
cloudflare_api_key: {{ required "cloudflare.apiKey is required if cloudflare.apiToken is not provided" .Values.cloudflare.apiKey | b64enc | quote }}
{{- end }}
{{- end }}
{{- if .Values.digitalocean.apiToken }}
digitalocean_api_token: {{ .Values.digitalocean.apiToken | b64enc | quote }}

View File

@@ -106,6 +106,9 @@ azure:
## Cloudflare configuration to be set via arguments/env. variables
##
cloudflare:
## `CF_API_TOKEN` to set in the environment
##
apiToken: ""
## `CF_API_KEY` to set in the environment
##
apiKey: ""

View File

@@ -106,6 +106,9 @@ azure:
## Cloudflare configuration to be set via arguments/env. variables
##
cloudflare:
## `CF_API_TOKEN` to set in the environment
##
apiToken: ""
## `CF_API_KEY` to set in the environment
##
apiKey: ""