Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-04-06 09:17:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #866 from bitnami/global-registry

Browse Source 
Add global registry option to Bitnami charts
This commit is contained in:
Carlos Rodríguez Hernández
2018-10-16 08:42:15 +02:00
committed by GitHub
parent 8b9073608e 926386bae6
commit c13402c600
96 changed files with 629 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/apache/Chart.yaml
View File

@@ -1,5 +1,5 @@
name: apache
version: 2.0.2
version: 2.1.0
appVersion: 2.4.35
description: Chart for Apache HTTP Server
keywords:

1
bitnami/apache/README.md
View File

@@ -46,6 +46,7 @@ The following tables lists the configurable parameters of the Apache chart and t
| Parameter | Description | Default |
| --------------------------------- | ------------------------------------- | --------------------------------------------------------- |
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | Apache image registry | `docker.io` |
| `image.repository` | Apache Image name | `bitnami/apache` |
| `image.tag` | Apache Image tag | `{VERSION}` |

23
bitnami/apache/templates/_helpers.tpl
View File

@@ -14,3 +14,26 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 24 -}}
{{- end -}}
{{/*
Return the proper Apache image name
*/}}
{{- define "apache.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}

2
bitnami/apache/templates/deployment.yaml
View File

@@ -29,7 +29,7 @@ spec:
{{- end }}
containers:
- name: {{ template "fullname" . }}
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ template "apache.image" . }}"
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
ports:
- name: http

8
bitnami/apache/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami Apache image version
## ref: https://hub.docker.com/r/bitnami/apache/tags/
##
@@ -14,4 +20,4 @@ image:
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
##
# pullSecrets:
# - myRegistrKeySecretName
# - myRegistrKeySecretName

2
bitnami/consul/Chart.yaml
View File

@@ -2,7 +2,7 @@ name: consul
home: https://www.consul.io/
sources:
- https://github.com/bitnami/consul
version: 2.3.0
version: 2.4.0
appVersion: 1.3.0
description: Highly available and distributed service discovery and key-value store
designed with support for the modern data center to make distributed systems and

1
bitnami/consul/README.md
View File

@@ -51,6 +51,7 @@ The following tables lists the configurable parameters of the Consul chart and t
| Parameter | Description | Default |
| ------------------------------------ | ------------------------------------------------------ | ---------------------------------------------------------- |
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | Consul image registry | `docker.io` |
| `image.repository` | Consul image name | `bitnami/consul` |
| `image.tag` | Consul image tag | `{VERSION}` |

20
bitnami/consul/templates/_helpers.tpl
View File

@@ -26,7 +26,21 @@ Create chart name and version as used by the chart label.
Return the proper Consul image name
*/}}
{{- define "consul.image" -}}
{{- $registryName := default "docker.io" .Values.image.registry -}}
{{- $tag := default "latest" .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName .Values.image.repository $tag -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}

6
bitnami/consul/values-production.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami Consul image version
## ref: https://hub.docker.com/r/bitnami/consul/tags/
##

6
bitnami/consul/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami Consul image version
## ref: https://hub.docker.com/r/bitnami/consul/tags/
##

2
bitnami/elasticsearch/Chart.yaml
View File

@@ -1,5 +1,5 @@
name: elasticsearch
version: 4.0.3
version: 4.1.0
appVersion: 6.4.2
description: A highly scalable open-source full-text search and analytics engine
keywords:

1
bitnami/elasticsearch/README.md
View File

@@ -51,6 +51,7 @@ The following table lists the configurable parameters of the Elasticsearch chart
| Parameter | Description | Default |
|---------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------|
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | Elasticsearch image registry | `docker.io` |
| `image.repository` | Elasticsearch image repository | `bitnami/elasticsearch` |
| `image.tag` | Elasticsearch image tag | `{VERSION}` |

20
bitnami/elasticsearch/templates/_helpers.tpl
View File

@@ -26,9 +26,23 @@ Create chart name and version as used by the chart label.
Return the proper ES image name
*/}}
{{- define "elasticsearch.image" -}}
{{- $registryName := default "docker.io" .Values.image.registry -}}
{{- $tag := default "latest" .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName .Values.image.repository $tag -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}
{{/*

6
bitnami/elasticsearch/values-production.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami Elasticsearch image version
## ref: https://hub.docker.com/r/bitnami/elasticsearch/tags/
##

6
bitnami/elasticsearch/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami Elasticsearch image version
## ref: https://hub.docker.com/r/bitnami/elasticsearch/tags/
##

2
bitnami/etcd/Chart.yaml
View File

@@ -1,5 +1,5 @@
name: etcd
version: 1.1.6
version: 1.2.0
appVersion: 3.3.10
description: etcd is a distributed key value store that provides a reliable way to store data across a cluster of machines
keywords:

1
bitnami/etcd/README.md
View File

@@ -47,6 +47,7 @@ The following tables lists the configurable parameters of the etcd chart and the
| Parameter | Description | Default |
|---------------------------------------|----------------------------------------------------------------------------------------------------------|------------------------------------------------------------------- |
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | etcd image registry | `docker.io` |
| `image.repository` | etcd Image name | `bitnami/etcd` |
| `image.tag` | etcd Image tag | `{VERSION}` |

19
bitnami/etcd/templates/_helpers.tpl
View File

@@ -27,10 +27,23 @@ Return the proper etcd image name
*/}}
{{- define "etcd.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName .Values.image.repository $tag -}}
{{- end -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}
{{/*
Return the proper etcd peer protocol
@@ -81,4 +94,4 @@ Return the proper etcdctl authentication options
{{- if .Values.auth.client.enableAuthentication -}}
{{- printf "%s" $caOption -}}
{{- end -}}
{{- end -}}
{{- end -}}

6
bitnami/etcd/values-production.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami etcd image version
## ref: https://hub.docker.com/r/bitnami/etcd/tags/
##

6
bitnami/etcd/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami etcd image version
## ref: https://hub.docker.com/r/bitnami/etcd/tags/
##

2
bitnami/external-dns/Chart.yaml
View File

@@ -1,5 +1,5 @@
name: external-dns
version: 1.0.4
version: 1.1.0
appVersion: 0.5.7
description: ExternalDNS is a Kubernetes addon that configures public DNS servers with information about exposed Kubernetes services to make them discoverable.
keywords:

1
bitnami/external-dns/README.md
View File

@@ -48,6 +48,7 @@ The following table lists the configurable parameters of the external-dns chart
| Parameter | Description | Default |
| ------------------------------------- | -------------------------------------------------------------------------------------------------------- | -------------------------------------------------------- |
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | ExternalDNS image registry | `docker.io` |
| `image.repository` | ExternalDNS Image name | `bitnami/external-dns` |
| `image.tag` | ExternalDNS Image tag | `{VERSION}` |

16
bitnami/external-dns/templates/_helpers.tpl
View File

@@ -27,8 +27,22 @@ Return the proper external-dns image name
*/}}
{{- define "external-dns.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName .Values.image.repository $tag -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}
{{/*

6
bitnami/external-dns/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami external-dns image version
## ref: https://hub.docker.com/r/bitnami/external-dns/tags/
##

2
bitnami/jenkins/Chart.yaml
View File

@@ -1,5 +1,5 @@
name: jenkins
version: 1.1.3
version: 1.2.0
appVersion: 2.138.2
description: The leading open source automation server
keywords:

1
bitnami/jenkins/README.md
View File

@@ -47,6 +47,7 @@ The following tables lists the configurable parameters of the Jenkins chart and
| Parameter | Description | Default |
|----------------------------|----------------------------------------|---------------------------------------------------------- |
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | Jenkins image registry | `docker.io` |
| `image.repository` | Jenkins Image name | `bitnami/jenkins` |
| `image.tag` | Jenkins Image tag | `{VERSION}` |

23
bitnami/jenkins/templates/_helpers.tpl
View File

@@ -14,3 +14,26 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Return the proper Jenkins image name
*/}}
{{- define "jenkins.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}

2
bitnami/jenkins/templates/deployment.yaml
View File

@@ -27,7 +27,7 @@ spec:
{{- end }}
containers:
- name: {{ template "fullname" . }}
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ template "jenkins.image" . }}"
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
env:
- name: JENKINS_USERNAME

6
bitnami/jenkins/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami Jenkins image version
## ref: https://hub.docker.com/r/bitnami/jenkins/tags/
##

2
bitnami/kafka/Chart.yaml
View File

@@ -1,5 +1,5 @@
name: kafka
version: 1.0.2
version: 1.1.0
appVersion: 2.0.0
description: Apache Kafka is a distributed streaming platform.
keywords:

5
bitnami/kafka/README.md
View File

@@ -47,6 +47,7 @@ The following tables lists the configurable parameters of the Kafka chart and th
| Parameter | Description | Default |
|----------------------------------|------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------- |
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | Kafka image registry | `docker.io` |
| `image.repository` | Kafka Image name | `bitnami/kafka` |
| `image.tag` | Kafka Image tag | `{VERSION}` |
@@ -57,8 +58,8 @@ The following tables lists the configurable parameters of the Kafka chart and th
| `replicaCount` | Number of Kafka nodes | `1` |
| `config` | Configuration file for Kafka | `nil` |
| `allowPlaintextListener` | Allow to use the PLAINTEXT listener | `true` |
| `listeners` | The address the socket server listens on. | `nil` |
| `advertisedListeners` | Hostname and port the broker will advertise to producers and consumers. | `nil` |
| `listeners` | The address the socket server listens on. | `nil` |
| `advertisedListeners` | Hostname and port the broker will advertise to producers and consumers. | `nil` |
| `brokerId` | ID of the Kafka node | `-1` |
| `deleteTopicEnable` | Switch to enable topic deletion or not. | `false` |
| `heapOpts` | Kafka's Java Heap size. | `-Xmx1024m -Xms1024m` |

6
bitnami/kafka/requirements.lock
View File

@@ -1,6 +1,6 @@
dependencies:
- name: zookeeper
repository: https://charts.bitnami.com/bitnami
version: 0.0.1
digest: sha256:5de3747cef6f8cc34f166277b81f8ccea2c8849caadf133c1d9bc7da5fe71607
generated: 2018-06-14T16:25:45.420195607+02:00
version: 1.0.3
digest: sha256:eacfe6cdc916044d9b3594d6a9b2f265593c50f41565df0689f6e0f612d9dec6
generated: 2018-10-15T10:48:19.443808+02:00

2
bitnami/kafka/requirements.yaml
View File

@@ -1,5 +1,5 @@
dependencies:
- name: zookeeper
version: 0.x.x
version: 1.x.x
repository: https://charts.bitnami.com/bitnami
condition: zookeeper.enabled

18
bitnami/kafka/templates/_helpers.tpl
View File

@@ -27,8 +27,22 @@ Return the proper Kafka image name
*/}}
{{- define "kafka.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName .Values.image.repository $tag -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}
{{/*
@@ -56,4 +70,4 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- define "kafka.zookeeper.fullname" -}}
{{- $name := default "zookeeper" .Values.zookeeper.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}

11
bitnami/kafka/values-production.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami Kafka image version
## ref: https://hub.docker.com/r/bitnami/kafka/tags/
##
@@ -319,6 +325,11 @@ metrics:
- kafka.network:*
- kafka.log:*
##
## Zookeeper chart configuration
##
## https://github.com/bitnami/charts/blob/master/bitnami/zookeeper/values.yaml
##
zookeeper:
enabled: true

11
bitnami/kafka/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami Kafka image version
## ref: https://hub.docker.com/r/bitnami/kafka/tags/
##
@@ -319,6 +325,11 @@ metrics:
- kafka.network:*
- kafka.log:*
##
## Zookeeper chart configuration
##
## https://github.com/bitnami/charts/blob/master/bitnami/zookeeper/values.yaml
##
zookeeper:
enabled: true

2
bitnami/mean/Chart.yaml
View File

@@ -1,5 +1,5 @@
name: mean
version: 4.1.0
version: 4.2.0
appVersion: 3.6.4
description: MEAN is a free and open-source JavaScript software stack for building dynamic web sites and web applications. The MEAN stack is MongoDB, Express.js, Angular, and Node.js. Because all components of the MEAN stack support programs written in JavaScript, MEAN applications can be written in one language for both server-side and client-side execution environments.
keywords:

1
bitnami/mean/README.md
View File

@@ -51,6 +51,7 @@ The following table lists the configurable parameters of the MEAN chart and thei
| Parameter | Description | Default |
|-----------------------------------------|-----------------------------------------------------------|-----------------------------------------------------------|
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | NodeJS image registry | `docker.io` |
| `image.repository` | NodeJS Image name | `bitnami/node` |
| `image.tag` | NodeJS Image tag | `{VERSION}` |

4
bitnami/mean/requirements.lock
View File

@@ -1,9 +1,9 @@
dependencies:
- name: mongodb
repository: https://kubernetes-charts.storage.googleapis.com/
version: 4.2.3
version: 4.5.0
- name: bitnami-common
repository: https://charts.bitnami.com/bitnami
version: 0.0.3
digest: sha256:e08b8d1bb8197aa8fdc27536aaa1de2e7de210515a451ebe94949a3db55264dd
generated: 2018-09-05T14:56:00.449083032+02:00
generated: 2018-10-16T08:37:10.583517+02:00

23
bitnami/mean/templates/_helpers.tpl
View File

@@ -40,3 +40,26 @@ Custom template to get proper service name
{{- printf "%s-%s" .Release.Name "mongodb-binding" | trunc 63 | trimSuffix "-" -}}
{{- end }}
{{- end -}}
{{/*
Return the proper MEAN image name
*/}}
{{- define "mean.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}

4
bitnami/mean/templates/deployment.yaml
View File

@@ -35,7 +35,7 @@ spec:
- name: app
mountPath: /app
- name: npm-install
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ template "mean.image" . }}"
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
workingDir: /app
command: ['/bin/bash', '-c', 'useradd bitnami && chown -R bitnami:bitnami /app && npm install']
@@ -44,7 +44,7 @@ spec:
mountPath: /app
containers:
- name: {{ template "mean.fullname" . }}
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ template "mean.image" . }}"
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
env:
{{- if .Values.mongodb.install }}

8
bitnami/mean/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami node image version
## ref: https://hub.docker.com/r/bitnami/node/tags/
##
@@ -84,6 +90,8 @@ resources: {}
##
## MongoDB chart configuration
##
## https://github.com/helm/charts/blob/master/stable/mongodb/values.yaml
##
mongodb:
## MongoDB admin password
## ref: https://github.com/bitnami/bitnami-docker-MongoDB/blob/master/README.md#setting-the-root-password-on-first-run

2
bitnami/memcached/Chart.yaml
View File

@@ -1,5 +1,5 @@
name: memcached
version: 1.1.0
version: 1.2.0
appVersion: 1.5.11
description: Chart for Memcached
keywords:

1
bitnami/memcached/README.md
View File

@@ -47,6 +47,7 @@ The following tables lists the configurable parameters of the Memcached chart an
| Parameter | Description | Default |
|-----------------------------|-------------------------------------|---------------------------------------------------------- |
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | Memcached image registry | `docker.io` |
| `image.repository` | Memcached Image name | `bitnami/memcached` |
| `image.tag` | Memcached Image tag | `{VERSION}` |

23
bitnami/memcached/templates/_helpers.tpl
View File

@@ -14,3 +14,26 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 24 -}}
{{- end -}}
{{/*
Return the proper Memcached image name
*/}}
{{- define "memcached.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}

2
bitnami/memcached/templates/deployment.yaml
View File

@@ -32,7 +32,7 @@ spec:
{{- end }}
containers:
- name: {{ template "fullname" . }}
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ template "memcached.image" . }}"
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
env:
- name: MEMCACHED_USERNAME

6
bitnami/memcached/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami Memcached image version
## ref: https://hub.docker.com/r/bitnami/memcached/tags/
##

2
bitnami/metrics-server/Chart.yaml
View File

@@ -1,5 +1,5 @@
name: metrics-server
version: 2.0.5
version: 2.1.0
appVersion: 0.3.1
description: Metrics Server is a cluster-wide aggregator of resource usage data. Metrics Server collects metrics from the Summary API, exposed by Kubelet on each node.
keywords:

1
bitnami/metrics-server/README.md
View File

@@ -47,6 +47,7 @@ The following tables lists the configurable parameters of the Metrics Server cha
| Parameter | Description | Default |
|--------------------------|-----------------------------------------------------------------------------|----------------------------------------|
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | Metrics Server image registry | `docker.io` |
| `image.repository` | Metrics Server image name | `bitnami/metrics-server` |
| `image.tag` | Metrics Server image tag | `{VERSION}` |

19
bitnami/metrics-server/templates/_helpers.tpl
View File

@@ -37,6 +37,21 @@ Create the name of the service account to use
Return the proper metrics-server image name
*/}}
{{- define "metrics-server.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository $tag -}}
{{- end -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}

6
bitnami/metrics-server/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami Metrics Server image version
## ref: https://hub.docker.com/r/bitnami/metrics-server/tags/
##

2
bitnami/mysql/Chart.yaml
View File

@@ -1,5 +1,5 @@
name: mysql
version: 4.0.6
version: 4.1.0
appVersion: 5.7.23
description: Chart to create a Highly available MySQL cluster
keywords:

1
bitnami/mysql/README.md
View File

@@ -47,6 +47,7 @@ The following tables lists the configurable parameters of the MySQL chart and th
| Parameter | Description | Default |
|-------------------------------------------|-------------------------------------------------------|-------------------------------------------------------------------|
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | MySQL image registry | `docker.io` |
| `image.repository` | MySQL Image name | `bitnami/mysql` |
| `image.tag` | MySQL Image tag | `{VERSION}` |

19
bitnami/mysql/templates/_helpers.tpl
View File

@@ -27,15 +27,27 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end }}
{{/*
Return the proper MySQL image name
*/}}
{{- define "mysql.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}
{{/*
@@ -47,4 +59,3 @@ Return the proper MySQL metrics exporter image name
{{- $tag := .Values.metrics.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}

6
bitnami/mysql/values-production.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami MySQL image
## ref: https://hub.docker.com/r/bitnami/mysql/tags/
##

6
bitnami/mysql/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami MySQL image
## ref: https://hub.docker.com/r/bitnami/mysql/tags/
##

2
bitnami/nginx-ingress-controller/Chart.yaml
View File

@@ -1,5 +1,5 @@
name: nginx-ingress-controller
version: 2.0.4
version: 2.1.0
appVersion: 0.20.0
description: Chart for the nginx Ingress controller
keywords:

1
bitnami/nginx-ingress-controller/README.md
View File

@@ -48,6 +48,7 @@ The following tables lists the configurable parameters of the nginx-ingress-cont
Parameter | Description | Default
--- | --- | ---
`global.imageRegistry` | Global Docker image registry | `nil`
`name` | name of the controller component | `controller`
`image.registry` | name of the container image registry | `docker.io`
`image.repository` | controller container image repository | `bitnami/nginx-ingress-controller`

19
bitnami/nginx-ingress-controller/templates/_helpers.tpl
View File

@@ -62,8 +62,23 @@ Create the name of the service account to use
Return the proper nginx-ingress-controller image name
*/}}
{{- define "nginx-ingress-controller.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository $tag -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}
{{/*
@@ -71,4 +86,4 @@ Create chart name and version as used by the chart label.
*/}}
{{- define "nginx-ingress-controller.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}

6
bitnami/nginx-ingress-controller/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami NGINX Ingress controller image version
## ref: https://hub.docker.com/r/bitnami/nginx-ingress-controller/tags/
name: controller

2
bitnami/nginx/Chart.yaml
View File

@@ -1,5 +1,5 @@
name: nginx
version: 1.0.1
version: 1.1.0
appVersion: 1.14.0
description: Chart for the nginx server
keywords:

1
bitnami/nginx/README.md
View File

@@ -44,6 +44,7 @@ The following tables lists the configurable parameters of the NGINX Open Source
| Parameter | Description | Default |
| ------------------------- | ------------------------------ | --------------------------------------------------------- |
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | NGINX image registry | `docker.io` |
| `image.repository` | NGINX Image name | `bitnami/nginx` |
| `image.tag` | NGINX Image tag | `{VERSION}` |

23
bitnami/nginx/templates/_helpers.tpl
View File

@@ -14,3 +14,26 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 24 -}}
{{- end -}}
{{/*
Return the proper NGINX image name
*/}}
{{- define "nginx.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}

2
bitnami/nginx/templates/deployment.yaml
View File

@@ -29,7 +29,7 @@ spec:
{{- end }}
containers:
- name: {{ template "fullname" . }}
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ template "nginx.image" . }}"
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
ports:
- name: http

8
bitnami/nginx/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami NGINX image version
## ref: https://hub.docker.com/r/bitnami/nginx/tags/
##
@@ -15,7 +21,7 @@ image:
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
##
# pullSecrets:
# - myRegistrKeySecretName
# - myRegistrKeySecretName
## Kubernetes configuration
## For minikube, set this to NodePort, elsewhere use LoadBalancer

2
bitnami/node/Chart.yaml
View File

@@ -1,5 +1,5 @@
name: node
version: 6.1.0
version: 6.2.0
appVersion: 10.7.0
description: Event-driven I/O server-side JavaScript environment based on V8
keywords:

9
bitnami/node/README.md
View File

@@ -51,6 +51,7 @@ The following table lists the configurable parameters of the Node chart and thei
| Parameter | Description | Default |
|-----------------------------------------|-----------------------------------------------------------|-----------------------------------------------------------|
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | NodeJS image registry | `docker.io` |
| `image.repository` | NodeJS Image name | `bitnami/node` |
| `image.tag` | NodeJS Image tag | `{VERSION}` |
@@ -159,7 +160,7 @@ ingress:
```
$ kubectl create secret generic my-database-secret --from-literal=host=YOUR_DATABASE_HOST --from-literal=port=YOUR_DATABASE_PORT --from-literal=username=YOUR_DATABASE_USER --from-literal=password=YOUR_DATABASE_PASSWORD --from-literal=database=YOUR_DATABASE_NAME
```
`YOUR_DATABASE_HOST`, `YOUR_DATABASE_PORT`, `YOUR_DATABASE_USER`, `YOUR_DATABASE_PASSWORD`, and `YOUR_DATABASE_NAME` are placeholders that must be replaced with correct values.
2. Deploy the node chart specifying the secret name
@@ -174,7 +175,7 @@ ingress:
2. Install the Open Service Broker for Azure in your Kubernetes cluster following [this instructions](https://github.com/Azure/open-service-broker-azure/tree/master/contrib/k8s/charts/open-service-broker-azure)
> TIP: you may want to install the osba chart setting the `modules.minStability=EXPERIMENTAL` to see all the available services.
>
>
> $ helm install azure/open-service-broker-azure --name osba --namespace osba \
> --set azure.subscriptionId=$AZURE_SUBSCRIPTION_ID \
> --set azure.tenantId=$AZURE_TENANT_ID \
@@ -202,7 +203,7 @@ ingress:
- "0.0.0.0/0"
```
Please update the `YOUR_AZURE_LOCATION` placeholder in the above example.
Please update the `YOUR_AZURE_LOCATION` placeholder in the above example.
```
$ kubectl create -f mongodb-service-instance.yml
@@ -220,7 +221,7 @@ Deploying the helm chart enabling the Azure external database makes the followin
- You would want an Azure CosmosDB MongoDB database
- Your application uses DATABASE_HOST, DATABASE_PORT, DATABASE_USER, DATABASE_PASSWORD, and DATABASE_NAME environment variables to connect to the database.
You can read more about the kubernetes service catalog at https://github.com/kubernetes-bitnami/service-catalog
You can read more about the kubernetes service catalog at https://github.com/kubernetes-bitnami/service-catalog
## Upgrading

4
bitnami/node/requirements.lock
View File

@@ -1,9 +1,9 @@
dependencies:
- name: mongodb
repository: https://kubernetes-charts.storage.googleapis.com/
version: 4.2.3
version: 4.5.0
- name: bitnami-common
repository: https://charts.bitnami.com/bitnami
version: 0.0.3
digest: sha256:e08b8d1bb8197aa8fdc27536aaa1de2e7de210515a451ebe94949a3db55264dd
generated: 2018-09-05T15:06:25.041888238+02:00
generated: 2018-10-16T08:36:36.201735+02:00

23
bitnami/node/templates/_helpers.tpl
View File

@@ -40,3 +40,26 @@ Custom template to get proper service name
{{- printf "%s-%s" .Release.Name "mongodb-binding" | trunc 63 | trimSuffix "-" -}}
{{- end }}
{{- end -}}
{{/*
Return the proper Node image name
*/}}
{{- define "node.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}

4
bitnami/node/templates/deployment.yaml
View File

@@ -36,7 +36,7 @@ spec:
- name: app
mountPath: /app
- name: npm-install
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ template "node.image" . }}"
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
workingDir: /app
command: ['/bin/bash', '-c', 'useradd bitnami && chown -R bitnami:bitnami /app && npm install']
@@ -45,7 +45,7 @@ spec:
mountPath: /app
containers:
- name: {{ template "node.fullname" . }}
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ template "node.image" . }}"
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
env:
{{- if .Values.mongodb.install }}

17
bitnami/node/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami node image version
## ref: https://hub.docker.com/r/bitnami/node/tags/
##
@@ -15,14 +21,14 @@ image:
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
##
# pullSecrets:
# - myRegistrKeySecretName
# - myRegistrKeySecretName
gitImage:
registry: docker.io
repository: alpine/git
tag: latest
pullPolicy: IfNotPresent
## Git repository http/https
##
repository: https://github.com/bitnami/sample-mean.git
@@ -83,6 +89,8 @@ resources: {}
##
## MongoDB chart configuration
##
## https://github.com/helm/charts/blob/master/stable/mongodb/values.yaml
##
mongodb:
## Whether to deploy a mongodb server to satisfy the applications database requirements.
## To use an external database set this to false and configure the externaldb parameters
@@ -92,7 +100,7 @@ mongodb:
##
mongodbUsername: user
mongodbDatabase: test_db
mongodbPassword: secret_password
mongodbPassword: secret_password
## Provision an external database (Only if mongodb.install is false)
## You can:
@@ -110,6 +118,9 @@ externaldb:
broker:
serviceInstanceName:
## Configure ingress resource that allow you to access the application.
## ref: http://kubernetes.io/docs/user-guide/ingress/
##
ingress:
## Set to true to enable ingress record generation
enabled: false

2
bitnami/postgresql/Chart.yaml
View File

@@ -1,5 +1,5 @@
name: postgresql
version: 3.0.2
version: 3.1.0
appVersion: 10.5.0
description: Chart for PostgreSQL
keywords:

1
bitnami/postgresql/README.md
View File

@@ -47,6 +47,7 @@ The following tables lists the configurable parameters of the PostgreSQL chart a
| Parameter | Description | Default |
|----------------------------|-------------------------------------------|---------------------------------------------------------- |
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | PostgreSQL image registry | `docker.io` |
| `image.repository` | PostgreSQL Image name | `bitnami/postgresql` |
| `image.tag` | PostgreSQL Image tag | `{VERSION}` |

20
bitnami/postgresql/templates/_helpers.tpl
View File

@@ -39,9 +39,23 @@ Create chart name and version as used by the chart label.
Return the proper PostgreSQL image name
*/}}
{{- define "postgresql.image" -}}
{{- $registryName := default "docker.io" .Values.image.registry -}}
{{- $tag := default "latest" .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName .Values.image.repository $tag -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}
{{/*

6
bitnami/postgresql/values-production.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami PostgreSQL image version
## ref: https://hub.docker.com/r/bitnami/postgresql/tags/
##

6
bitnami/postgresql/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami PostgreSQL image version
## ref: https://hub.docker.com/r/bitnami/postgresql/tags/
##

2
bitnami/tensorflow-inception/Chart.yaml
View File

@@ -1,5 +1,5 @@
name: tensorflow-inception
version: 1.0.2
version: 1.1.0
appVersion: 1.10.1
description: Open-source software library for serving machine learning models
keywords:

1
bitnami/tensorflow-inception/README.md
View File

@@ -62,6 +62,7 @@ The following tables lists the configurable parameters of the TensorFlow Incepti
| Parameter | Description | Default |
| ------------------------------- | -------------------------------------- | ---------------------------------------------------------- |
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `server.image.registry` | TensorFlow Serving image registry | `docker.io` |
| `server.image.repository` | TensorFlow Serving Image name | `bitnami/tensorflow-serving` |
| `server.image.tag` | TensorFlow Serving Image tag | `{VERSION}` |

46
bitnami/tensorflow-inception/templates/_helpers.tpl
View File

@@ -14,3 +14,49 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Return the proper tensorflow-inception server image name
*/}}
{{- define "tensorflow-inception.server.image" -}}
{{- $registryName := .Values.server.image.registry -}}
{{- $repositoryName := .Values.server.image.repository -}}
{{- $tag := .Values.server.image.tag | toString -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}
{{/*
Return the proper tensorflow-inception client image name
*/}}
{{- define "tensorflow-inception.client.image" -}}
{{- $registryName := .Values.client.image.registry -}}
{{- $repositoryName := .Values.client.image.repository -}}
{{- $tag := .Values.client.image.tag | toString -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}

2
bitnami/tensorflow-inception/templates/deployment.yaml
View File

@@ -28,7 +28,7 @@ spec:
{{- end }}
containers:
- name: {{ template "fullname" . }}
image: "{{ .Values.server.image.registry }}/{{ .Values.server.image.repository }}:{{ .Values.server.image.tag }}"
image: "{{ template "tensorflow-inception.server.image" . }}"
imagePullPolicy: {{ .Values.server.image.pullPolicy | quote }}
readinessProbe:
tcpSocket:

2
bitnami/tensorflow-inception/templates/inception-job.yaml
View File

@@ -20,7 +20,7 @@ spec:
{{- end}}
{{- end }}
- name: seed
image: "{{ .Values.client.image.registry }}/{{ .Values.client.image.repository }}:{{ .Values.client.image.tag }}"
image: "{{ template "tensorflow-inception.client.image" . }}"
imagePullPolicy: {{ .Values.client.image.pullPolicy | quote }}
command:
- "/bin/sh"

6
bitnami/tensorflow-inception/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## TensorFlow Serving server image version
## ref: https://hub.docker.com/r/bitnami/tensorflow-serving/tags/
##

2
bitnami/tomcat/Chart.yaml
View File

@@ -1,5 +1,5 @@
name: tomcat
version: 1.0.2
version: 1.1.0
appVersion: 8.5.34
description: Chart for Apache Tomcat
keywords:

1
bitnami/tomcat/README.md
View File

@@ -47,6 +47,7 @@ The following tables lists the configurable parameters of the Tomcat chart and t
| Parameter | Description | Default |
|-------------------------------|----------------------------------------------|---------------------------------------------------------- |
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | Tomcat image registry | `docker.io` |
| `image.repository` | Tomcat Image name | `bitnami/tomcat` |
| `image.tag` | Tomcat Image tag | `{VERSION}` |

23
bitnami/tomcat/templates/_helpers.tpl
View File

@@ -14,3 +14,26 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Return the proper Tomcat image name
*/}}
{{- define "tomcat.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}

2
bitnami/tomcat/templates/deployment.yaml
View File

@@ -27,7 +27,7 @@ spec:
{{- end }}
containers:
- name: {{ template "fullname" . }}
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ template "tomcat.image" . }}"
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
env:
- name: TOMCAT_USERNAME

6
bitnami/tomcat/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami Tomcat image version
## ref: https://hub.docker.com/r/bitnami/tomcat/tags/
##

2
bitnami/wildfly/Chart.yaml
View File

@@ -1,5 +1,5 @@
name: wildfly
version: 1.0.2
version: 1.1.0
appVersion: 14.0.1
description: Chart for Wildfly
keywords:

1
bitnami/wildfly/README.md
View File

@@ -47,6 +47,7 @@ The following tables lists the configurable parameters of the WildFly chart and
| Parameter | Description | Default |
|----------------------------|----------------------------------------|------------------------------------------------------------|
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | WildFly image registry | `docker.io` |
| `image.repository` | WildFly Image name | `bitnami/wildfly` |
| `image.tag` | WildFly Image tag | `{VERSION}` |

23
bitnami/wildfly/templates/_helpers.tpl
View File

@@ -14,3 +14,26 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 24 -}}
{{- end -}}
{{/*
Return the proper Wildfly image name
*/}}
{{- define "wildfly.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}

2
bitnami/wildfly/templates/deployment.yaml
View File

@@ -27,7 +27,7 @@ spec:
{{- end }}
containers:
- name: {{ template "fullname" . }}
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ template "wildfly.image" . }}"
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
env:
- name: WILDFLY_USERNAME

6
bitnami/wildfly/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami WildFly image version
## ref: https://hub.docker.com/r/bitnami/wildfly/tags/
##

2
bitnami/zookeeper/Chart.yaml
View File

@@ -1,5 +1,5 @@
name: zookeeper
version: 1.0.3
version: 1.1.0
appVersion: 3.4.12
description: A centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services for distributed applications.
keywords:

1
bitnami/zookeeper/README.md
View File

@@ -47,6 +47,7 @@ The following tables lists the configurable parameters of the Zookeeper chart an
| Parameter | Description | Default |
|---------------------------------------|---------------------------------------------------------------------|----------------------------------------------------------|
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | Zookeeper image registry | `docker.io` |
| `image.repository` | Zookeeper Image name | `bitnami/zookeeper` |
| `image.tag` | Zookeeper Image tag | `{VERSION}` |

17
bitnami/zookeeper/templates/_helpers.tpl
View File

@@ -26,6 +26,21 @@ Create chart name and version as used by the chart label.
Return the proper Zookeeper image name
*/}}
{{- define "zookeeper.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository $tag -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}

6
bitnami/zookeeper/values.yaml
View File

@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami Zookeeper image version
## ref: https://hub.docker.com/r/bitnami/zookeeper/tags/
##