Merge branch 'master' into tensorflow_simplify_chart

This commit is contained in:
Tomas Pizarro
2018-10-18 15:18:57 +02:00
committed by GitHub
223 changed files with 1422 additions and 609 deletions

View File

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

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/apache repository: bitnami/apache
tag: 2.4.35-debian-9 tag: 2.4.35
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
## ##

View File

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

View File

@@ -1,6 +1,6 @@
# Consul Helm Chart # HashiCorp Consul Helm Chart
[Consul](https://www.consul.io/) has multiple components, but as a whole, it is a tool for discovering and configuring services in your infrastructure [HashiCorp Consul](https://www.consul.io/) has multiple components, but as a whole, it is a tool for discovering and configuring services in your infrastructure
## TL;DR ## TL;DR
@@ -11,7 +11,7 @@ $ helm install bitnami/consul
## Introduction ## Introduction
This chart bootstraps a [Consul](https://github.com/bitnami/bitnami-docker-consul) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. This chart bootstraps a [HashiCorp Consul](https://github.com/bitnami/bitnami-docker-consul) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters.
@@ -28,7 +28,7 @@ To install the chart with the release name `my-release`:
$ helm install --name my-release bitnami/consul $ helm install --name my-release bitnami/consul
``` ```
The command deploys Consul on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. The command deploys HashiCorp Consul on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
> **Tip**: List all releases using `helm list` > **Tip**: List all releases using `helm list`
@@ -47,63 +47,63 @@ $ helm delete --purge my-release
## Configuration ## Configuration
The following tables lists the configurable parameters of the Consul chart and their default values. The following tables lists the configurable parameters of the HashiCorp Consul chart and their default values.
| Parameter | Description | Default | | Parameter | Description | Default |
| ------------------------------------ | ------------------------------------------------------ | ---------------------------------------------------------- | | ------------------------------------ | ---------------------------------------------------------------- | ---------------------------------------------------------- |
| `global.imageRegistry` | Global Docker image registry | `nil` | | `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | Consul image registry | `docker.io` | | `image.registry` | HashiCorp Consul image registry | `docker.io` |
| `image.repository` | Consul image name | `bitnami/consul` | | `image.repository` | HashiCorp Consul image name | `bitnami/consul` |
| `image.tag` | Consul image tag | `{VERSION}` | | `image.tag` | HashiCorp Consul image tag | `{VERSION}` |
| `image.pullPolicy` | Image pull policy | `Always` | | `image.pullPolicy` | Image pull policy | `Always` |
| `image.pullSecrets` | Specify image pull secrets | `nil` | | `image.pullSecrets` | Specify image pull secrets | `nil` |
| `replicas` | Number of replicas | `3` | | `replicas` | Number of replicas | `3` |
| `httpPort` | Consul http listening port | `8500` | | `httpPort` | HashiCorp Consul http listening port | `8500` |
| `rpcPort` | Consul rpc listening port | `8400` | | `rpcPort` | HashiCorp Consul rpc listening port | `8400` |
| `serflanPort` | Container serf lan listening port | `8301` | | `serflanPort` | Container serf lan listening port | `8301` |
| `serverPort` | Container server listening port | `8300` | | `serverPort` | Container server listening port | `8300` |
| `consulDnsPort` | Container dns listening port | `8600` | | `consulDnsPort` | Container dns listening port | `8600` |
| `uiPort` | Consul UI port | `80` | | `uiPort` | HashiCorp Consul UI port | `80` |
| `datacenterName` | Consul datacenter name | `dc1` | | `datacenterName` | HashiCorp Consul datacenter name | `dc1` |
| `gossipKey` | Gossip key for all members | `nil` | | `gossipKey` | Gossip key for all members | `nil` |
| `domain` | Consul domain | `consul` | | `domain` | HashiCorp Consul domain | `consul` |
| `clientAddress` | Address in which Consul will bind client interfaces | `0.0.0.0` | | `clientAddress` | Address in which HashiCorp Consul will bind client interfaces | `0.0.0.0` |
| `serflanAddress` | Address used for Serf LAN communications | `0.0.0.0` | | `serflanAddress` | Address used for Serf LAN communications | `0.0.0.0` |
| `raftMultiplier` | Multiplier used to scale key Raft timing parameters | `10Gi` | | `raftMultiplier` | Multiplier used to scale key Raft timing parameters | `10Gi` |
| `persistence.enabled` | Use a PVC to persist data | `true` | | `persistence.enabled` | Use a PVC to persist data | `true` |
| `persistence.storageClass` | Storage class of backing PVC | `nil` (uses alpha storage class annotation) | | `persistence.storageClass` | Storage class of backing PVC | `nil` (uses alpha storage class annotation) |
| `persistence.accessMode` | Use volume as ReadOnly or ReadWrite | `ReadWriteOnce` | | `persistence.accessMode` | Use volume as ReadOnly or ReadWrite | `ReadWriteOnce` |
| `persistence.size` | Size of data volume | `8Gi` | | `persistence.size` | Size of data volume | `8Gi` |
| `persistence.annotations` | Annotations for the persistent volume | `nil` | | `persistence.annotations` | Annotations for the persistent volume | `nil` |
| `resources` | Container resource requests and limits | `{}` | | `resources` | Container resource requests and limits | `{}` |
| `maxUnavailable` | Pod disruption Budget maxUnavailable | `1` | | `maxUnavailable` | Pod disruption Budget maxUnavailable | `1` |
| `nodeAffinity` | Consul pod node-affinity setting | `nil` | | `nodeAffinity` | HashiCorp Consul pod node-affinity setting | `nil` |
| `antiAffinity` | Consul pod anti-affinity setting | `soft` | | `antiAffinity` | HashiCorp Consul pod anti-affinity setting | `soft` |
| `ui.service.enabled` | Use a service to access Consul Ui | `true` | | `ui.service.enabled` | Use a service to access HashiCorp Consul Ui | `true` |
| `ui.service.type` | Kubernetes Service Type | `ClusterIP` | | `ui.service.type` | Kubernetes Service Type | `ClusterIP` |
| `ui.service.annotations` | Annotations for Consul UI service | {} | | `ui.service.annotations` | Annotations for HashiCorp Consul UI service | {} |
| `ui.service.loadBalancerIP` | IP if Consul UI service type is `LoadBalancer` | `nil` | | `ui.service.loadBalancerIP` | IP if HashiCorp Consul UI service type is `LoadBalancer` | `nil` |
| `ui.ingress.enabled` | Enable ingress controller resource | `false` | | `ui.ingress.enabled` | Enable ingress controller resource | `false` |
| `ui.ingress.hosts[0].name` | Hostname to your Consul installation | `consul-ui.local` | | `ui.ingress.hosts[0].name` | Hostname to your HashiCorp Consul installation | `consul-ui.local` |
| `ui.ingress.hosts[0].path` | Path within the url structure | `/` | | `ui.ingress.hosts[0].path` | Path within the url structure | `/` |
| `ui.ingress.hosts[0].tls` | Utilize TLS backend in ingress | `false` | | `ui.ingress.hosts[0].tls` | Utilize TLS backend in ingress | `false` |
| `ui.ingress.hosts[0].certManager` | Add annotations for cert-manager | `false` | | `ui.ingress.hosts[0].certManager` | Add annotations for cert-manager | `false` |
| `ui.ingress.hosts[0].tlsSecret` | TLS Secret (certificates) | `consul-ui.local-tls` | | `ui.ingress.hosts[0].tlsSecret` | TLS Secret (certificates) | `consul-ui.local-tls` |
| `ui.ingress.hosts[0].annotations` | Annotations for this host's ingress record | `[]` | | `ui.ingress.hosts[0].annotations` | Annotations for this host's ingress record | `[]` |
| `ui.ingress.secrets[0].name` | TLS Secret Name | `nil` | | `ui.ingress.secrets[0].name` | TLS Secret Name | `nil` |
| `ui.ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` | | `ui.ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` |
| `ui.ingress.secrets[0].key` | TLS Secret Key | `nil` | | `ui.ingress.secrets[0].key` | TLS Secret Key | `nil` |
| `configmap` | Consul configuration to be injected as ConfigMap | `nil` | | `configmap` | HashiCorp Consul configuration to be injected as ConfigMap | `nil` |
| `metrics.enabled` | Start a side-car prometheus exporter | `false` | | `metrics.enabled` | Start a side-car prometheus exporter | `false` |
| `metrics.image` | Exporter image | `prom/consul-exporter` | | `metrics.image` | Exporter image | `prom/consul-exporter` |
| `metrics.imageTag` | Exporter image tag | `v0.3.0` | | `metrics.imageTag` | Exporter image tag | `v0.3.0` |
| `metrics.imagePullPolicy` | Exporter image pull policy | `IfNotPresent` | | `metrics.imagePullPolicy` | Exporter image pull policy | `IfNotPresent` |
| `metrics.resources` | Exporter resource requests/limit | `{}` | | `metrics.resources` | Exporter resource requests/limit | `{}` |
| `metrics.podAnnotations` | Exporter annotations | `{}` | | `metrics.podAnnotations` | Exporter annotations | `{}` |
| `nodeSelector` | Node labels for pod assignment | `{}` | | `nodeSelector` | Node labels for pod assignment | `{}` |
| `livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated | 30 | | `livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated | 30 |
| `livenessProbe.periodSeconds` | How often to perform the probe | 10 | | `livenessProbe.periodSeconds` | How often to perform the probe | 10 |
| `livenessProbe.timeoutSeconds` | When the probe times out | 5 | | `livenessProbe.timeoutSeconds` | When the probe times out | 5 |
| `livenessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed. | 1 | | `livenessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed. | 1 |
| `livenessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | 6 | | `livenessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | 6 |
| `podAnnotations` | Pod annotations | `{}` | | `podAnnotations` | Pod annotations | `{}` |
@@ -118,7 +118,7 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
```console ```console
$ helm install --name my-release --set domain=consul-domain,gossipKey=secretkey bitnami/consul $ helm install --name my-release --set domain=consul-domain,gossipKey=secretkey bitnami/consul
``` ```
The above command sets the Consul domain to `consul-domain` and sets the gossip key to `secretkey`. The above command sets the HashiCorp Consul domain to `consul-domain` and sets the gossip key to `secretkey`.
Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
@@ -130,7 +130,7 @@ $ helm install --name my-release -f values.yaml bitnami/consul
## Persistence ## Persistence
The [Bitnami Consul](https://github.com/bitnami/bitnami-docker-consul) image stores the Consul data at the `/bitnami` path of the container. The [Bitnami HashiCorp Consul](https://github.com/bitnami/bitnami-docker-consul) image stores the HashiCorp Consul data at the `/bitnami` path of the container.
Persistent Volume Claims are used to keep the data across deployments. This is known to work in GCE, AWS, and minikube. Persistent Volume Claims are used to keep the data across deployments. This is known to work in GCE, AWS, and minikube.
See the [Configuration](#configuration) section to configure the PVC or to disable persistence. See the [Configuration](#configuration) section to configure the PVC or to disable persistence.
@@ -140,20 +140,20 @@ See the [Configuration](#configuration) section to configure the PVC or to disab
This chart provides support for ingress resources. If you have an This chart provides support for ingress resources. If you have an
ingress controller installed on your cluster, such as [nginx-ingress](https://kubeapps.com/charts/stable/nginx-ingress) ingress controller installed on your cluster, such as [nginx-ingress](https://kubeapps.com/charts/stable/nginx-ingress)
or [traefik](https://kubeapps.com/charts/stable/traefik) you can utilize or [traefik](https://kubeapps.com/charts/stable/traefik) you can utilize
the ingress controller to service your Consul UI application. the ingress controller to service your HashiCorp Consul UI application.
To enable ingress integration, please set `ingress.enabled` to `true` To enable ingress integration, please set `ingress.enabled` to `true`
### Hosts ### Hosts
Most likely you will only want to have one hostname that maps to this Most likely you will only want to have one hostname that maps to this
Consul installation, however it is possible to have more than one HashiCorp Consul installation, however it is possible to have more than one
host. To facilitate this, the `ingress.hosts` object is an array. host. To facilitate this, the `ingress.hosts` object is an array.
For each item, please indicate a `name`, `tls`, `tlsSecret`, and any For each item, please indicate a `name`, `tls`, `tlsSecret`, and any
`annotations` that you may want the ingress controller to know about. `annotations` that you may want the ingress controller to know about.
Indicating TLS will cause Consul to generate HTTPS urls, and Indicating TLS will cause HashiCorp Consul to generate HTTPS urls, and
Consul will be connected to at port 443. The actual secret that HashiCorp Consul will be connected to at port 443. The actual secret that
`tlsSecret` references does not have to be generated by this chart. `tlsSecret` references does not have to be generated by this chart.
However, please note that if TLS is enabled, the ingress record will not However, please note that if TLS is enabled, the ingress record will not
work until this secret exists. work until this secret exists.
@@ -222,7 +222,7 @@ kubectl create secret generic consul-tls-encryption \
> Take into account that you will need to create a config map with the proper configuration. > Take into account that you will need to create a config map with the proper configuration.
If the secret is specified, the chart will locate those files at `/opt/bitnami/consul/certs/`, so you will want to use the below snippet to configure Consul TLS encryption in your config map: If the secret is specified, the chart will locate those files at `/opt/bitnami/consul/certs/`, so you will want to use the below snippet to configure HashiCorp Consul TLS encryption in your config map:
``` ```
"ca_file": "/opt/bitnami/consul/certs/ca.pem", "ca_file": "/opt/bitnami/consul/certs/ca.pem",

View File

@@ -4,13 +4,13 @@
# global: # global:
# imageRegistry: # imageRegistry:
## Bitnami Consul image version ## Bitnami HashiCorp Consul image version
## ref: https://hub.docker.com/r/bitnami/consul/tags/ ## ref: https://hub.docker.com/r/bitnami/consul/tags/
## ##
image: image:
registry: docker.io registry: docker.io
repository: bitnami/consul repository: bitnami/consul
tag: 1.3.0-debian-9 tag: 1.3.0
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

@@ -4,13 +4,13 @@
# global: # global:
# imageRegistry: # imageRegistry:
## Bitnami Consul image version ## Bitnami HashiCorp Consul image version
## ref: https://hub.docker.com/r/bitnami/consul/tags/ ## ref: https://hub.docker.com/r/bitnami/consul/tags/
## ##
image: image:
registry: docker.io registry: docker.io
repository: bitnami/consul repository: bitnami/consul
tag: 1.3.0-debian-9 tag: 1.3.0
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

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

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/elasticsearch repository: bitnami/elasticsearch
tag: 6.4.2-debian-9 tag: 6.4.2
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/elasticsearch repository: bitnami/elasticsearch
tag: 6.4.2-debian-9 tag: 6.4.2
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

@@ -1,5 +1,5 @@
name: etcd name: etcd
version: 1.2.0 version: 1.2.1
appVersion: 3.3.10 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 description: etcd is a distributed key value store that provides a reliable way to store data across a cluster of machines
keywords: keywords:

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/etcd repository: bitnami/etcd
tag: 3.3.10-debian-9 tag: 3.3.10
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/etcd repository: bitnami/etcd
tag: 3.3.10-debian-9 tag: 3.3.10
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

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

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/external-dns repository: bitnami/external-dns
tag: 0.5.7-debian-9 tag: 0.5.8
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -123,7 +123,7 @@ rbac:
## ##
serviceAccountName: default serviceAccountName: default
## RBAC API version ## RBAC API version
apiVersion: v1beta1 apiVersion: v1beta1
## Kubernetes Security Context ## Kubernetes Security Context
## https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ ## https://kubernetes.io/docs/tasks/configure-pod-container/security-context/

View File

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

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/jenkins repository: bitnami/jenkins
tag: 2.138.2-debian-9 tag: 2.138.2
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

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

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/kafka repository: bitnami/kafka
tag: 2.0.0-debian-9 tag: 2.0.0
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/kafka repository: bitnami/kafka
tag: 2.0.0-debian-9 tag: 2.0.0
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

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

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/memcached repository: bitnami/memcached
tag: 1.5.11-debian-9 tag: 1.5.11
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

@@ -1,5 +1,5 @@
name: metrics-server name: metrics-server
version: 2.1.0 version: 2.1.1
appVersion: 0.3.1 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. 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: keywords:

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/metrics-server repository: bitnami/metrics-server
tag: 0.3.1-debian-9 tag: 0.3.1
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

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

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/mysql repository: bitnami/mysql
tag: 5.7.23-debian-9 tag: 5.7.23
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/mysql repository: bitnami/mysql
tag: 5.7.23-debian-9 tag: 5.7.23
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

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

View File

@@ -10,7 +10,7 @@ name: controller
image: image:
registry: docker.io registry: docker.io
repository: bitnami/nginx-ingress-controller repository: bitnami/nginx-ingress-controller
tag: 0.20.0-debian-9 tag: 0.20.0
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

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

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/nginx repository: bitnami/nginx
tag: 1.14.0-debian-9 tag: 1.14.0
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

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

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/postgresql repository: bitnami/postgresql
tag: 10.5.0-debian-9 tag: 10.5.0
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/postgresql repository: bitnami/postgresql
tag: 10.5.0-debian-9 tag: 10.5.0
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

@@ -11,7 +11,7 @@ server:
image: image:
registry: docker.io registry: docker.io
repository: bitnami/tensorflow-serving repository: bitnami/tensorflow-serving
tag: 1.10.1-debian-9 tag: 1.10.1
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -32,7 +32,7 @@ client:
image: image:
registry: docker.io registry: docker.io
repository: bitnami/tensorflow-inception repository: bitnami/tensorflow-inception
tag: 1.10.1-debian-9 tag: 1.10.1
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

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

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/tomcat repository: bitnami/tomcat
tag: 8.5.34-debian-9 tag: 8.5.34
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

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

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/wildfly repository: bitnami/wildfly
tag: 14.0.1-debian-9 tag: 14.0.1
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

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

View File

@@ -10,7 +10,7 @@
image: image:
registry: docker.io registry: docker.io
repository: bitnami/zookeeper repository: bitnami/zookeeper
tag: 3.4.12-debian-9 tag: 3.4.12
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

@@ -1,5 +1,5 @@
name: dokuwiki name: dokuwiki
version: 3.1.0 version: 3.2.1
appVersion: 0.20180422.201805030840 appVersion: 0.20180422.201805030840
description: DokuWiki is a standards-compliant, simple to use wiki optimized for creating description: DokuWiki is a standards-compliant, simple to use wiki optimized for creating
documentation. It is targeted at developer teams, workgroups, and small companies. documentation. It is targeted at developer teams, workgroups, and small companies.

View File

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

View File

@@ -23,9 +23,24 @@ Create chart name and version as used by the chart label.
{{- end -}} {{- end -}}
{{/* {{/*
Return the proper Dokuwiki image name Return the proper DokuWiki image name
*/}} */}}
{{- define "dokuwiki.image" -}} {{- define "dokuwiki.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}} {{- $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 -}} {{- end -}}

View File

@@ -1,10 +1,16 @@
## 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 DokuWiki image version ## Bitnami DokuWiki image version
## ref: https://hub.docker.com/r/bitnami/dokuwiki/tags/ ## ref: https://hub.docker.com/r/bitnami/dokuwiki/tags/
## ##
image: image:
registry: docker.io registry: docker.io
repository: bitnami/dokuwiki repository: bitnami/dokuwiki
tag: 0.20180422.201805030840-debian-9 tag: 0.20180422.201805030840
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

@@ -1,5 +1,5 @@
name: drupal name: drupal
version: 2.1.0 version: 2.2.1
appVersion: 8.6.1 appVersion: 8.6.1
description: One of the most versatile open source content management systems. description: One of the most versatile open source content management systems.
keywords: keywords:

View File

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

View File

@@ -1,6 +1,6 @@
dependencies: dependencies:
- name: mariadb - name: mariadb
repository: https://kubernetes-charts.storage.googleapis.com/ repository: https://kubernetes-charts.storage.googleapis.com/
version: 5.0.4 version: 5.2.0
digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c
generated: 2018-09-25T11:23:40.285763588+02:00 generated: 2018-10-16T08:47:39.060312+02:00

View File

@@ -28,4 +28,27 @@ Create chart name and version as used by the chart label.
*/}} */}}
{{- define "drupal.chart" -}} {{- define "drupal.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}} {{- end -}}
{{/*
Return the proper Drupal image name
*/}}
{{- define "drupal.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 -}}

View File

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

View File

@@ -1,10 +1,16 @@
## 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 Drupal image version ## Bitnami Drupal image version
## ref: https://hub.docker.com/r/bitnami/drupal/tags/ ## ref: https://hub.docker.com/r/bitnami/drupal/tags/
## ##
image: image:
registry: docker.io registry: docker.io
repository: bitnami/drupal repository: bitnami/drupal
tag: 8.6.1-debian-9 tag: 8.6.1
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -61,6 +67,8 @@ externalDatabase:
## ##
## MariaDB chart configuration ## MariaDB chart configuration
## ##
## https://github.com/helm/charts/blob/master/stable/mariadb/values.yaml
##
mariadb: mariadb:
## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters ## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters
enabled: true enabled: true

View File

@@ -1,6 +1,6 @@
name: ghost name: ghost
version: 5.2.0 version: 5.3.3
appVersion: 2.2.1 appVersion: 2.2.3
description: A simple, powerful publishing platform that allows you to share your description: A simple, powerful publishing platform that allows you to share your
stories with the world stories with the world
keywords: keywords:

View File

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

View File

@@ -1,6 +1,6 @@
dependencies: dependencies:
- name: mariadb - name: mariadb
repository: https://kubernetes-charts.storage.googleapis.com/ repository: https://kubernetes-charts.storage.googleapis.com/
version: 5.1.1 version: 5.2.0
digest: sha256:b3053e73f5c114f55a794eccea2606cc9fe8a669eaab1716246994bbdd37a473 digest: sha256:b3053e73f5c114f55a794eccea2606cc9fe8a669eaab1716246994bbdd37a473
generated: 2018-10-11T10:01:18.165751169Z generated: 2018-10-16T08:47:50.749844+02:00

View File

@@ -18,12 +18,17 @@ host. To configure Ghost with the URL of your service:
Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "ghost.fullname" . }}' Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "ghost.fullname" . }}'
export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "ghost.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "ghost.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}")
export APP_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "ghost.fullname" . }} -o jsonpath="{.data.ghost-password}" | base64 --decode)
{{- if .Values.mariadb.mariadbRootPassword }}
export DATABASE_ROOT_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "ghost.mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode)
{{- end }} {{- end }}
{{- end }}
export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "ghost.mariadb.fullname" . }} -o jsonpath="{.data.mariadb-password}" | base64 --decode)
2. Complete your Ghost deployment by running: 2. Complete your Ghost deployment by running:
helm upgrade {{ .Release.Name }} \ helm upgrade {{ .Release.Name }} stable/ghost\
--set serviceType={{ .Values.serviceType }},ghostHost=$APP_HOST stable/ghost --set serviceType={{ .Values.serviceType }},ghostHost=$APP_HOST,ghostPassword=$APP_PASSWORD,{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$DATABASE_ROOT_PASSWORD{{ end }}mariadb.db.password=$APP_DATABASE_PASSWORD
{{- else -}} {{- else -}}
1. Get the Ghost URL by running: 1. Get the Ghost URL by running:

View File

@@ -63,3 +63,26 @@ Create chart name and version as used by the chart label.
{{- define "ghost.chart" -}} {{- define "ghost.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}} {{- end -}}
{{/*
Return the proper Ghost image name
*/}}
{{- define "ghost.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 -}}

View File

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

View File

@@ -1,10 +1,16 @@
## 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 Ghost image version ## Bitnami Ghost image version
## ref: https://hub.docker.com/r/bitnami/ghost/tags/ ## ref: https://hub.docker.com/r/bitnami/ghost/tags/
## ##
image: image:
registry: docker.io registry: docker.io
repository: bitnami/ghost repository: bitnami/ghost
tag: 2.2.1-debian-9 tag: 2.2.3
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -97,6 +103,8 @@ externalDatabase:
## ##
## MariaDB chart configuration ## MariaDB chart configuration
## ##
## https://github.com/helm/charts/blob/master/stable/mariadb/values.yaml
##
mariadb: mariadb:
## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters ## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters
enabled: true enabled: true

View File

@@ -1,5 +1,5 @@
name: jasperreports name: jasperreports
version: 3.0.3 version: 3.1.1
appVersion: 7.1.0 appVersion: 7.1.0
description: The JasperReports server can be used as a stand-alone or embedded reporting description: The JasperReports server can be used as a stand-alone or embedded reporting
and BI server that offers web-based reporting, analytic tools and visualization, and BI server that offers web-based reporting, analytic tools and visualization,

View File

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

View File

@@ -1,6 +1,6 @@
dependencies: dependencies:
- name: mariadb - name: mariadb
repository: https://kubernetes-charts.storage.googleapis.com/ repository: https://kubernetes-charts.storage.googleapis.com/
version: 5.0.4 version: 5.2.0
digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c
generated: 2018-09-25T11:30:38.012477426+02:00 generated: 2018-10-16T08:48:01.960359+02:00

View File

@@ -22,3 +22,26 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- define "jasperreports.mariadb.fullname" -}} {{- define "jasperreports.mariadb.fullname" -}}
{{- printf "%s-%s" .Release.Name "mariadb" | trunc 63 | trimSuffix "-" -}} {{- printf "%s-%s" .Release.Name "mariadb" | trunc 63 | trimSuffix "-" -}}
{{- end -}} {{- end -}}
{{/*
Return the proper Jasper Reports image name
*/}}
{{- define "jasperreports.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 -}}

View File

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

View File

@@ -1,10 +1,16 @@
## 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 JasperReports image version ## Bitnami JasperReports image version
## ref: https://hub.docker.com/r/bitnami/dokuwiki/tags/ ## ref: https://hub.docker.com/r/bitnami/dokuwiki/tags/
## ##
image: image:
registry: docker.io registry: docker.io
repository: bitnami/jasperreports repository: bitnami/jasperreports
tag: 7.1.0-debian-9 tag: 7.1.0
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -70,6 +76,8 @@ externalDatabase:
## ##
## MariaDB chart configuration ## MariaDB chart configuration
## ##
## https://github.com/helm/charts/blob/master/stable/mariadb/values.yaml
##
mariadb: mariadb:
## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters ## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters
enabled: true enabled: true

View File

@@ -1,5 +1,5 @@
name: joomla name: joomla
version: 3.2.0 version: 3.3.1
appVersion: 3.8.13 appVersion: 3.8.13
description: PHP content management system (CMS) for publishing web content description: PHP content management system (CMS) for publishing web content
keywords: keywords:

View File

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

View File

@@ -1,6 +1,6 @@
dependencies: dependencies:
- name: mariadb - name: mariadb
repository: https://kubernetes-charts.storage.googleapis.com/ repository: https://kubernetes-charts.storage.googleapis.com/
version: 5.1.1 version: 5.2.0
digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c
generated: 2018-10-11T04:07:42.662012144Z generated: 2018-10-16T08:48:17.456241+02:00

View File

@@ -26,8 +26,23 @@ Create chart name and version as used by the chart label.
Return the proper Joomla! image name Return the proper Joomla! image name
*/}} */}}
{{- define "joomla.image" -}} {{- define "joomla.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}} {{- $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 -}} {{- end -}}
{{/* {{/*

View File

@@ -1,10 +1,16 @@
## 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 Joomla! image version ## Bitnami Joomla! image version
## ref: https://hub.docker.com/r/bitnami/dokuwiki/tags/ ## ref: https://hub.docker.com/r/bitnami/dokuwiki/tags/
## ##
image: image:
registry: docker.io registry: docker.io
repository: bitnami/joomla repository: bitnami/joomla
tag: 3.8.13-debian-9 tag: 3.8.13
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -69,6 +75,8 @@ externalDatabase:
## ##
## MariaDB chart configuration ## MariaDB chart configuration
## ##
## https://github.com/helm/charts/blob/master/stable/mariadb/values.yaml
##
mariadb: mariadb:
## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters ## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters
enabled: true enabled: true

View File

@@ -1,5 +1,5 @@
name: kubewatch name: kubewatch
version: 0.4.2 version: 0.5.0
apiVersion: v1 apiVersion: v1
appVersion: v0.0.4 appVersion: v0.0.4
home: https://github.com/bitnami-labs/kubewatch home: https://github.com/bitnami-labs/kubewatch

View File

@@ -39,6 +39,7 @@ The following table lists the configurable parameters of the kubewatch chart and
| Parameter | Description | Default | | Parameter | Description | Default |
| ---------------------------------------- | ------------------------------------ | --------------------------------- | | ---------------------------------------- | ------------------------------------ | --------------------------------- |
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `affinity` | node/pod affinities | None | | `affinity` | node/pod affinities | None |
| `image.registry` | Image registry | `docker.io` | | `image.registry` | Image registry | `docker.io` |
| `image.repository` | Image repository | `bitnami/kubewatch` | | `image.repository` | Image repository | `bitnami/kubewatch` |
@@ -50,7 +51,7 @@ The following table lists the configurable parameters of the kubewatch chart and
| `replicaCount` | desired number of pods | `1` | | `replicaCount` | desired number of pods | `1` |
| `rbac.create` | If true, create & use RBAC resources | `true` | | `rbac.create` | If true, create & use RBAC resources | `true` |
| `serviceAccount.create` | If true, create a serviceAccount | `true` | | `serviceAccount.create` | If true, create a serviceAccount | `true` |
| `serviceAccount.name` | existing ServiceAccount to use (ignored if rbac.create=true) | `` | | `serviceAccount.name` | existing ServiceAccount to use (ignored if rbac.create=true) | `` |
| `resources` | pod resource requests & limits | `{}` | | `resources` | pod resource requests & limits | `{}` |
| `slack.channel` | Slack channel to notify | `""` | | `slack.channel` | Slack channel to notify | `""` |
| `slack.token` | Slack API token | `""` | | `slack.token` | Slack API token | `""` |

View File

@@ -31,7 +31,6 @@ Create chart name and version as used by the chart label.
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}} {{- end -}}
{{/* {{/*
Create the name of the service account to use Create the name of the service account to use
*/}} */}}
@@ -41,4 +40,27 @@ Create the name of the service account to use
{{- else -}} {{- else -}}
{{ default "default" .Values.serviceAccount.name }} {{ default "default" .Values.serviceAccount.name }}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{/*
Return the proper Kubewatch image name
*/}}
{{- define "kubewatch.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 -}}

View File

@@ -29,7 +29,7 @@ spec:
spec: spec:
containers: containers:
- name: {{ template "kubewatch.name" . }} - name: {{ template "kubewatch.name" . }}
image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }} image: {{ template "kubewatch.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
volumeMounts: volumeMounts:
- name: {{ template "kubewatch.name" . }}-config-map - name: {{ template "kubewatch.name" . }}-config-map
@@ -53,4 +53,3 @@ spec:
- name: {{ template "kubewatch.name" . }}-config-map - name: {{ template "kubewatch.name" . }}-config-map
configMap: configMap:
name: {{ template "kubewatch.fullname" . }}-config name: {{ template "kubewatch.fullname" . }}-config

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:
slack: slack:
# Slack channel to notify # Slack channel to notify
channel: "XXXX" channel: "XXXX"

View File

@@ -1,5 +1,5 @@
name: magento name: magento
version: 3.0.4 version: 3.1.1
appVersion: 2.2.6 appVersion: 2.2.6
description: A feature-rich flexible e-commerce solution. It includes transaction options, multi-store functionality, loyalty programs, product categorization and shopper filtering, promotion rules, and more. description: A feature-rich flexible e-commerce solution. It includes transaction options, multi-store functionality, loyalty programs, product categorization and shopper filtering, promotion rules, and more.
keywords: keywords:

View File

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

View File

@@ -1,6 +1,6 @@
dependencies: dependencies:
- name: mariadb - name: mariadb
repository: https://kubernetes-charts.storage.googleapis.com/ repository: https://kubernetes-charts.storage.googleapis.com/
version: 5.0.4 version: 5.2.0
digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c
generated: 2018-09-25T11:35:19.787082498+02:00 generated: 2018-10-16T08:48:29.636469+02:00

View File

@@ -59,3 +59,26 @@ If not using ClusterIP, or if a host or LoadBalancerIP is not defined, the value
{{- $host := index .Values (printf "%sHost" .Chart.Name) | default "" -}} {{- $host := index .Values (printf "%sHost" .Chart.Name) | default "" -}}
{{- default (include "magento.serviceIP" .) $host -}} {{- default (include "magento.serviceIP" .) $host -}}
{{- end -}} {{- end -}}
{{/*
Return the proper Magento image name
*/}}
{{- define "magento.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 -}}

View File

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

View File

@@ -1,10 +1,16 @@
## 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 Magento image version ## Bitnami Magento image version
## ref: https://hub.docker.com/r/bitnami/magento/tags/ ## ref: https://hub.docker.com/r/bitnami/magento/tags/
## ##
image: image:
registry: docker.io registry: docker.io
repository: bitnami/magento repository: bitnami/magento
tag: 2.2.6-debian-9 tag: 2.2.6
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -89,6 +95,8 @@ externalDatabase:
## ##
## MariaDB chart configuration ## MariaDB chart configuration
## ##
## https://github.com/helm/charts/blob/master/stable/mariadb/values.yaml
##
mariadb: mariadb:
## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters ## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters
enabled: true enabled: true

View File

@@ -1,5 +1,5 @@
name: mariadb name: mariadb
version: 5.1.2 version: 5.2.1
appVersion: 10.1.36 appVersion: 10.1.36
description: Fast, reliable, scalable, and easy to use open-source relational database system. MariaDB Server is intended for mission-critical, heavy-load production systems as well as for embedding into mass-deployed software. Highly available MariaDB cluster. description: Fast, reliable, scalable, and easy to use open-source relational database system. MariaDB Server is intended for mission-critical, heavy-load production systems as well as for embedding into mass-deployed software. Highly available MariaDB cluster.
keywords: keywords:

View File

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

View File

@@ -23,7 +23,6 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- define "slave.fullname" -}} {{- define "slave.fullname" -}}
{{- printf "%s-%s" .Release.Name "mariadb-slave" | trunc 63 | trimSuffix "-" -}} {{- printf "%s-%s" .Release.Name "mariadb-slave" | trunc 63 | trimSuffix "-" -}}
{{- end -}} {{- end -}}
@@ -33,17 +32,30 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- end -}} {{- end -}}
{{/* {{/*
Return the proper image name Return the proper MariaDB image name
*/}} */}}
{{- define "mariadb.image" -}} {{- define "mariadb.image" -}}
{{- $registryName := .Values.image.registry -}} {{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}} {{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}} {{- $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 -}} {{- end -}}
{{/* {{/*
Return the proper image name Return the proper metrics image name
*/}} */}}
{{- define "metrics.image" -}} {{- define "metrics.image" -}}
{{- $registryName := .Values.metrics.image.registry -}} {{- $registryName := .Values.metrics.image.registry -}}

View File

@@ -20,7 +20,7 @@ spec:
name: tools name: tools
containers: containers:
- name: mariadb-test - name: mariadb-test
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}" image: {{ template "mariadb.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy | quote }} imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
command: ["/tools/bats/bats", "-t", "/tests/run.sh"] command: ["/tools/bats/bats", "-t", "/tests/run.sh"]
env: env:

View File

@@ -1,10 +1,16 @@
## 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 MariaDB image ## Bitnami MariaDB image
## ref: https://hub.docker.com/r/bitnami/mariadb/tags/ ## ref: https://hub.docker.com/r/bitnami/mariadb/tags/
## ##
image: image:
registry: docker.io registry: docker.io
repository: bitnami/mariadb repository: bitnami/mariadb
tag: 10.1.36-debian-9 tag: 10.1.36
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

@@ -1,10 +1,16 @@
## 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 MariaDB image ## Bitnami MariaDB image
## ref: https://hub.docker.com/r/bitnami/mariadb/tags/ ## ref: https://hub.docker.com/r/bitnami/mariadb/tags/
## ##
image: image:
registry: docker.io registry: docker.io
repository: bitnami/mariadb repository: bitnami/mariadb
tag: 10.1.36-debian-9 tag: 10.1.36
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

View File

@@ -1,5 +1,5 @@
name: mediawiki name: mediawiki
version: 4.1.0 version: 5.0.1
appVersion: 1.31.1 appVersion: 1.31.1
description: Extremely powerful, scalable software and a feature-rich wiki implementation description: Extremely powerful, scalable software and a feature-rich wiki implementation
that uses PHP to process and display data stored in a database. that uses PHP to process and display data stored in a database.

View File

@@ -49,6 +49,7 @@ The following table lists the configurable parameters of the MediaWiki chart and
| Parameter | Description | Default | | Parameter | Description | Default |
|--------------------------------------|-------------------------------------------------------------|---------------------------------------------------------| |--------------------------------------|-------------------------------------------------------------|---------------------------------------------------------|
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | MediaWiki image registry | `docker.io` | | `image.registry` | MediaWiki image registry | `docker.io` |
| `image.repository` | MediaWiki Image name | `bitnami/mediawiki` | | `image.repository` | MediaWiki Image name | `bitnami/mediawiki` |
| `image.tag` | MediaWiki Image tag | `{VERSION}` | | `image.tag` | MediaWiki Image tag | `{VERSION}` |
@@ -89,12 +90,10 @@ The following table lists the configurable parameters of the MediaWiki chart and
| `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` | | `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` |
| `ingress.secrets[0].key` | TLS Secret Key | `nil` | | `ingress.secrets[0].key` | TLS Secret Key | `nil` |
| `persistence.enabled` | Enable persistence using PVC | `true` | | `persistence.enabled` | Enable persistence using PVC | `true` |
| `persistence.apache.storageClass` | PVC Storage Class for Apache volume | `nil` (uses alpha storage class annotation) | | `persistence.storageClass` | PVC Storage Class for MediaWiki volume | `nil` (uses alpha storage class annotation) |
| `persistence.apache.accessMode` | PVC Access Mode for Apache volume | `ReadWriteOnce` | | `persistence.existingClaim` | An Existing PVC name for MediaWiki volume | `nil` (uses alpha storage class annotation) |
| `persistence.apache.size` | PVC Storage Request for Apache volume | `1Gi` | | `persistence.accessMode` | PVC Access Mode for MediaWiki volume | `ReadWriteOnce` |
| `persistence.mediawiki.storageClass` | PVC Storage Class for MediaWiki volume | `nil` (uses alpha storage class annotation) | | `persistence.size` | PVC Storage Request for MediaWiki volume | `8Gi` |
| `persistence.mediawiki.accessMode` | PVC Access Mode for MediaWiki volume | `ReadWriteOnce` |
| `persistence.mediawiki.size` | PVC Storage Request for MediaWiki volume | `8Gi` |
| `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | | `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` |
| `livenessProbe.enabled` | Enable/disable the liveness probe (ingest nodes pod) | `true` | | `livenessProbe.enabled` | Enable/disable the liveness probe (ingest nodes pod) | `true` |
| `livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated (ingest nodes pod) | 120 | | `livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated (ingest nodes pod) | 120 |

View File

@@ -1,6 +1,6 @@
dependencies: dependencies:
- name: mariadb - name: mariadb
repository: https://kubernetes-charts.storage.googleapis.com/ repository: https://kubernetes-charts.storage.googleapis.com/
version: 5.0.4 version: 5.2.0
digest: sha256:7043c28f05b6aac3615a61e609bddc958b51bea717afa81455d7d34641cdd906 digest: sha256:7043c28f05b6aac3615a61e609bddc958b51bea717afa81455d7d34641cdd906
generated: 2018-09-25T11:40:02.188164295+02:00 generated: 2018-10-16T08:48:39.403302+02:00

View File

@@ -26,8 +26,23 @@ Create chart name and version as used by the chart label.
Return the proper Mediawiki image name Return the proper Mediawiki image name
*/}} */}}
{{- define "mediawiki.image" -}} {{- define "mediawiki.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}} {{- $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 -}} {{- end -}}
{{/* {{/*

View File

@@ -1,24 +0,0 @@
{{- if .Values.persistence.enabled -}}
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: {{ template "mediawiki.fullname" . }}-apache
labels:
app: {{ template "mediawiki.name" . }}
chart: {{ template "mediawiki.chart" . }}
release: {{ .Release.Name | quote }}
heritage: {{ .Release.Service | quote }}
spec:
accessModes:
- {{ .Values.persistence.apache.accessMode | quote }}
resources:
requests:
storage: {{ .Values.persistence.apache.size | quote }}
{{- if .Values.persistence.apache.storageClass }}
{{- if (eq "-" .Values.persistence.apache.storageClass) }}
storageClassName: ""
{{- else }}
storageClassName: {{ .Values.persistence.apache.storageClass | quote }}
{{- end }}
{{- end }}
{{- end -}}

View File

@@ -132,22 +132,17 @@ spec:
resources: resources:
{{ toYaml .Values.resources | indent 10 }} {{ toYaml .Values.resources | indent 10 }}
volumeMounts: volumeMounts:
- name: mediawiki-data - mountPath: /bitnami/apache
mountPath: /bitnami/mediawiki name: mediawiki-data
- name: apache-data subPath: apache
mountPath: /bitnami/apache - mountPath: /bitnami/mediawiki
name: mediawiki-data
subPath: mediawiki
volumes: volumes:
- name: mediawiki-data - name: mediawiki-data
{{- if .Values.persistence.enabled }} {{- if .Values.persistence.enabled }}
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ template "mediawiki.fullname" . }}-mediawiki claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "mediawiki.fullname" . }}-mediawiki{{- end }}
{{- else }}
emptyDir: {}
{{- end }}
- name: apache-data
{{- if .Values.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ template "mediawiki.fullname" . }}-apache
{{- else }} {{- else }}
emptyDir: {} emptyDir: {}
{{- end }} {{- end }}

View File

@@ -10,15 +10,15 @@ metadata:
heritage: {{ .Release.Service | quote }} heritage: {{ .Release.Service | quote }}
spec: spec:
accessModes: accessModes:
- {{ .Values.persistence.mediawiki.accessMode | quote }} - {{ .Values.persistence.accessMode | quote }}
resources: resources:
requests: requests:
storage: {{ .Values.persistence.mediawiki.size | quote }} storage: {{ .Values.persistence.size | quote }}
{{- if .Values.persistence.mediawiki.storageClass }} {{- if .Values.persistence.storageClass }}
{{- if (eq "-" .Values.persistence.mediawiki.storageClass) }} {{- if (eq "-" .Values.persistence.storageClass) }}
storageClassName: "" storageClassName: ""
{{- else }} {{- else }}
storageClassName: {{ .Values.persistence.mediawiki.storageClass | quote }} storageClassName: {{ .Values.persistence.storageClass | quote }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end -}} {{- end -}}

View File

@@ -1,10 +1,16 @@
## 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 DokuWiki image version ## Bitnami DokuWiki image version
## ref: https://hub.docker.com/r/bitnami/mediawiki/tags/ ## ref: https://hub.docker.com/r/bitnami/mediawiki/tags/
## ##
image: image:
registry: docker.io registry: docker.io
repository: bitnami/mediawiki repository: bitnami/mediawiki
tag: 1.31.1-debian-9 tag: 1.31.1
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -73,6 +79,8 @@ externalDatabase:
## ##
## MariaDB chart configuration ## MariaDB chart configuration
## ##
## https://github.com/helm/charts/blob/master/stable/mariadb/values.yaml
##
mariadb: mariadb:
## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters ## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters
enabled: true enabled: true
@@ -192,28 +200,22 @@ ingress:
## ##
persistence: persistence:
enabled: true enabled: true
apache: ## Mediawiki data Persistent Volume Storage Class
## Apache data Persistent Volume Storage Class ## If defined, storageClassName: <storageClass>
## If defined, storageClassName: <storageClass> ## If set to "-", storageClassName: "", which disables dynamic provisioning
## If set to "-", storageClassName: "", which disables dynamic provisioning ## If undefined (the default) or set to null, no storageClassName spec is
## If undefined (the default) or set to null, no storageClassName spec is ## set, choosing the default provisioner. (gp2 on AWS, standard on
## set, choosing the default provisioner. (gp2 on AWS, standard on ## GKE, AWS & OpenStack)
## GKE, AWS & OpenStack) ##
## # storageClass: "-"
# storageClass: "-"
accessMode: ReadWriteOnce ## A manually managed Persistent Volume and Claim
size: 1Gi ## Requires persistence.enabled: true
mediawiki: ## If defined, PVC must be created manually before volume will be bound
## Mediawiki data Persistent Volume Storage Class # existingClaim:
## If defined, storageClassName: <storageClass>
## If set to "-", storageClassName: "", which disables dynamic provisioning accessMode: ReadWriteOnce
## If undefined (the default) or set to null, no storageClassName spec is size: 8Gi
## set, choosing the default provisioner. (gp2 on AWS, standard on
## GKE, AWS & OpenStack)
##
# storageClass: "-"
accessMode: ReadWriteOnce
size: 8Gi
## Configure resource requests and limits ## Configure resource requests and limits
## ref: http://kubernetes.io/docs/user-guide/compute-resources/ ## ref: http://kubernetes.io/docs/user-guide/compute-resources/

View File

@@ -1,5 +1,5 @@
name: mongodb name: mongodb
version: 4.4.0 version: 4.6.1
appVersion: 4.0.3 appVersion: 4.0.3
description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications. description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications.
keywords: keywords:

View File

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

View File

@@ -54,11 +54,24 @@ Create the name for the key secret.
{{- end -}} {{- end -}}
{{/* {{/*
Return the proper image name Return the proper MongoDB image name
*/}} */}}
{{- define "mongodb.image" -}} {{- define "mongodb.image" -}}
{{- $registryName := .Values.image.registry -}} {{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}} {{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}} {{- $tag := .Values.image.tag | toString -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $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 -}}

View File

@@ -112,6 +112,8 @@ spec:
mountPath: /opt/bitnami/mongodb/conf/mongodb.conf mountPath: /opt/bitnami/mongodb/conf/mongodb.conf
subPath: mongodb.conf subPath: mongodb.conf
{{- end }} {{- end }}
resources:
{{ toYaml .Values.resources | indent 12 }}
volumes: volumes:
{{- if .Values.configmap }} {{- if .Values.configmap }}
- name: config - name: config

View File

@@ -133,6 +133,8 @@ spec:
mountPath: /opt/bitnami/mongodb/conf/mongodb.conf mountPath: /opt/bitnami/mongodb/conf/mongodb.conf
subPath: mongodb.conf subPath: mongodb.conf
{{- end }} {{- end }}
resources:
{{ toYaml .Values.resources | indent 12 }}
volumes: volumes:
{{- if (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js]") }} {{- if (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js]") }}
- name: custom-init-scripts - name: custom-init-scripts

View File

@@ -121,6 +121,8 @@ spec:
mountPath: /opt/bitnami/mongodb/conf/mongodb.conf mountPath: /opt/bitnami/mongodb/conf/mongodb.conf
subPath: mongodb.conf subPath: mongodb.conf
{{- end }} {{- end }}
resources:
{{ toYaml .Values.resources | indent 12 }}
volumes: volumes:
{{- if .Values.configmap }} {{- if .Values.configmap }}
- name: config - name: config

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:
image: image:
## Bitnami MongoDB registry ## Bitnami MongoDB registry
## ##
@@ -8,7 +14,7 @@ image:
## Bitnami MongoDB image tag ## Bitnami MongoDB image tag
## ref: https://hub.docker.com/r/bitnami/mongodb/tags/ ## ref: https://hub.docker.com/r/bitnami/mongodb/tags/
## ##
tag: 4.0.3-debian-9 tag: 4.0.3
## Specify a imagePullPolicy ## Specify a imagePullPolicy
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

Some files were not shown because too many files have changed in this diff Show More