Add global registry option to Bitnami charts

This commit is contained in:
Carlos Rodriguez Hernandez
2018-10-11 13:02:53 +00:00
parent 1c770eb843
commit 395ba08e2b
91 changed files with 451 additions and 64 deletions

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:

View File

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

View File

@@ -14,3 +14,18 @@ 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 -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}

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

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## Bitnami Apache image version
## ref: https://hub.docker.com/r/bitnami/apache/tags/
##

View File

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

View File

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

View File

@@ -26,7 +26,13 @@ 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 -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## Bitnami Consul image version
## ref: https://hub.docker.com/r/bitnami/consul/tags/
##

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:

View File

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

View File

@@ -26,9 +26,15 @@ 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 -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{/*

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## Bitnami Elasticsearch image version
## ref: https://hub.docker.com/r/bitnami/elasticsearch/tags/
##

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## Bitnami Elasticsearch image version
## ref: https://hub.docker.com/r/bitnami/elasticsearch/tags/
##

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:

View File

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

View File

@@ -27,10 +27,15 @@ Return the proper etcd image name
*/}}
{{- define "etcd.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName .Values.image.repository $tag -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{/*
{{/*
Return the proper etcd peer protocol
@@ -81,4 +86,4 @@ Return the proper etcdctl authentication options
{{- if .Values.auth.client.enableAuthentication -}}
{{- printf "%s" $caOption -}}
{{- end -}}
{{- end -}}
{{- end -}}

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## Bitnami etcd image version
## ref: https://hub.docker.com/r/bitnami/etcd/tags/
##

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## Bitnami etcd image version
## ref: https://hub.docker.com/r/bitnami/etcd/tags/
##

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:

View File

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

View File

@@ -27,8 +27,14 @@ Return the proper external-dns image name
*/}}
{{- define "external-dns.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName .Values.image.repository $tag -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{/*

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## Bitnami external-dns image version
## ref: https://hub.docker.com/r/bitnami/external-dns/tags/
##

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:

View File

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

View File

@@ -14,3 +14,18 @@ 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 -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}

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

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## Bitnami Jenkins image version
## ref: https://hub.docker.com/r/bitnami/jenkins/tags/
##

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:

View File

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

View File

@@ -27,8 +27,14 @@ Return the proper Kafka image name
*/}}
{{- define "kafka.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName .Values.image.repository $tag -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{/*
@@ -56,4 +62,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 -}}

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## 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

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## 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

View File

@@ -1,5 +1,5 @@
name: mean
version: 4.0.2
version: 4.1.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:

View File

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

View File

@@ -40,3 +40,18 @@ 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 -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}

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 }}

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## 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

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:

View File

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

View File

@@ -14,3 +14,18 @@ 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 -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}

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

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## Bitnami Memcached image version
## ref: https://hub.docker.com/r/bitnami/memcached/tags/
##

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:

View File

@@ -47,6 +47,7 @@ The following tables lists the configurable parameters of the Metrics Server cha
| Parameter | Description | Default |
|--------------------------|-----------------------------------------------------------------------------|----------------------------------------|
| `global.registry` | Global chart 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}` |

View File

@@ -37,6 +37,13 @@ Create the name of the service account to use
Return the proper metrics-server image name
*/}}
{{- define "metrics-server.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository $tag -}}
{{- end -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## Bitnami Metrics Server image version
## ref: https://hub.docker.com/r/bitnami/metrics-server/tags/
##

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:

View File

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

View File

@@ -32,7 +32,12 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
Return the proper MySQL image name
*/}}
{{- define "mysql.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $registryName := .Values.image.registry -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
@@ -47,4 +52,3 @@ Return the proper MySQL metrics exporter image name
{{- $tag := .Values.metrics.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## Bitnami MySQL image
## ref: https://hub.docker.com/r/bitnami/mysql/tags/
##

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## Bitnami MySQL image
## ref: https://hub.docker.com/r/bitnami/mysql/tags/
##

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:

View File

@@ -48,6 +48,7 @@ The following tables lists the configurable parameters of the nginx-ingress-cont
Parameter | Description | Default
--- | --- | ---
`global.registry` | Global chart 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`

View File

@@ -62,8 +62,15 @@ 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 -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository $tag -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{/*
@@ -71,4 +78,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 -}}

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## Bitnami NGINX Ingress controller image version
## ref: https://hub.docker.com/r/bitnami/nginx-ingress-controller/tags/
name: controller

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:

View File

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

View File

@@ -14,3 +14,18 @@ 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 -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}

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

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## 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

View File

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

View File

@@ -51,6 +51,7 @@ The following table lists the configurable parameters of the Node chart and thei
| Parameter | Description | Default |
|-----------------------------------------|-----------------------------------------------------------|-----------------------------------------------------------|
| `global.registry` | Global chart image registry | `nil` |
| `image.registry` | NodeJS image registry | `docker.io` |
| `image.repository` | NodeJS Image name | `bitnami/node` |
| `image.tag` | NodeJS Image tag | `{VERSION}` |
@@ -153,7 +154,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
@@ -168,7 +169,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 \
@@ -196,7 +197,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
@@ -214,7 +215,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

View File

@@ -40,3 +40,18 @@ 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 -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}

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 }}

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## 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,7 +118,7 @@ externaldb:
broker:
serviceInstanceName:
## Configure ingress resource that allow you to access the application.
## Configure ingress resource that allow you to access the application.
## ref: http://kubernetes.io/docs/user-guide/ingress/
##
ingress:

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:

View File

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

View File

@@ -39,9 +39,15 @@ 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 -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{/*

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## Bitnami PostgreSQL image version
## ref: https://hub.docker.com/r/bitnami/postgresql/tags/
##

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## Bitnami PostgreSQL image version
## ref: https://hub.docker.com/r/bitnami/postgresql/tags/
##

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:

View File

@@ -62,6 +62,7 @@ The following tables lists the configurable parameters of the TensorFlow Incepti
| Parameter | Description | Default |
| ------------------------------- | -------------------------------------- | ---------------------------------------------------------- |
| `global.registry` | Global chart 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}` |

View File

@@ -14,3 +14,33 @@ 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 -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.server.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.server.image.repository -}}
{{- $tag := .Values.server.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{/*
Return the proper tensorflow-inception client image name
*/}}
{{- define "tensorflow-inception.client.image" -}}
{{- $registryName := .Values.client.image.registry -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.client.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.client.image.repository -}}
{{- $tag := .Values.client.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}

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:

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"

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## TensorFlow Serving server image version
## ref: https://hub.docker.com/r/bitnami/tensorflow-serving/tags/
##

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:

View File

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

View File

@@ -14,3 +14,18 @@ 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 -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}

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

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## Bitnami Tomcat image version
## ref: https://hub.docker.com/r/bitnami/tomcat/tags/
##

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:

View File

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

View File

@@ -14,3 +14,18 @@ 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 -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}

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

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## Bitnami WildFly image version
## ref: https://hub.docker.com/r/bitnami/wildfly/tags/
##

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:

View File

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

View File

@@ -26,6 +26,13 @@ Create chart name and version as used by the chart label.
Return the proper Zookeeper image name
*/}}
{{- define "zookeeper.image" -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository $tag -}}
{{- $registryName := .Values.image.registry -}}
{{- if .Values.global.registry -}}
{{- $registryName := .Values.global.registry -}}
{{- else -}}
{{- $registryName := .Values.image.registry -}}
{{- end -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}

View File

@@ -1,3 +1,9 @@
## Global chart image registry
## Please, note that this registry would be used for all the containers in the chart and dependencies
##
# global:
# registry:
## Bitnami Zookeeper image version
## ref: https://hub.docker.com/r/bitnami/zookeeper/tags/
##