diff --git a/bitnami/airflow/Chart.yaml b/bitnami/airflow/Chart.yaml index 0ad86fbe6..2353e5cd6 100644 --- a/bitnami/airflow/Chart.yaml +++ b/bitnami/airflow/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: airflow -version: 1.0.1 +version: 1.0.2 appVersion: 1.10.3 description: Apache Airflow is a platform to programmatically author, schedule and monitor workflows. keywords: diff --git a/bitnami/airflow/README.md b/bitnami/airflow/README.md index b058d5219..60000853b 100644 --- a/bitnami/airflow/README.md +++ b/bitnami/airflow/README.md @@ -72,6 +72,8 @@ The following tables lists the configurable parameters of the Kafka chart and th | `git.tag` | Git image tag | `{TAG_NAME}` | | `git.pullPolicy` | Git image pull policy | `IfNotPresent` | | `git.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override airflow.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override ariflow.fullname template with a string | `nil` | | `updateStrategy` | Update strategy for the stateful set | `RollingUpdate` | | `rollingUpdatePartition` | Partition update strategy | `nil` | | `airflow.configurationConfigMap` | Name of an existing config map containing the Airflow config file | `nil` | diff --git a/bitnami/airflow/templates/_helpers.tpl b/bitnami/airflow/templates/_helpers.tpl index 87b67bb48..4081b5b5c 100644 --- a/bitnami/airflow/templates/_helpers.tpl +++ b/bitnami/airflow/templates/_helpers.tpl @@ -3,7 +3,7 @@ Expand the name of the chart. */}} {{- define "airflow.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 24 -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* diff --git a/bitnami/airflow/values-production.yaml b/bitnami/airflow/values-production.yaml index 86daa7019..e3241cee2 100644 --- a/bitnami/airflow/values-production.yaml +++ b/bitnami/airflow/values-production.yaml @@ -94,6 +94,14 @@ git: # pullSecrets: # - myRegistryKeySecretName +## String to partially override airflow.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override airflow.fullname template +## +# fullnameOverride: + ## StatefulSet controller supports automated updates. There are two valid update strategies: RollingUpdate and OnDelete ## ref: https://kubernetes.io/docs/tutorials/stateful-application/basic-stateful-set/#updating-statefulsets ## diff --git a/bitnami/airflow/values.yaml b/bitnami/airflow/values.yaml index c17f20831..91b5bb13f 100644 --- a/bitnami/airflow/values.yaml +++ b/bitnami/airflow/values.yaml @@ -94,6 +94,14 @@ git: # pullSecrets: # - myRegistryKeySecretName +## String to partially override airflow.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override airflow.fullname template +## +# fullnameOverride: + ## StatefulSet controller supports automated updates. There are two valid update strategies: RollingUpdate and OnDelete ## ref: https://kubernetes.io/docs/tutorials/stateful-application/basic-stateful-set/#updating-statefulsets ## diff --git a/bitnami/apache/Chart.yaml b/bitnami/apache/Chart.yaml index f0a51345a..842617690 100644 --- a/bitnami/apache/Chart.yaml +++ b/bitnami/apache/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: apache -version: 4.3.2 +version: 4.3.3 appVersion: 2.4.39 description: Chart for Apache HTTP Server keywords: diff --git a/bitnami/apache/README.md b/bitnami/apache/README.md index fe5089b3b..cef5576de 100644 --- a/bitnami/apache/README.md +++ b/bitnami/apache/README.md @@ -53,6 +53,8 @@ The following tables lists the configurable parameters of the Apache chart and t | `image.tag` | Apache Docker image tag | `{TAG_NAME}` | | `image.pullPolicy` | Apache Docker image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override apache.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override apache.fullname template with a string | `nil` | | `podAnnotations` | Pod annotations | `{}` | | `ingress.enabled` | Enable ingress controller resource | `false` | | `ingress.certManager` | Add annotations for cert-manager | `false` | diff --git a/bitnami/apache/templates/_helpers.tpl b/bitnami/apache/templates/_helpers.tpl index a06285e77..21abf6273 100644 --- a/bitnami/apache/templates/_helpers.tpl +++ b/bitnami/apache/templates/_helpers.tpl @@ -2,17 +2,25 @@ {{/* Expand the name of the chart. */}} -{{- define "name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 24 -}} +{{- define "apache.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* Create a default fully qualified app name. We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} -{{- define "fullname" -}} +{{- define "apache.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} -{{- printf "%s-%s" .Release.Name $name | trunc 24 -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} {{- end -}} {{/* diff --git a/bitnami/apache/templates/deployment.yaml b/bitnami/apache/templates/deployment.yaml index acceac077..e19009c5e 100644 --- a/bitnami/apache/templates/deployment.yaml +++ b/bitnami/apache/templates/deployment.yaml @@ -1,22 +1,22 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ template "fullname" . }} + name: {{ template "apache.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "apache.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" spec: selector: matchLabels: - app: {{ template "fullname" . }} + app: {{ template "apache.name" . }} release: "{{ .Release.Name }}" replicas: 1 template: metadata: labels: - app: {{ template "fullname" . }} + app: {{ template "apache.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -36,7 +36,7 @@ spec: hostnames: - "status.localhost" containers: - - name: {{ template "fullname" . }} + - name: {{ template "apache.fullname" . }} image: "{{ template "apache.image" . }}" imagePullPolicy: {{ .Values.image.pullPolicy | quote }} ports: diff --git a/bitnami/apache/templates/ingress.yaml b/bitnami/apache/templates/ingress.yaml index f4f178943..00b85e78d 100644 --- a/bitnami/apache/templates/ingress.yaml +++ b/bitnami/apache/templates/ingress.yaml @@ -2,9 +2,9 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: - name: {{ template "fullname" . }} + name: {{ template "apache.fullname" . }} labels: - app: "{{ template "fullname" . }}" + app: "{{ template "apache.name" . }}" chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -23,7 +23,7 @@ spec: paths: - path: {{ default "/" .path }} backend: - serviceName: "{{ template "fullname" $ }}" + serviceName: "{{ template "apache.fullname" $ }}" servicePort: http {{- end }} {{- if .Values.ingress.tls }} diff --git a/bitnami/apache/templates/svc.yaml b/bitnami/apache/templates/svc.yaml index 2c712f3f2..30e4f5b3a 100644 --- a/bitnami/apache/templates/svc.yaml +++ b/bitnami/apache/templates/svc.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "fullname" . }} + name: {{ template "apache.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "apache.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -29,4 +29,4 @@ spec: nodePort: {{ .Values.service.nodePorts.https }} {{- end }} selector: - app: {{ template "fullname" . }} + app: {{ template "apache.name" . }} diff --git a/bitnami/apache/values.yaml b/bitnami/apache/values.yaml index 0a457e7da..f050acd85 100644 --- a/bitnami/apache/values.yaml +++ b/bitnami/apache/values.yaml @@ -25,6 +25,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override apache.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override apache.fullname template +## +# fullnameOverride: + ## Pod annotations ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ ## diff --git a/bitnami/cassandra/Chart.yaml b/bitnami/cassandra/Chart.yaml index 9a146c0f4..58e8270df 100644 --- a/bitnami/cassandra/Chart.yaml +++ b/bitnami/cassandra/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: cassandra -version: 2.3.10 +version: 2.3.11 appVersion: 3.11.4 description: Apache Cassandra is a free and open-source distributed database management system designed to handle large amounts of data across many commodity servers, providing high availability with no single point of failure. Cassandra offers robust support for clusters spanning multiple datacenters, with asynchronous masterless replication allowing low latency operations for all clients. icon: https://bitnami.com/assets/stacks/cassandra/img/cassandra-stack-220x234.png diff --git a/bitnami/cassandra/README.md b/bitnami/cassandra/README.md index 755f25af0..96ba5c2e8 100644 --- a/bitnami/cassandra/README.md +++ b/bitnami/cassandra/README.md @@ -55,6 +55,8 @@ The following tables lists the configurable parameters of the cassandra chart an | `image.tag` | Cassandra Image tag | `{TAG_NAME}` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override cassandra.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override cassandra.fullname template with a string | `nil` | | `service.type` | Kubernetes Service type | `ClusterIP` | | `service.nodePort` | Kubernetes Service nodePort | `nil` | | `service.loadBalancerIP` | LoadBalancerIP if service type is `LoadBalancer` | `nil` | diff --git a/bitnami/cassandra/values-production.yaml b/bitnami/cassandra/values-production.yaml index c5b5e3a2e..72a390427 100644 --- a/bitnami/cassandra/values-production.yaml +++ b/bitnami/cassandra/values-production.yaml @@ -29,6 +29,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override cassandra.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override cassandra.fullname template +## +# fullnameOverride: + ## Specify a service type ## ref: http://kubernetes.io/docs/user-guide/services/ ## diff --git a/bitnami/cassandra/values.yaml b/bitnami/cassandra/values.yaml index 5a701b747..264521948 100644 --- a/bitnami/cassandra/values.yaml +++ b/bitnami/cassandra/values.yaml @@ -29,6 +29,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override cassandra.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override cassandra.fullname template +## +# fullnameOverride: + ## Specify a service type ## ref: http://kubernetes.io/docs/user-guide/services/ ## diff --git a/bitnami/consul/Chart.yaml b/bitnami/consul/Chart.yaml index 29c39f3dc..a17539dd7 100644 --- a/bitnami/consul/Chart.yaml +++ b/bitnami/consul/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: consul -version: 4.2.13 +version: 4.2.14 appVersion: 1.5.2 description: Highly available and distributed service discovery and key-value store designed with support for the modern data center to make distributed systems and configuration easy. home: https://www.consul.io/ diff --git a/bitnami/consul/README.md b/bitnami/consul/README.md index 125159a07..ac31e982b 100644 --- a/bitnami/consul/README.md +++ b/bitnami/consul/README.md @@ -58,6 +58,8 @@ The following tables lists the configurable parameters of the HashiCorp Consul c | `image.tag` | HashiCorp Consul image tag | `{TAG_NAME}` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override consul.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override consul.fullname template with a string | `nil` | | `replicas` | Number of replicas | `3` | | `port` | HashiCorp Consul http listening port | `8500` | | `service.rpcPort` | HashiCorp Consul rpc listening port | `8400` | diff --git a/bitnami/consul/templates/_helpers.tpl b/bitnami/consul/templates/_helpers.tpl index 6750b9317..0e0f82fa9 100644 --- a/bitnami/consul/templates/_helpers.tpl +++ b/bitnami/consul/templates/_helpers.tpl @@ -11,9 +11,17 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "consul.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- end -}} +{{- end -}} {{/* Create chart name and version as used by the chart label. diff --git a/bitnami/consul/values-production.yaml b/bitnami/consul/values-production.yaml index 9751490ac..68f7a0f4e 100644 --- a/bitnami/consul/values-production.yaml +++ b/bitnami/consul/values-production.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override consul.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override consul.fullname template +## +# fullnameOverride: + ## Consul replicas replicas: 3 diff --git a/bitnami/consul/values.yaml b/bitnami/consul/values.yaml index fa848e82d..ff441124f 100644 --- a/bitnami/consul/values.yaml +++ b/bitnami/consul/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override consul.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override consul.fullname template +## +# fullnameOverride: + ## Consul replicas replicas: 3 diff --git a/bitnami/elasticsearch/Chart.yaml b/bitnami/elasticsearch/Chart.yaml index 59cea69e1..8186fc667 100644 --- a/bitnami/elasticsearch/Chart.yaml +++ b/bitnami/elasticsearch/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: elasticsearch -version: 5.1.10 +version: 5.1.11 appVersion: 7.2.0 description: A highly scalable open-source full-text search and analytics engine keywords: diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md index feb0032c6..9b1eabeb2 100644 --- a/bitnami/elasticsearch/README.md +++ b/bitnami/elasticsearch/README.md @@ -52,12 +52,14 @@ The following table lists the configurable parameters of the Elasticsearch chart | Parameter | Description | Default | |---------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------| | `global.imageRegistry` | Global Docker image registry | `nil` | -| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | | `image.registry` | Elasticsearch image registry | `docker.io` | | `image.repository` | Elasticsearch image repository | `bitnami/elasticsearch` | | `image.tag` | Elasticsearch image tag | `{TAG_NAME}` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override elasticsearch.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override elasticsearch.fullname template with a string | `nil` | | `name` | Elasticsearch cluster name | `elastic` | | `plugins` | Comma, semi-colon or space separated list of plugins to install at initialization | `nil` | | `config` | Elasticsearch node custom configuration | `` | @@ -65,7 +67,7 @@ The following table lists the configurable parameters of the Elasticsearch chart | `master.replicas` | Desired number of Elasticsearch master-eligible nodes | `2` | | `master.heapSize` | Master-eligible node heap size | `128m` | | `master.antiAffinity` | Master-eligible node pod anti-affinity policy | `soft` | -| `coordinating.nodeAffinity` | Master-eligible node affinity policy | `nil` | +| `coordinating.nodeAffinity` | Master-eligible node affinity policy | `nil` | | `master.service.type` | Kubernetes Service type (master-eligible nodes) | `ClusterIP` | | `master.service.port` | Kubernetes Service port for Elasticsearch transport port (master-eligible nodes) | `9300` | | `master.service.nodePort` | Kubernetes Service nodePort (master-eligible nodes) | `nil` | @@ -78,7 +80,7 @@ The following table lists the configurable parameters of the Elasticsearch chart | `master.livenessProbe.timeoutSeconds` | When the probe times out (master-eligible nodes pod) | `5` | | `master.livenessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed (master-eligible nodes pod) | `1` | | `master.livenessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded | `5` | -| `master.podAnnotations` | Annotations for master pods. | `{}` | +| `master.podAnnotations` | Annotations for master pods. | `{}` | | `master.readinessProbe.enabled` | Enable/disable the readiness probe (master-eligible nodes pod) | `true` | | `master.readinessProbe.initialDelaySeconds` | Delay before readiness probe is initiated (master-eligible nodes pod) | `90` | | `master.readinessProbe.periodSeconds` | How often to perform the probe (master-eligible nodes pod) | `10` | @@ -94,8 +96,8 @@ The following table lists the configurable parameters of the Elasticsearch chart | `coordinating.replicas` | Desired number of Elasticsearch coordinating-only nodes | `2` | | `coordinating.heapSize` | Coordinating-only node heap size | `128m` | | `coordinating.antiAffinity` | Coordinating-only node pod anti-affinity policy | `soft` | -| `coordinating.nodeAffinity` | Coordinating-only node affinity policy | `nil` | -| `coordinating.podAnnotations` | Annotations for coordniating pods. | `{}` | +| `coordinating.nodeAffinity` | Coordinating-only node affinity policy | `nil` | +| `coordinating.podAnnotations` | Annotations for coordniating pods. | `{}` | | `coordinating.service.type` | Kubernetes Service type (coordinating-only nodes) | `ClusterIP` | | `coordinating.service.port` | Kubernetes Service port for REST API (coordinating-only nodes) | `9200` | | `coordinating.service.nodePort` | Kubernetes Service nodePort (coordinating-only nodes) | `nil` | @@ -120,7 +122,7 @@ The following table lists the configurable parameters of the Elasticsearch chart | `data.updateStrategy.rollingUpdatePartition` | Partition update strategy for Data statefulset | `nil` | | `data.heapSize` | Data node heap size | `1024m` | | `data.antiAffinity` | Data pod anti-affinity policy | `soft` | -| `data.nodeAffinity` | Data pod node affinity policy | `nil` | +| `data.nodeAffinity` | Data pod node affinity policy | `nil` | | `data.resources` | CPU/Memory resource requests/limits for data nodes | `requests: { cpu: "25m", memory: "1152Mi" }` | | `data.persistence.enabled` | Enable persistence using a `PersistentVolumeClaim` | `true` | | `data.persistence.annotations` | Persistent Volume Claim annotations | `{}` | @@ -133,7 +135,7 @@ The following table lists the configurable parameters of the Elasticsearch chart | `data.livenessProbe.timeoutSeconds` | When the probe times out (data nodes pod) | `5` | | `data.livenessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed (data nodes pod) | `1` | | `data.livenessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded | `5` | -| `data.podAnnotations` | Annotations for data pods. | `{}` | +| `data.podAnnotations` | Annotations for data pods. | `{}` | | `data.readinessProbe.enabled` | Enable/disable the readiness probe (data nodes pod) | `true` | | `data.readinessProbe.initialDelaySeconds` | Delay before readiness probe is initiated (data nodes pod) | `90` | | `data.readinessProbe.periodSeconds` | How often to perform the probe (data nodes pod) | `10` | @@ -145,7 +147,7 @@ The following table lists the configurable parameters of the Elasticsearch chart | `ingest.replicas` | Desired number of Elasticsearch ingest nodes | `2` | | `ingest.heapSize` | Ingest node heap size | `128m` | | `ingest.antiAffinity` | Ingest node pod anti-affinity policy | `soft` | -| `ingest.nodeAffinity` | Ingest node pod affinity policy | `nil` | +| `ingest.nodeAffinity` | Ingest node pod affinity policy | `nil` | | `ingest.service.type` | Kubernetes Service type (ingest nodes) | `ClusterIP` | | `ingest.service.port` | Kubernetes Service port Elasticsearch transport port (ingest nodes) | `9300` | | `ingest.service.nodePort` | Kubernetes Service nodePort (ingest nodes) | `nil` | @@ -158,7 +160,7 @@ The following table lists the configurable parameters of the Elasticsearch chart | `ingest.livenessProbe.timeoutSeconds` | When the probe times out (ingest nodes pod) | `5` | | `ingest.livenessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed (ingest nodes pod) | `1` | | `ingest.livenessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded | `5` | -| `ingest.podAnnotations` | Annotations for ingest pods. | `{}` | +| `ingest.podAnnotations` | Annotations for ingest pods. | `{}` | | `ingest.readinessProbe.enabled` | Enable/disable the readiness probe (ingest nodes pod) | `true` | | `ingest.readinessProbe.initialDelaySeconds` | Delay before readiness probe is initiated (ingest nodes pod) | `90` | | `ingest.readinessProbe.periodSeconds` | How often to perform the probe (ingest nodes pod) | `10` | @@ -173,7 +175,7 @@ The following table lists the configurable parameters of the Elasticsearch chart | `metrics.image.pullPolicy` | Metrics exporter image pull policy | `IfNotPresent` | | `metrics.service.type` | Metrics exporter endpoint service type | `ClusterIP` | | `metrics.resources` | Metrics exporter resource requests/limit | `requests: { cpu: "25m" }` | -| `metrics.podAnnotations` | Annotations for metrics pods. | `{}` | +| `metrics.podAnnotations` | Annotations for metrics pods. | `{}` | | `sysctlImage.enabled` | Enable kernel settings modifier image | `false` | | `sysctlImage.registry` | Kernel settings modifier image registry | `docker.io` | | `sysctlImage.repository` | Kernel settings modifier image repository | `bitnami/minideb` | diff --git a/bitnami/elasticsearch/templates/_helpers.tpl b/bitnami/elasticsearch/templates/_helpers.tpl index 1130b4eb3..979ace2d5 100644 --- a/bitnami/elasticsearch/templates/_helpers.tpl +++ b/bitnami/elasticsearch/templates/_helpers.tpl @@ -11,9 +11,17 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "elasticsearch.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- end -}} +{{- end -}} {{/* Create chart name and version as used by the chart label. diff --git a/bitnami/elasticsearch/values-production.yaml b/bitnami/elasticsearch/values-production.yaml index df5d80ab3..11e5e2a8e 100644 --- a/bitnami/elasticsearch/values-production.yaml +++ b/bitnami/elasticsearch/values-production.yaml @@ -45,6 +45,14 @@ sysctlImage: # pullSecrets: # - myRegistryKeySecretName +## String to partially override elasticsearch.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override elasticsearch.fullname template +## +# fullnameOverride: + ## Elasticsearch cluster name ## name: elastic diff --git a/bitnami/elasticsearch/values.yaml b/bitnami/elasticsearch/values.yaml index 8667392f9..b0245989d 100644 --- a/bitnami/elasticsearch/values.yaml +++ b/bitnami/elasticsearch/values.yaml @@ -45,6 +45,14 @@ sysctlImage: # pullSecrets: # - myRegistryKeySecretName +## String to partially override elasticsearch.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override elasticsearch.fullname template +## +# fullnameOverride: + ## Elasticsearch cluster name ## name: elastic diff --git a/bitnami/etcd/Chart.yaml b/bitnami/etcd/Chart.yaml index 322371994..2ba31e56c 100644 --- a/bitnami/etcd/Chart.yaml +++ b/bitnami/etcd/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: etcd -version: 3.1.1 +version: 3.1.2 appVersion: 3.3.13 description: etcd is a distributed key value store that provides a reliable way to store data across a cluster of machines keywords: diff --git a/bitnami/etcd/templates/_helpers.tpl b/bitnami/etcd/templates/_helpers.tpl index 4382239e4..8443bd0a0 100644 --- a/bitnami/etcd/templates/_helpers.tpl +++ b/bitnami/etcd/templates/_helpers.tpl @@ -3,7 +3,7 @@ Expand the name of the chart. */}} {{- define "etcd.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* diff --git a/bitnami/etcd/values-production.yaml b/bitnami/etcd/values-production.yaml index dbd6a75ac..8bfdb4928 100644 --- a/bitnami/etcd/values-production.yaml +++ b/bitnami/etcd/values-production.yaml @@ -37,6 +37,14 @@ image: ## String to fully override etcd.fullname template # fullnameOverride: +## String to partially override etcd.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override etcd.fullname template +## +# fullnameOverride: + statefulset: ## Update strategy, can be set to RollingUpdate or OnDelete by default. ## https://kubernetes.io/docs/tutorials/stateful-application/basic-stateful-set/#updating-statefulsets diff --git a/bitnami/etcd/values.yaml b/bitnami/etcd/values.yaml index b96563492..f1190341a 100644 --- a/bitnami/etcd/values.yaml +++ b/bitnami/etcd/values.yaml @@ -31,11 +31,13 @@ image: ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging debug: false - ## String to partially override etcd.fullname template (will maintain the release name) - # nameOverride: +## String to partially override etcd.fullname template (will maintain the release name) +## +# nameOverride: - ## String to fully override etcd.fullname template - # fullnameOverride: +## String to fully override etcd.fullname template +## +# fullnameOverride: statefulset: ## Update strategy, can be set to RollingUpdate or OnDelete by default. diff --git a/bitnami/harbor/Chart.yaml b/bitnami/harbor/Chart.yaml index 2e6018d96..b4c1b6c26 100644 --- a/bitnami/harbor/Chart.yaml +++ b/bitnami/harbor/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: harbor -version: 0.0.5 +version: 0.0.6 appVersion: 1.8.1 description: Harbor is an an open source trusted cloud native registry project that stores, signs, and scans content keywords: diff --git a/bitnami/harbor/README.md b/bitnami/harbor/README.md index 3b0867a25..f4ecae425 100644 --- a/bitnami/harbor/README.md +++ b/bitnami/harbor/README.md @@ -147,6 +147,8 @@ The following table lists the configurable parameters of the Harbor chart and th | `persistence.imageChartStorage.disableredirect` | The configuration for managing redirects from content backends. For backends which do not supported it (such as using minio for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect) for more information about the detail | `false` | | `persistence.imageChartStorage.type` | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry and chartmuseum. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more information about the detail | `filesystem` | | **General** | +| `nameOverride` | String to partially override harbor.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override harbor.fullname template with a string | `nil` | | `externalURL` | The external URL for Harbor core service | `https://core.harbor.domain` | | `imagePullPolicy` | The image pull policy | `IfNotPresent` | | `logLevel` | The log level | `debug` | @@ -344,4 +346,4 @@ This chart includes a `values-production.yaml` file where you can find some para It is strongly recommended to use immutable tags in a production environment. This ensures your deployment does not change automatically if the same tag is updated with a different image. -Bitnami will release a new chart updating its containers if a new version of the main container, significant changes, or critical vulnerabilities exist. \ No newline at end of file +Bitnami will release a new chart updating its containers if a new version of the main container, significant changes, or critical vulnerabilities exist. diff --git a/bitnami/harbor/templates/_helpers.tpl b/bitnami/harbor/templates/_helpers.tpl index cdf4d1b01..772bb0855 100644 --- a/bitnami/harbor/templates/_helpers.tpl +++ b/bitnami/harbor/templates/_helpers.tpl @@ -19,9 +19,17 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "harbor.fullname" -}} -{{- $name := default "harbor" .Values.nameOverride -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- end -}} +{{- end -}} {{/* Helm required labels */}} {{- define "harbor.labels" -}} diff --git a/bitnami/harbor/values-production.yaml b/bitnami/harbor/values-production.yaml index 4a870fee0..934d6e72d 100644 --- a/bitnami/harbor/values-production.yaml +++ b/bitnami/harbor/values-production.yaml @@ -223,6 +223,14 @@ nginxImage: ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging debug: false +## String to partially override harbor.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override harbor.fullname template +## +# fullnameOverride: + service: # Set the way how to expose the service. Set the type as "Ingress", # "ClusterIP", "NodePort" or "LoadBalancer" and fill the information diff --git a/bitnami/harbor/values.yaml b/bitnami/harbor/values.yaml index 2b303f6ca..18549ad5a 100644 --- a/bitnami/harbor/values.yaml +++ b/bitnami/harbor/values.yaml @@ -223,6 +223,14 @@ nginxImage: ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging debug: false +## String to partially override harbor.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override harbor.fullname template +## +# fullnameOverride: + service: # Set the way how to expose the service. Set the type as "Ingress", # "ClusterIP", "NodePort" or "LoadBalancer" and fill the information diff --git a/bitnami/jenkins/Chart.yaml b/bitnami/jenkins/Chart.yaml index 82ff2648c..1f5a6ade3 100644 --- a/bitnami/jenkins/Chart.yaml +++ b/bitnami/jenkins/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: jenkins -version: 2.3.9 +version: 2.3.10 appVersion: 2.176.1 description: The leading open source automation server keywords: diff --git a/bitnami/jenkins/README.md b/bitnami/jenkins/README.md index 636a4ffea..cb4ba4bd2 100644 --- a/bitnami/jenkins/README.md +++ b/bitnami/jenkins/README.md @@ -45,52 +45,54 @@ The command removes all the Kubernetes components associated with the chart and The following tables lists the configurable parameters of the Jenkins chart and their default values. -| Parameter | Description | Default | -|----------------------------|----------------------------------------|---------------------------------------------------------- | -| `global.imageRegistry` | Global Docker image registry | `nil` | -| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | -| `image.registry` | Jenkins image registry | `docker.io` | -| `image.repository` | Jenkins Image name | `bitnami/jenkins` | -| `image.tag` | Jenkins Image tag | `{TAG_NAME}` | -| `image.pullPolicy` | Jenkins image pull policy | `IfNotPresent` | -| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | -| `jenkinsUser` | User of the application | `user` | -| `jenkinsPassword` | Application password | _random 10 character alphanumeric string_ | -| `jenkinsHome` | Jenkins home directory | `/opt/bitnami/jenkins/jenkins_home` | -| `disableInitialization` | Allows to disable the initial Bitnami configuration for Jenkins | `no` | -| `javaOpts` | Customize JVM parameters | `nil` | -| `service.type` | Kubernetes Service type | `LoadBalancer` | -| `service.port` | Service HTTP port | `80` | -| `service.httpsPort` | Service HTTPS port | `443` | -| `service.nodePorts.http` | Kubernetes http node port | `""` | -| `service.nodePorts.https` | Kubernetes https node port | `""` | -| `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` | -| `service.loadBalancerIP` | LoadBalancer service IP address | `""` | -| `ingress.enabled` | Enable ingress controller resource | `false` | -| `ingress.annotations` | Ingress annotations | `[]` | -| `ingress.certManager` | Add annotations for cert-manager | `false` | -| `ingress.hosts[0].name` | Hostname to your jenkins installation | `jenkins.local` | -| `ingress.hosts[0].path` | Path within the url structure | `/` | -| `ingress.hosts[0].tls` | Utilize TLS backend in ingress | `false` | -| `ingress.hosts[0].tlsHosts` | Array of TLS hosts for ingress record (defaults to `ingress.hosts[0].name` if `nil`) | `nil` | -| `ingress.hosts[0].tlsSecret` | TLS Secret (certificates) | `jenkins.local-tls-secret` | -| `ingress.secrets[0].name` | TLS Secret Name | `nil` | -| `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` | -| `ingress.secrets[0].key` | TLS Secret Key | `nil` | -| `persistence.enabled` | Enable persistence using PVC | `true` | -| `persistence.storageClass` | PVC Storage Class for Jenkins volume | `nil` (uses alpha storage class annotation) | -| `persistence.accessMode` | PVC Access Mode for Jenkins volume | `ReadWriteOnce` | -| `persistence.size` | PVC Storage Request for Jenkins volume | `8Gi` | -| `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | -| `podAnnotations` | Pod annotations | `{}` | -| `metrics.enabled` | Start a side-car Jenkins prometheus exporter | `false` | -| `metrics.image.registry` | Jenkins exporter image registry | `docker.io` | -| `metrics.image.repository` | Jenkins exporter image name | `tolleiv/jenkins_exporter` | -| `metrics.image.tag` | Jenkins exporter image tag | `latest` | -| `metrics.image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | -| `metrics.podAnnotations` | Additional annotations for Metrics exporter pod | `{prometheus.io/scrape: "true", prometheus.io/port: "9118"}` | -| `metrics.resources` | Exporter resource requests/limit | Memory: `256Mi`, CPU: `100m` | +Parameter | Description | Default +--- | --- | --- +`global.imageRegistry` | Global Docker image registry | `nil` +`global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) +`image.registry` | Jenkins image registry | `docker.io` +`image.repository` | Jenkins Image name | `bitnami/jenkins` +`image.tag` | Jenkins Image tag | `{TAG_NAME}` +`image.pullPolicy` | Jenkins image pull policy | `IfNotPresent` +`image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) +`nameOverride` | String to partially override jenkins.fullname template with a string (will prepend the release name) | `nil` +`fullnameOverride` | String to fully override jenkins.fullname template with a string | `nil` +`jenkinsUser` | User of the application | `user` +`jenkinsPassword` | Application password | _random 10 character alphanumeric string_ +`jenkinsHome` | Jenkins home directory | `/opt/bitnami/jenkins/jenkins_home` +`disableInitialization` | Allows to disable the initial Bitnami configuration for Jenkins | `no` +`javaOpts` | Customize JVM parameters | `nil` +`service.type` | Kubernetes Service type | `LoadBalancer` +`service.port` | Service HTTP port | `80` +`service.httpsPort` | Service HTTPS port | `443` +`service.nodePorts.http` | Kubernetes http node port | `""` +`service.nodePorts.https` | Kubernetes https node port | `""` +`service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` +`service.loadBalancerIP` | LoadBalancer service IP address | `""` +`ingress.enabled` | Enable ingress controller resource | `false` +`ingress.annotations` | Ingress annotations | `[]` +`ingress.certManager` | Add annotations for cert-manager | `false` +`ingress.hosts[0].name` | Hostname to your jenkins installation | `jenkins.local` +`ingress.hosts[0].path` | Path within the url structure | `/` +`ingress.hosts[0].tls`| Utilize TLS backend in ingress | `false` +`ingress.hosts[0].tlsHosts` | Array of TLS hosts for ingress record (defaults to `ingress.hosts[0].name` if `nil`) | `nil` +`ingress.hosts[0].tlsSecret` | TLS Secret (certificates) | `jenkins.local-tls-secret` +`ingress.secrets[0].name`| TLS Secret Name | `nil` +`ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` +`ingress.secrets[0].key` | TLS Secret Key | `nil` +`persistence.enabled` | Enable persistence using PVC | `true` +`persistence.storageClass`| PVC Storage Class for Jenkins volume | `nil` (uses alpha storage class annotation) +`persistence.accessMode` | PVC Access Mode for Jenkins volume | `ReadWriteOnce` +`persistence.size` | PVC Storage Request for Jenkins volume | `8Gi` +`resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` +`podAnnotations` | Pod annotations | `{}` +`metrics.enabled` | Start a side-car Jenkins prometheus exporter | `false` +`metrics.image.registry` | Jenkins exporter image registry | `docker.io` +`metrics.image.repository` | Jenkins exporter image name | `tolleiv/jenkins_exporter` +`metrics.image.tag` | Jenkins exporter image tag | `latest` +`metrics.image.pullPolicy` | Image pull policy | `IfNotPresent` +`metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) +`metrics.podAnnotations` | Additional annotations for Metrics exporter pod | `{prometheus.io/scrape: "true", prometheus.io/port: "9118"}` +`metrics.resources` | Exporter resource requests/limit | Memory: `256Mi`, CPU: `100m` The above parameters map to the env variables defined in [bitnami/jenkins](http://github.com/bitnami/bitnami-docker-jenkins). For more information please refer to the [bitnami/jenkins](http://github.com/bitnami/bitnami-docker-jenkins) image documentation. diff --git a/bitnami/jenkins/templates/_helpers.tpl b/bitnami/jenkins/templates/_helpers.tpl index 4763ddfc6..9aacd8c74 100644 --- a/bitnami/jenkins/templates/_helpers.tpl +++ b/bitnami/jenkins/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "name" -}} +{{- define "jenkins.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -18,9 +18,17 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "jenkins.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- end -}} +{{- end -}} {{/* Return the proper Jenkins image name diff --git a/bitnami/jenkins/templates/deployment.yaml b/bitnami/jenkins/templates/deployment.yaml index 324122da4..dc17f2b0a 100644 --- a/bitnami/jenkins/templates/deployment.yaml +++ b/bitnami/jenkins/templates/deployment.yaml @@ -3,19 +3,19 @@ kind: Deployment metadata: name: {{ template "jenkins.fullname" . }} labels: - app: {{ template "jenkins.fullname" . }} + app: {{ template "jenkins.name" . }} chart: {{ include "jenkins.chart" . }} release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" spec: selector: matchLabels: - app: {{ template "jenkins.fullname" . }} + app: {{ template "jenkins.name" . }} release: "{{ .Release.Name }}" template: metadata: labels: - app: {{ template "jenkins.fullname" . }} + app: {{ template "jenkins.name" . }} chart: {{ include "jenkins.chart" . }} release: "{{ .Release.Name }}" {{- if or .Values.podAnnotations .Values.metrics.enabled }} diff --git a/bitnami/jenkins/templates/ingress.yaml b/bitnami/jenkins/templates/ingress.yaml index 62fac631a..64438e404 100644 --- a/bitnami/jenkins/templates/ingress.yaml +++ b/bitnami/jenkins/templates/ingress.yaml @@ -4,7 +4,7 @@ kind: Ingress metadata: name: {{ template "jenkins.fullname" . }} labels: - app: "{{ template "jenkins.fullname" . }}" + app: "{{ template "jenkins.name" . }}" chart: {{ include "jenkins.chart" . }} release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} diff --git a/bitnami/jenkins/templates/pvc.yaml b/bitnami/jenkins/templates/pvc.yaml index 662ca9d89..758e6c437 100644 --- a/bitnami/jenkins/templates/pvc.yaml +++ b/bitnami/jenkins/templates/pvc.yaml @@ -4,7 +4,7 @@ apiVersion: v1 metadata: name: {{ template "jenkins.fullname" . }} labels: - app: {{ template "jenkins.fullname" . }} + app: {{ template "jenkins.name" . }} chart: {{ include "jenkins.chart" . }} release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/bitnami/jenkins/templates/secrets.yaml b/bitnami/jenkins/templates/secrets.yaml index 00fa991e2..389e80914 100644 --- a/bitnami/jenkins/templates/secrets.yaml +++ b/bitnami/jenkins/templates/secrets.yaml @@ -3,7 +3,7 @@ kind: Secret metadata: name: {{ template "jenkins.fullname" . }} labels: - app: {{ template "jenkins.fullname" . }} + app: {{ template "jenkins.name" . }} chart: {{ include "jenkins.chart" . }} release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/bitnami/jenkins/templates/svc.yaml b/bitnami/jenkins/templates/svc.yaml index b0d3ad153..3765cd0b4 100644 --- a/bitnami/jenkins/templates/svc.yaml +++ b/bitnami/jenkins/templates/svc.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: {{ template "jenkins.fullname" . }} labels: - app: {{ template "jenkins.fullname" . }} + app: {{ template "jenkins.name" . }} chart: {{ include "jenkins.chart" . }} release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -29,4 +29,4 @@ spec: nodePort: {{ .Values.service.nodePorts.https }} {{- end }} selector: - app: {{ template "jenkins.fullname" . }} + app: {{ template "jenkins.name" . }} diff --git a/bitnami/jenkins/values.yaml b/bitnami/jenkins/values.yaml index 419a57a37..1fbf1b083 100644 --- a/bitnami/jenkins/values.yaml +++ b/bitnami/jenkins/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override jenkins.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override jenkins.fullname template +## +# fullnameOverride: + ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-jenkins#configuration ## diff --git a/bitnami/kafka/Chart.yaml b/bitnami/kafka/Chart.yaml index be06c0815..4aa906246 100644 --- a/bitnami/kafka/Chart.yaml +++ b/bitnami/kafka/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: kafka -version: 3.0.13 +version: 3.0.14 appVersion: 2.3.0 description: Apache Kafka is a distributed streaming platform. keywords: diff --git a/bitnami/kafka/templates/_helpers.tpl b/bitnami/kafka/templates/_helpers.tpl index 49feea4ad..70219ce73 100644 --- a/bitnami/kafka/templates/_helpers.tpl +++ b/bitnami/kafka/templates/_helpers.tpl @@ -3,7 +3,7 @@ Expand the name of the chart. */}} {{- define "kafka.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 24 -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* diff --git a/bitnami/magento/Chart.yaml b/bitnami/magento/Chart.yaml index f9474afd7..e33e8b27b 100644 --- a/bitnami/magento/Chart.yaml +++ b/bitnami/magento/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: magento -version: 5.2.2 +version: 5.2.3 appVersion: 2.3.2 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: diff --git a/bitnami/magento/README.md b/bitnami/magento/README.md index aa8ff4002..ee079771c 100644 --- a/bitnami/magento/README.md +++ b/bitnami/magento/README.md @@ -57,6 +57,8 @@ The following table lists the configurable parameters of the Magento chart and t | `image.debug` | Specify if debug values should be set | `false` | | `image.pullPolicy` | Image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override magento.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override magento.fullname template with a string | `nil` | | `magentoHost` | Magento host to create application URLs | `nil` | | `magentoLoadBalancerIP` | `loadBalancerIP` for the magento Service | `nil` | | `magentoUsername` | User of the application | `user` | diff --git a/bitnami/magento/templates/_helpers.tpl b/bitnami/magento/templates/_helpers.tpl index 8ec2c7f2d..3e5531dcf 100644 --- a/bitnami/magento/templates/_helpers.tpl +++ b/bitnami/magento/templates/_helpers.tpl @@ -11,9 +11,17 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "magento.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- end -}} +{{- end -}} {{/* Create a random alphanumeric password string. diff --git a/bitnami/magento/values-production.yaml b/bitnami/magento/values-production.yaml index c805e1ef1..d44c5340f 100644 --- a/bitnami/magento/values-production.yaml +++ b/bitnami/magento/values-production.yaml @@ -31,6 +31,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override magento.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override magento.fullname template +## +# fullnameOverride: + ## Magento host to create application URLs ## ref: https://github.com/bitnami/bitnami-docker-magento#configuration ## diff --git a/bitnami/magento/values.yaml b/bitnami/magento/values.yaml index 8f9bd2529..a9b4f0690 100644 --- a/bitnami/magento/values.yaml +++ b/bitnami/magento/values.yaml @@ -31,6 +31,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override magento.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override magento.fullname template +## +# fullnameOverride: + ## Magento host to create application URLs ## ref: https://github.com/bitnami/bitnami-docker-magento#configuration ## diff --git a/bitnami/memcached/Chart.yaml b/bitnami/memcached/Chart.yaml index 4f5ea06d0..8607d165c 100644 --- a/bitnami/memcached/Chart.yaml +++ b/bitnami/memcached/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: memcached -version: 1.5.11 +version: 1.5.12 appVersion: 1.5.16 description: Chart for Memcached keywords: diff --git a/bitnami/memcached/README.md b/bitnami/memcached/README.md index 3169856fc..4d41e5bc4 100644 --- a/bitnami/memcached/README.md +++ b/bitnami/memcached/README.md @@ -54,6 +54,8 @@ The following tables lists the configurable parameters of the Memcached chart an | `image.tag` | Memcached Image tag | `{TAG_NAME}` | | `image.pullPolicy` | Memcached image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override memcached.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override memcached.fullname template with a string | `nil` | | `securityContext.enabled` | Enable security context | `true` | | `securityContext.fsGroup` | Group ID for the container | `1001` | | `securityContext.runAsUser` | User ID for the container | `1001` | diff --git a/bitnami/memcached/templates/_helpers.tpl b/bitnami/memcached/templates/_helpers.tpl index b90a5ae76..0b363ae0f 100644 --- a/bitnami/memcached/templates/_helpers.tpl +++ b/bitnami/memcached/templates/_helpers.tpl @@ -2,17 +2,25 @@ {{/* Expand the name of the chart. */}} -{{- define "name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 24 -}} +{{- define "memcached.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* Create a default fully qualified app name. We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} -{{- define "fullname" -}} +{{- define "memcached.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} -{{- printf "%s-%s" .Release.Name $name | trunc 24 -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} {{- end -}} {{/* diff --git a/bitnami/memcached/templates/deployment.yaml b/bitnami/memcached/templates/deployment.yaml index a3488abb4..f1cab82e8 100644 --- a/bitnami/memcached/templates/deployment.yaml +++ b/bitnami/memcached/templates/deployment.yaml @@ -1,21 +1,21 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ template "fullname" . }} + name: {{ template "memcached.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "memcached.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" spec: selector: matchLabels: - app: {{ template "fullname" . }} + app: {{ template "memcached.name" . }} release: "{{ .Release.Name }}" template: metadata: labels: - app: {{ template "fullname" . }} + app: {{ template "memcached.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" {{- if or .Values.podAnnotations .Values.metrics.enabled }} @@ -35,7 +35,7 @@ spec: {{- end }} {{- include "memcached.imagePullSecrets" . | indent 6 }} containers: - - name: {{ template "fullname" . }} + - name: memcached image: "{{ template "memcached.image" . }}" imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: @@ -44,7 +44,7 @@ spec: - name: MEMCACHED_PASSWORD valueFrom: secretKeyRef: - name: {{ template "fullname" . }} + name: {{ template "memcached.fullname" . }} key: memcached-password ports: - name: memcache diff --git a/bitnami/memcached/templates/secrets.yaml b/bitnami/memcached/templates/secrets.yaml index 0b46cfeb4..47531821c 100644 --- a/bitnami/memcached/templates/secrets.yaml +++ b/bitnami/memcached/templates/secrets.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "fullname" . }} + name: {{ template "memcached.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "memcached.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/bitnami/memcached/templates/svc.yaml b/bitnami/memcached/templates/svc.yaml index 82305196f..623aead19 100644 --- a/bitnami/memcached/templates/svc.yaml +++ b/bitnami/memcached/templates/svc.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "fullname" . }} + name: {{ template "memcached.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "memcached.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -14,4 +14,4 @@ spec: port: 11211 targetPort: memcache selector: - app: {{ template "fullname" . }} + app: {{ template "memcached.name" . }} diff --git a/bitnami/memcached/values-production.yaml b/bitnami/memcached/values-production.yaml index 240867a01..188fccdd8 100644 --- a/bitnami/memcached/values-production.yaml +++ b/bitnami/memcached/values-production.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override memcached.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override memcached.fullname template +## +# fullnameOverride: + ## Pod Security Context ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ ## diff --git a/bitnami/memcached/values.yaml b/bitnami/memcached/values.yaml index c094427e9..127fcd3c3 100644 --- a/bitnami/memcached/values.yaml +++ b/bitnami/memcached/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override memcached.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override memcached.fullname template +## +# fullnameOverride: + ## Pod Security Context ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ ## diff --git a/bitnami/metrics-server/Chart.yaml b/bitnami/metrics-server/Chart.yaml index 6437ee6ee..f42383b9b 100644 --- a/bitnami/metrics-server/Chart.yaml +++ b/bitnami/metrics-server/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: metrics-server -version: 2.3.8 +version: 2.3.9 appVersion: 0.3.3 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: diff --git a/bitnami/metrics-server/README.md b/bitnami/metrics-server/README.md index a9781ab60..e5dcdf9f1 100644 --- a/bitnami/metrics-server/README.md +++ b/bitnami/metrics-server/README.md @@ -53,6 +53,8 @@ The following tables lists the configurable parameters of the Metrics Server cha | `image.repository` | Metrics Server image name | `bitnami/metrics-server` | | `image.tag` | Metrics Server image tag | `{TAG_NAME}` | | `image.pullPolicy` | Metrics Server image pull policy | `IfNotPresent` | +| `nameOverride` | String to partially override metrics-server.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override metrics-server.fullname template with a string | `nil` | | `securePort` | Port where metrics-server will be running | `8443` | | `service.type` | Kubernetes Service type | `ClusterIP` | | `service.port` | Kubernetes Service port | `443` | diff --git a/bitnami/metrics-server/templates/_helpers.tpl b/bitnami/metrics-server/templates/_helpers.tpl index fe18478db..bfb4a13f4 100644 --- a/bitnami/metrics-server/templates/_helpers.tpl +++ b/bitnami/metrics-server/templates/_helpers.tpl @@ -3,17 +3,24 @@ Expand the name of the chart. */}} {{- define "metrics-server.name" -}} -{{- $name := default .Chart.Name .Values.nameOverride | replace "-" "" -}} -{{- default $name | trunc 24 -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* Create a default fully qualified app name. -We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "metrics-server.fullname" -}} -{{- $name := default .Chart.Name .Values.nameOverride | replace "-" "" -}} -{{- printf "%s-%s" .Release.Name $name | trunc 24 -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} {{- end -}} {{/* diff --git a/bitnami/metrics-server/values.yaml b/bitnami/metrics-server/values.yaml index 7be1931fc..48cf7bcad 100644 --- a/bitnami/metrics-server/values.yaml +++ b/bitnami/metrics-server/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override metrics-server.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override metrics-server.fullname template +## +# fullnameOverride: + rbac: # Specifies whether RBAC resources should be created create: true diff --git a/bitnami/minio/Chart.yaml b/bitnami/minio/Chart.yaml index 37d2a31bd..5911808c9 100644 --- a/bitnami/minio/Chart.yaml +++ b/bitnami/minio/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -version: 0.1.19 +version: 0.1.20 appVersion: 2019.7.10 description: MinIO is an object storage server, compatible with Amazon S3 cloud storage service, mainly used for storing unstructured data (such as photos, videos, log files, etc.) keywords: diff --git a/bitnami/minio/README.md b/bitnami/minio/README.md index e49386ae6..a44a02f1d 100644 --- a/bitnami/minio/README.md +++ b/bitnami/minio/README.md @@ -58,6 +58,8 @@ The following table lists the configurable parameters of the MinIO chart and the | `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | | `image.debug` | Specify if debug logs should be enabled | `false` | +| `nameOverride` | String to partially override minio.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override minio.fullname template with a string | `nil` | | `clientImage.registry` | MinIO Client image registry | `docker.io` | | `clientImage.repository` | MinIO Client image name | `bitnami/minio-client` | | `clientImage.tag` | MinIO Client image tag | `{TAG_NAME}` | diff --git a/bitnami/minio/templates/_helpers.tpl b/bitnami/minio/templates/_helpers.tpl index 4d2572950..949aa9215 100644 --- a/bitnami/minio/templates/_helpers.tpl +++ b/bitnami/minio/templates/_helpers.tpl @@ -4,7 +4,7 @@ Expand the name of the chart. */}} {{- define "minio.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 24 -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* @@ -12,8 +12,16 @@ Create a default fully qualified app name. We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "minio.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} -{{- printf "%s-%s" .Release.Name $name | trunc 24 -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} {{- end -}} {{/* diff --git a/bitnami/minio/values-production.yaml b/bitnami/minio/values-production.yaml index 6be5fbae7..09825bf4f 100644 --- a/bitnami/minio/values-production.yaml +++ b/bitnami/minio/values-production.yaml @@ -36,6 +36,14 @@ image: ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging debug: false +## String to partially override minio.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override minio.fullname template +## +# fullnameOverride: + ## Bitnami MinIO Client image version ## ref: https://hub.docker.com/r/bitnami/minio-client/tags/ ## diff --git a/bitnami/minio/values.yaml b/bitnami/minio/values.yaml index 48ae414af..80c8e5a95 100644 --- a/bitnami/minio/values.yaml +++ b/bitnami/minio/values.yaml @@ -36,6 +36,14 @@ image: ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging debug: false +## String to partially override minio.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override minio.fullname template +## +# fullnameOverride: + ## Bitnami MinIO Client image version ## ref: https://hub.docker.com/r/bitnami/minio-client/tags/ ## diff --git a/bitnami/mxnet/Chart.yaml b/bitnami/mxnet/Chart.yaml index 8f1b8f8ea..6cd19fba0 100644 --- a/bitnami/mxnet/Chart.yaml +++ b/bitnami/mxnet/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mxnet -version: 0.0.4 +version: 0.0.5 appVersion: 1.4.1 description: A flexible and efficient library for deep learning keywords: diff --git a/bitnami/mxnet/README.md b/bitnami/mxnet/README.md index 04f767ebd..ce079e8f9 100644 --- a/bitnami/mxnet/README.md +++ b/bitnami/mxnet/README.md @@ -55,6 +55,8 @@ The following table lists the configurable parameters of the MinIO chart and the | `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | | `image.debug` | Specify if debug logs should be enabled | `false` | +| `nameOverride` | String to partially override mxnet.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override mxnet.fullname template with a string | `nil` | | `git.registry` | Git image registry | `docker.io` | | `git.repository` | Git image name | `bitnami/git` | | `git.tag` | Git image tag | `{TAG_NAME}` | @@ -193,7 +195,7 @@ $ helm install --name my-release \ bitnami/mxnet ``` -In case you want to add a file that includes sensitive information, pass a secret object using the `existingSecret` parameter. All the files in the secret will be mounted in the `/secrets` folder. +In case you want to add a file that includes sensitive information, pass a secret object using the `existingSecret` parameter. All the files in the secret will be mounted in the `/secrets` folder. ### Distributed training example diff --git a/bitnami/mxnet/values-production.yaml b/bitnami/mxnet/values-production.yaml index 18455793d..f96627260 100644 --- a/bitnami/mxnet/values-production.yaml +++ b/bitnami/mxnet/values-production.yaml @@ -31,6 +31,14 @@ image: ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging debug: false +## String to partially override mxnet.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override mxnet.fullname template +## +# fullnameOverride: + ## Bitnami git image version ## ref: https://hub.docker.com/r/bitnami/git/tags/ ## diff --git a/bitnami/mxnet/values.yaml b/bitnami/mxnet/values.yaml index 937a68dd0..2b85b70d4 100644 --- a/bitnami/mxnet/values.yaml +++ b/bitnami/mxnet/values.yaml @@ -31,6 +31,14 @@ image: ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging debug: false +## String to partially override mxnet.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override mxnet.fullname template +## +# fullnameOverride: + ## Bitnami git image version ## ref: https://hub.docker.com/r/bitnami/git/tags/ ## diff --git a/bitnami/mysql/Chart.yaml b/bitnami/mysql/Chart.yaml index fc630187d..6b4cae0f7 100644 --- a/bitnami/mysql/Chart.yaml +++ b/bitnami/mysql/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mysql -version: 5.0.7 +version: 5.0.8 appVersion: 8.0.16 description: Chart to create a Highly available MySQL cluster keywords: diff --git a/bitnami/mysql/README.md b/bitnami/mysql/README.md index 91d0b722f..d8e685d4b 100644 --- a/bitnami/mysql/README.md +++ b/bitnami/mysql/README.md @@ -54,6 +54,8 @@ The following tables lists the configurable parameters of the MySQL chart and th | `image.tag` | MySQL Image tag | `{TAG_NAME}` | | `image.pullPolicy` | MySQL image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override mysql.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override mysql.fullname template with a string | `nil` | | `service.type` | Kubernetes service type | `ClusterIP` | | `service.port` | MySQL service port | `3306` | | `root.password` | Password for the `root` user | _random 10 character alphanumeric string_ | diff --git a/bitnami/mysql/templates/NOTES.txt b/bitnami/mysql/templates/NOTES.txt index 44d09edca..721a98c6c 100644 --- a/bitnami/mysql/templates/NOTES.txt +++ b/bitnami/mysql/templates/NOTES.txt @@ -7,7 +7,7 @@ Tip: Services: - echo Master: {{ template "fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.service.port }} + echo Master: {{ template "mysql.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.service.port }} {{- if .Values.replication.enabled }} echo Slave: {{ template "mysql.slave.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.service.port }} {{- end }} @@ -15,17 +15,17 @@ Services: Administrator credentials: echo Username: root - echo Password : $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.mysql-root-password}" | base64 --decode) + echo Password : $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mysql.fullname" . }} -o jsonpath="{.data.mysql-root-password}" | base64 --decode) To connect to your database: 1. Run a pod that you can use as a client: - kubectl run {{ template "fullname" . }}-client --rm --tty -i --restart='Never' --image {{ template "mysql.image" . }} --namespace {{ .Release.Namespace }} --command -- bash + kubectl run {{ template "mysql.fullname" . }}-client --rm --tty -i --restart='Never' --image {{ template "mysql.image" . }} --namespace {{ .Release.Namespace }} --command -- bash 2. To connect to master service (read/write): - mysql -h {{ template "fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} -uroot -p {{ .Values.db.name }} + mysql -h {{ template "mysql.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} -uroot -p {{ .Values.db.name }} {{- if .Values.replication.enabled }} @@ -38,7 +38,7 @@ To upgrade this helm chart: 1. Obtain the password as described on the 'Administrator credentials' section and set the 'root.password' parameter as shown below: - ROOT_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.mysql-root-password}" | base64 --decode) + ROOT_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mysql.fullname" . }} -o jsonpath="{.data.mysql-root-password}" | base64 --decode) helm upgrade {{ .Release.Name }} bitnami/mysql --set root.password=$ROOT_PASSWORD {{- if and (contains "bitnami/" .Values.image.repository) (not (.Values.image.tag | toString | regexFind "-r\\d+$|sha256:")) }} diff --git a/bitnami/mysql/templates/_helpers.tpl b/bitnami/mysql/templates/_helpers.tpl index 30be81665..81a62f74d 100644 --- a/bitnami/mysql/templates/_helpers.tpl +++ b/bitnami/mysql/templates/_helpers.tpl @@ -2,26 +2,52 @@ {{/* Expand the name of the chart. */}} -{{- define "name" -}} +{{- define "mysql.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end }} +{{- end -}} {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} -{{- define "fullname" -}} +{{- define "mysql.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end }} +{{- end -}} +{{- end -}} +{{- end -}} {{- define "mysql.master.fullname" -}} -{{- printf "%s-%s" .Release.Name "mysql-master" | trunc 63 | trimSuffix "-" -}} -{{- end }} +{{- if .Values.fullnameOverride -}} +{{- printf "%s-%s" .Values.fullnameOverride "master" | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- printf "%s-%s" .Release.Name "master" | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s-%s" .Release.Name $name "master" | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} +{{- end -}} {{- define "mysql.slave.fullname" -}} -{{- printf "%s-%s" .Release.Name "mysql-slave" | trunc 63 | trimSuffix "-" -}} -{{- end }} +{{- if .Values.fullnameOverride -}} +{{- printf "%s-%s" .Values.fullnameOverride "slave" | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- printf "%s-%s" .Release.Name "slave" | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s-%s" .Release.Name $name "slave" | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} +{{- end -}} {{- define "mysql.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} diff --git a/bitnami/mysql/templates/initialization-configmap.yaml b/bitnami/mysql/templates/initialization-configmap.yaml index 3db8f2298..14fa61e90 100644 --- a/bitnami/mysql/templates/initialization-configmap.yaml +++ b/bitnami/mysql/templates/initialization-configmap.yaml @@ -4,7 +4,7 @@ kind: ConfigMap metadata: name: {{ template "mysql.master.fullname" . }}-init-scripts labels: - app: {{ template "name" . }} + app: {{ template "mysql.name" . }} component: "master" chart: {{ template "mysql.chart" . }} release: {{ .Release.Name | quote }} diff --git a/bitnami/mysql/templates/master-configmap.yaml b/bitnami/mysql/templates/master-configmap.yaml index 6a38e7875..8cf5eb5c8 100644 --- a/bitnami/mysql/templates/master-configmap.yaml +++ b/bitnami/mysql/templates/master-configmap.yaml @@ -4,7 +4,7 @@ kind: ConfigMap metadata: name: {{ template "mysql.master.fullname" . }} labels: - app: {{ template "name" . }} + app: {{ template "mysql.name" . }} component: "master" chart: {{ template "mysql.chart" . }} release: {{ .Release.Name | quote }} diff --git a/bitnami/mysql/templates/master-statefulset.yaml b/bitnami/mysql/templates/master-statefulset.yaml index 657cbf934..20f60bfa5 100644 --- a/bitnami/mysql/templates/master-statefulset.yaml +++ b/bitnami/mysql/templates/master-statefulset.yaml @@ -3,7 +3,7 @@ kind: StatefulSet metadata: name: {{ template "mysql.master.fullname" . }} labels: - app: "{{ template "name" . }}" + app: "{{ template "mysql.name" . }}" chart: {{ template "mysql.chart" . }} component: "master" release: {{ .Release.Name | quote }} @@ -11,7 +11,7 @@ metadata: spec: selector: matchLabels: - app: {{ template "name" . }} + app: {{ template "mysql.name" . }} release: "{{ .Release.Name }}" component: "master" serviceName: "{{ template "mysql.master.fullname" . }}" @@ -24,7 +24,7 @@ spec: template: metadata: labels: - app: "{{ template "name" . }}" + app: "{{ template "mysql.name" . }}" chart: {{ template "mysql.chart" . }} component: "master" release: {{ .Release.Name | quote }} @@ -51,7 +51,7 @@ spec: - topologyKey: "kubernetes.io/hostname" labelSelector: matchLabels: - app: "{{ template "name" . }}" + app: "{{ template "mysql.name" . }}" release: "{{ .Release.Name }}" {{- else if eq .Values.master.antiAffinity "soft" }} affinity: @@ -62,7 +62,7 @@ spec: topologyKey: kubernetes.io/hostname labelSelector: matchLabels: - app: "{{ template "name" . }}" + app: "{{ template "mysql.name" . }}" release: "{{ .Release.Name }}" {{- end }} {{- include "mysql.imagePullSecrets" . | indent 6 }} @@ -74,7 +74,7 @@ spec: - name: MYSQL_ROOT_PASSWORD valueFrom: secretKeyRef: - name: {{ template "fullname" . }} + name: {{ template "mysql.fullname" . }} key: mysql-root-password {{- if .Values.db.user }} - name: MYSQL_USER @@ -82,7 +82,7 @@ spec: - name: MYSQL_PASSWORD valueFrom: secretKeyRef: - name: {{ template "fullname" . }} + name: {{ template "mysql.fullname" . }} key: mysql-password {{- end }} - name: MYSQL_DATABASE @@ -95,7 +95,7 @@ spec: - name: MYSQL_REPLICATION_PASSWORD valueFrom: secretKeyRef: - name: {{ template "fullname" . }} + name: {{ template "mysql.fullname" . }} key: mysql-replication-password {{- end }} ports: @@ -147,7 +147,7 @@ spec: - name: MYSQL_ROOT_PASSWORD valueFrom: secretKeyRef: - name: {{ template "fullname" . }} + name: {{ template "mysql.fullname" . }} key: mysql-root-password command: [ 'sh', '-c', 'DATA_SOURCE_NAME="root:$MYSQL_ROOT_PASSWORD@(localhost:3306)/" /bin/mysqld_exporter' ] ports: @@ -189,7 +189,7 @@ spec: - metadata: name: data labels: - app: "{{ template "name" . }}" + app: "{{ template "mysql.name" . }}" component: "master" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} diff --git a/bitnami/mysql/templates/master-svc.yaml b/bitnami/mysql/templates/master-svc.yaml index 0aabbec27..7d9210204 100644 --- a/bitnami/mysql/templates/master-svc.yaml +++ b/bitnami/mysql/templates/master-svc.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "fullname" . }} + name: {{ template "mysql.fullname" . }} labels: - app: "{{ template "name" . }}" + app: "{{ template "mysql.name" . }}" component: "master" chart: {{ template "mysql.chart" . }} release: {{ .Release.Name | quote }} @@ -20,6 +20,6 @@ spec: targetPort: metrics {{- end }} selector: - app: "{{ template "name" . }}" + app: "{{ template "mysql.name" . }}" component: "master" release: "{{ .Release.Name }}" diff --git a/bitnami/mysql/templates/secrets.yaml b/bitnami/mysql/templates/secrets.yaml index 483517def..1df6c8d70 100644 --- a/bitnami/mysql/templates/secrets.yaml +++ b/bitnami/mysql/templates/secrets.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "fullname" . }} + name: {{ template "mysql.fullname" . }} labels: - app: {{ template "name" . }} + app: {{ template "mysql.name" . }} chart: {{ template "mysql.chart" . }} release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} @@ -35,4 +35,4 @@ data: mysql-replication-password: {{ required "A MySQL Replication Password is required!" .Values.replication.password }} {{- end }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/bitnami/mysql/templates/slave-configmap.yaml b/bitnami/mysql/templates/slave-configmap.yaml index 1ba17ec0b..0f83208c7 100644 --- a/bitnami/mysql/templates/slave-configmap.yaml +++ b/bitnami/mysql/templates/slave-configmap.yaml @@ -4,7 +4,7 @@ kind: ConfigMap metadata: name: {{ template "mysql.slave.fullname" . }} labels: - app: {{ template "name" . }} + app: {{ template "mysql.name" . }} component: "slave" chart: {{ template "mysql.chart" . }} release: {{ .Release.Name | quote }} diff --git a/bitnami/mysql/templates/slave-statefulset.yaml b/bitnami/mysql/templates/slave-statefulset.yaml index ce80d8841..a2bc3ec42 100644 --- a/bitnami/mysql/templates/slave-statefulset.yaml +++ b/bitnami/mysql/templates/slave-statefulset.yaml @@ -4,7 +4,7 @@ kind: StatefulSet metadata: name: {{ template "mysql.slave.fullname" . }} labels: - app: "{{ template "name" . }}" + app: "{{ template "mysql.name" . }}" chart: {{ template "mysql.chart" . }} component: "slave" release: {{ .Release.Name | quote }} @@ -12,7 +12,7 @@ metadata: spec: selector: matchLabels: - app: {{ template "name" . }} + app: {{ template "mysql.name" . }} release: "{{ .Release.Name }}" component: "slave" serviceName: "{{ template "mysql.slave.fullname" . }}" @@ -25,7 +25,7 @@ spec: template: metadata: labels: - app: "{{ template "name" . }}" + app: "{{ template "mysql.name" . }}" chart: {{ template "mysql.chart" . }} component: "slave" release: {{ .Release.Name | quote }} @@ -52,7 +52,7 @@ spec: - topologyKey: "kubernetes.io/hostname" labelSelector: matchLabels: - app: "{{ template "name" . }}" + app: "{{ template "mysql.name" . }}" release: "{{ .Release.Name }}" {{- else if eq .Values.slave.antiAffinity "soft" }} affinity: @@ -63,7 +63,7 @@ spec: topologyKey: kubernetes.io/hostname labelSelector: matchLabels: - app: "{{ template "name" . }}" + app: "{{ template "mysql.name" . }}" release: "{{ .Release.Name }}" {{- end }} {{- include "mysql.imagePullSecrets" . | indent 6 }} @@ -75,7 +75,7 @@ spec: - name: MYSQL_REPLICATION_MODE value: "slave" - name: MYSQL_MASTER_HOST - value: {{ template "fullname" . }} + value: {{ template "mysql.fullname" . }} - name: MYSQL_MASTER_PORT_NUMBER value: "3306" - name: MYSQL_MASTER_ROOT_USER @@ -83,14 +83,14 @@ spec: - name: MYSQL_MASTER_ROOT_PASSWORD valueFrom: secretKeyRef: - name: {{ template "fullname" . }} + name: {{ template "mysql.fullname" . }} key: mysql-root-password - name: MYSQL_REPLICATION_USER value: "{{ .Values.replication.user }}" - name: MYSQL_REPLICATION_PASSWORD valueFrom: secretKeyRef: - name: {{ template "fullname" . }} + name: {{ template "mysql.fullname" . }} key: mysql-replication-password ports: - name: mysql @@ -133,7 +133,7 @@ spec: - name: MYSQL_MASTER_ROOT_PASSWORD valueFrom: secretKeyRef: - name: {{ template "fullname" . }} + name: {{ template "mysql.fullname" . }} key: mysql-root-password command: [ 'sh', '-c', 'DATA_SOURCE_NAME="root:$MYSQL_MASTER_ROOT_PASSWORD@(localhost:3306)/" /bin/mysqld_exporter' ] ports: @@ -165,7 +165,7 @@ spec: - metadata: name: data labels: - app: "{{ template "name" . }}" + app: "{{ template "mysql.name" . }}" component: "slave" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} diff --git a/bitnami/mysql/templates/slave-svc.yaml b/bitnami/mysql/templates/slave-svc.yaml index 392712fd0..65fc5537f 100644 --- a/bitnami/mysql/templates/slave-svc.yaml +++ b/bitnami/mysql/templates/slave-svc.yaml @@ -4,7 +4,7 @@ kind: Service metadata: name: {{ template "mysql.slave.fullname" . }} labels: - app: "{{ template "name" . }}" + app: "{{ template "mysql.name" . }}" chart: {{ template "mysql.chart" . }} component: "slave" release: {{ .Release.Name | quote }} @@ -21,7 +21,7 @@ spec: targetPort: metrics {{- end }} selector: - app: "{{ template "name" . }}" + app: "{{ template "mysql.name" . }}" component: "slave" release: "{{ .Release.Name }}" {{- end }} diff --git a/bitnami/mysql/values-production.yaml b/bitnami/mysql/values-production.yaml index 16217d4f8..e16da6e37 100644 --- a/bitnami/mysql/values-production.yaml +++ b/bitnami/mysql/values-production.yaml @@ -31,6 +31,14 @@ service: type: ClusterIP port: 3306 +## String to partially override mysql.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override mysql.fullname template +## +# fullnameOverride: + ## Pod Security Context ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ ## diff --git a/bitnami/mysql/values.yaml b/bitnami/mysql/values.yaml index a8739f14f..0de77bc23 100644 --- a/bitnami/mysql/values.yaml +++ b/bitnami/mysql/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override mysql.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override mysql.fullname template +## +# fullnameOverride: + service: ## Kubernetes service type type: ClusterIP diff --git a/bitnami/nginx-ingress-controller/Chart.yaml b/bitnami/nginx-ingress-controller/Chart.yaml index ebe692e39..c57269848 100644 --- a/bitnami/nginx-ingress-controller/Chart.yaml +++ b/bitnami/nginx-ingress-controller/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: nginx-ingress-controller -version: 3.4.9 +version: 3.4.10 appVersion: 0.24.1 description: Chart for the nginx Ingress controller keywords: diff --git a/bitnami/nginx-ingress-controller/README.md b/bitnami/nginx-ingress-controller/README.md index 48f23b084..dfcdf8aee 100644 --- a/bitnami/nginx-ingress-controller/README.md +++ b/bitnami/nginx-ingress-controller/README.md @@ -55,6 +55,8 @@ Parameter | Description | Default `image.repository` | Controller container image repository | `bitnami/nginx-ingress-controller` `image.tag` | Controller container image tag | `{TAG_NAME}` `image.pullPolicy` | Controller container image pull policy | `IfNotPresent` +`nameOverride` | String to partially override nginx-ingress-controller.fullname template with a string (will prepend the release name) | `nil` +`fullnameOverride` | String to fully override nginx-ingress-controller.fullname template with a string | `nil` `config` | Nginx ConfigMap entries | `use-geoip: "false", use-geoip2: "true"` `hostNetwork` | If the nginx deployment / daemonset should run on the host's network namespace. Do not set this when `service.externalIPs` is set and `kube-proxy` is used as there will be a port-conflict for port `80` | false `defaultBackendService` | Default 404 backend service; required only if `defaultBackend.enabled = false` | `""` diff --git a/bitnami/nginx-ingress-controller/templates/_helpers.tpl b/bitnami/nginx-ingress-controller/templates/_helpers.tpl index 6c1a75c35..53f0c01e7 100644 --- a/bitnami/nginx-ingress-controller/templates/_helpers.tpl +++ b/bitnami/nginx-ingress-controller/templates/_helpers.tpl @@ -11,6 +11,9 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "nginx-ingress.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} {{- if contains $name .Release.Name -}} {{- .Release.Name | trunc 63 | trimSuffix "-" -}} @@ -18,6 +21,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} {{- end -}} +{{- end -}} {{/* Construct the path for the publish-service. diff --git a/bitnami/nginx-ingress-controller/values-production.yaml b/bitnami/nginx-ingress-controller/values-production.yaml index 89f81d90d..71a24ca62 100644 --- a/bitnami/nginx-ingress-controller/values-production.yaml +++ b/bitnami/nginx-ingress-controller/values-production.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override nginx-ingress-controller.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override nginx-ingress-controller.fullname template +## +# fullnameOverride: + config: use-geoip: "false" use-geoip2: "true" diff --git a/bitnami/nginx-ingress-controller/values.yaml b/bitnami/nginx-ingress-controller/values.yaml index 0547741c0..8fbb396dd 100644 --- a/bitnami/nginx-ingress-controller/values.yaml +++ b/bitnami/nginx-ingress-controller/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override nginx-ingress-controller.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override nginx-ingress-controller.fullname template +## +# fullnameOverride: + config: use-geoip: "false" use-geoip2: "true" diff --git a/bitnami/nginx/Chart.yaml b/bitnami/nginx/Chart.yaml index 440bbc959..f3b89caef 100644 --- a/bitnami/nginx/Chart.yaml +++ b/bitnami/nginx/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: nginx -version: 3.4.0 +version: 3.4.1 appVersion: 1.16.0 description: Chart for the nginx server keywords: diff --git a/bitnami/nginx/README.md b/bitnami/nginx/README.md index 5354bdd74..6a6912104 100644 --- a/bitnami/nginx/README.md +++ b/bitnami/nginx/README.md @@ -51,6 +51,8 @@ The following tables lists the configurable parameters of the NGINX Open Source | `image.tag` | NGINX Image tag | `{TAG_NAME}` | | `image.pullPolicy` | NGINX image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override nginx.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override nginx.fullname template with a string | `nil` | | `serverBlock` | Custom NGINX server block | `nil` | | `podAnnotations` | Pod annotations | `{}` | | `metrics.enabled` | Start a side-car prometheus exporter | `false` | diff --git a/bitnami/nginx/templates/_helpers.tpl b/bitnami/nginx/templates/_helpers.tpl index 75b6ee1eb..7612538a8 100644 --- a/bitnami/nginx/templates/_helpers.tpl +++ b/bitnami/nginx/templates/_helpers.tpl @@ -2,17 +2,25 @@ {{/* Expand the name of the chart. */}} -{{- define "name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 24 -}} +{{- define "nginx.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* Create a default fully qualified app name. We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} -{{- define "fullname" -}} +{{- define "nginx.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} -{{- printf "%s-%s" .Release.Name $name | trunc 24 -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} {{- end -}} {{/* diff --git a/bitnami/nginx/templates/deployment.yaml b/bitnami/nginx/templates/deployment.yaml index 35d824c28..d3aa7ec2d 100644 --- a/bitnami/nginx/templates/deployment.yaml +++ b/bitnami/nginx/templates/deployment.yaml @@ -1,22 +1,22 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ template "fullname" . }} + name: {{ template "nginx.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "nginx.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" spec: selector: matchLabels: - app: {{ template "fullname" . }} + app: {{ template "nginx.name" . }} release: "{{ .Release.Name }}" replicas: 1 template: metadata: labels: - app: {{ template "fullname" . }} + app: {{ template "nginx.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -32,7 +32,7 @@ spec: spec: {{- include "nginx.imagePullSecrets" . | indent 6 }} containers: - - name: {{ template "fullname" . }} + - name: nginx image: "{{ template "nginx.image" . }}" imagePullPolicy: {{ .Values.image.pullPolicy | quote }} ports: @@ -74,5 +74,5 @@ spec: {{- if .Values.serverBlock }} - name: nginx-server-block configMap: - name: {{ template "fullname" . }} + name: {{ template "nginx.fullname" . }} {{- end }} diff --git a/bitnami/nginx/templates/ingress.yaml b/bitnami/nginx/templates/ingress.yaml index 2733dacaf..e53f9d8cd 100644 --- a/bitnami/nginx/templates/ingress.yaml +++ b/bitnami/nginx/templates/ingress.yaml @@ -2,9 +2,9 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: - name: {{ template "fullname" . }} + name: {{ template "nginx.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "nginx.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -23,7 +23,7 @@ spec: paths: - path: {{ default "/" .path }} backend: - serviceName: "{{ template "fullname" $ }}" + serviceName: "{{ template "nginx.fullname" $ }}" servicePort: http {{- end }} {{- if .Values.ingress.tls }} diff --git a/bitnami/nginx/templates/server-host.yaml b/bitnami/nginx/templates/server-host.yaml index 220c9d9b4..76f780b1a 100644 --- a/bitnami/nginx/templates/server-host.yaml +++ b/bitnami/nginx/templates/server-host.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "fullname" . }} + name: {{ template "nginx.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "nginx.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/bitnami/nginx/templates/svc.yaml b/bitnami/nginx/templates/svc.yaml index fb6b9b613..474748b4e 100644 --- a/bitnami/nginx/templates/svc.yaml +++ b/bitnami/nginx/templates/svc.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "fullname" . }} + name: {{ template "nginx.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "nginx.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -27,4 +27,4 @@ spec: nodePort: {{ .Values.service.nodePorts.http }} {{- end }} selector: - app: {{ template "fullname" . }} + app: {{ template "nginx.name" . }} diff --git a/bitnami/nginx/templates/tls-secrets.yaml b/bitnami/nginx/templates/tls-secrets.yaml index c6dd8207d..b265a5c1c 100644 --- a/bitnami/nginx/templates/tls-secrets.yaml +++ b/bitnami/nginx/templates/tls-secrets.yaml @@ -5,7 +5,7 @@ kind: Secret metadata: name: {{ .name }} labels: - app: {{ template "fullname" . }} + app: {{ template "nginx.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/bitnami/nginx/values.yaml b/bitnami/nginx/values.yaml index 89bcddb88..b57b39ab2 100644 --- a/bitnami/nginx/values.yaml +++ b/bitnami/nginx/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override nginx.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override nginx.fullname template +## +# fullnameOverride: + ## Kubernetes configuration ## For minikube, set this to NodePort, elsewhere use LoadBalancer ## diff --git a/bitnami/node/Chart.yaml b/bitnami/node/Chart.yaml index ad7b2705e..192932b47 100644 --- a/bitnami/node/Chart.yaml +++ b/bitnami/node/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: node -version: 8.1.10 +version: 8.1.11 appVersion: 10.16.0 description: Event-driven I/O server-side JavaScript environment based on V8 keywords: diff --git a/bitnami/node/README.md b/bitnami/node/README.md index 338a4e2d0..00d100c05 100644 --- a/bitnami/node/README.md +++ b/bitnami/node/README.md @@ -59,6 +59,8 @@ The following table lists the configurable parameters of the Node chart and thei | `image.tag` | NodeJS image tag | `{TAG_NAME}` | | `image.pullPolicy` | NodeJS image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override node.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override node.fullname template with a string | `nil` | | `git.registry` | Git image registry | `docker.io` | | `git.repository` | Git image name | `bitnami/git` | | `git.tag` | Git image tag | `{TAG_NAME}` | @@ -68,9 +70,9 @@ The following table lists the configurable parameters of the Node chart and thei | `replicas` | Number of replicas for the application | `1` | | `applicationPort` | Port where the application will be running | `3000` | | `extraEnv` | Any extra environment variables to be pass to the pods | `{}` | -| `securityContext.enabled` | Enable security context | `true` | -| `securityContext.fsGroup` | Group ID for the container | `1001` | -| `securityContext.runAsUser` | User ID for the container | `1001` | +| `securityContext.enabled` | Enable security context | `true` | +| `securityContext.fsGroup` | Group ID for the container | `1001` | +| `securityContext.runAsUser` | User ID for the container | `1001` | | `service.type` | Kubernetes Service type | `ClusterIP` | | `service.port` | Kubernetes Service port | `80` | | `service.annotations` | Annotations for the Service | {} | diff --git a/bitnami/node/templates/_helpers.tpl b/bitnami/node/templates/_helpers.tpl index 35d68681b..fee010851 100644 --- a/bitnami/node/templates/_helpers.tpl +++ b/bitnami/node/templates/_helpers.tpl @@ -11,9 +11,17 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "node.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- end -}} +{{- end -}} {{/* Create a default fully qualified app name. diff --git a/bitnami/node/values.yaml b/bitnami/node/values.yaml index 5c7db3556..ff5245d06 100644 --- a/bitnami/node/values.yaml +++ b/bitnami/node/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override node.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override node.fullname template +## +# fullnameOverride: + ## Bitnami git image version ## ref: https://hub.docker.com/r/bitnami/git/tags/ ## diff --git a/bitnami/pytorch/Chart.yaml b/bitnami/pytorch/Chart.yaml index 20b035a99..c53a4c044 100644 --- a/bitnami/pytorch/Chart.yaml +++ b/bitnami/pytorch/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: pytorch -version: 0.0.7 +version: 0.0.8 appVersion: 1.1.0 description: Deep learning platform that accelerates the transition from research prototyping to production deployment keywords: diff --git a/bitnami/pytorch/README.md b/bitnami/pytorch/README.md index acd079276..50be43f6e 100644 --- a/bitnami/pytorch/README.md +++ b/bitnami/pytorch/README.md @@ -57,9 +57,11 @@ The following table lists the configurable parameters of the MinIO chart and the | `image.debug` | Specify if debug logs should be enabled | `false` | | `git.registry` | Git image registry | `docker.io` | | `git.repository` | Git image name | `bitnami/git` | -| `git.tag` | Git image tag | `{TAG_NAME}` | +| `git.tag` | Git image tag | `{TAG_NAME}` | | `git.pullPolicy` | Git image pull policy | `IfNotPresent` | | `git.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override pytorch.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override pytorch.fullname template with a string | `nil` | | service.type | Kubernetes service type | `ClusterIP` | | `entrypoint.file` | Main entrypoint to your application | `''` | | `entrypoint.args` | Args required by your entrypoint | `nil` | diff --git a/bitnami/pytorch/values-production.yaml b/bitnami/pytorch/values-production.yaml index c21dcafd1..a8e912cd0 100644 --- a/bitnami/pytorch/values-production.yaml +++ b/bitnami/pytorch/values-production.yaml @@ -46,6 +46,14 @@ git: # pullSecrets: # - myRegistryKeySecretName +## String to partially override pytorch.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override pytorch.fullname template +## +# fullnameOverride: + service: ## Kubernetes service type, ClusterIP and NodePort are supported at present type: ClusterIP diff --git a/bitnami/pytorch/values.yaml b/bitnami/pytorch/values.yaml index ea5a710ca..667345a6f 100644 --- a/bitnami/pytorch/values.yaml +++ b/bitnami/pytorch/values.yaml @@ -46,6 +46,14 @@ git: # pullSecrets: # - myRegistryKeySecretName +## String to partially override pytorch.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override pytorch.fullname template +## +# fullnameOverride: + service: ## Kubernetes service type, ClusterIP and NodePort are supported at present type: ClusterIP diff --git a/bitnami/spark/Chart.yaml b/bitnami/spark/Chart.yaml index 792091fc3..bd4b6f642 100644 --- a/bitnami/spark/Chart.yaml +++ b/bitnami/spark/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 2.4.3 +appVersion: 2.4.4 description: Spark is a fast and general-purpose cluster computing system. name: spark version: 0.0.3 diff --git a/bitnami/spark/README.md b/bitnami/spark/README.md index 4f37fe95b..1ba9f1a71 100644 --- a/bitnami/spark/README.md +++ b/bitnami/spark/README.md @@ -49,6 +49,8 @@ The following tables lists the configurable parameters of the spark chart and th | `image.tag` | spark Image tag | `{TAG_NAME}` | | `image.pullPolicy` | spark image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override spark.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override spark.fullname template with a string | `nil` | | `master.debug` | Specify if debug values should be set on the master | `false` | | `master.webPort` | Specify the port where the web interface will listen on the master | `8080` | | `master.clusterPort` | Specify the port where the master listens to communicate with workers | `7077` | diff --git a/bitnami/spark/values-production.yaml b/bitnami/spark/values-production.yaml index ad5800ae6..32be598f5 100644 --- a/bitnami/spark/values-production.yaml +++ b/bitnami/spark/values-production.yaml @@ -24,6 +24,13 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override spark.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override spark.fullname template +## +# fullnameOverride: ## Spark Components configuration ## diff --git a/bitnami/spark/values.yaml b/bitnami/spark/values.yaml index 808c587b2..820c5ed2a 100644 --- a/bitnami/spark/values.yaml +++ b/bitnami/spark/values.yaml @@ -24,6 +24,13 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override spark.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override spark.fullname template +## +# fullnameOverride: ## Spark Components configuration ## diff --git a/bitnami/tensorflow-resnet/Chart.yaml b/bitnami/tensorflow-resnet/Chart.yaml index c4bf27446..363da574b 100755 --- a/bitnami/tensorflow-resnet/Chart.yaml +++ b/bitnami/tensorflow-resnet/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: tensorflow-resnet -version: 0.1.7 +version: 0.1.8 appVersion: 1.14.0 description: Open-source software library serving the ResNet machine learning model. keywords: diff --git a/bitnami/tensorflow-resnet/README.md b/bitnami/tensorflow-resnet/README.md index 3d33d461a..be5d97895 100755 --- a/bitnami/tensorflow-resnet/README.md +++ b/bitnami/tensorflow-resnet/README.md @@ -69,6 +69,8 @@ The following tables lists the configurable parameters of the TensorFlow ResNet | `server.image.tag` | TensorFlow Serving Image tag | `{TAG_NAME}` | | `server.image.pullPolicy` | TensorFlow Serving image pull policy | `IfNotPresent` | | `server.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override tensorflow-resnet.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override tensorflow-resnet.fullname template with a string | `nil` | | `replicaCount` | Desired number of pods | `1` | | `server.port` | Tensorflow server port | `8500` | | `client.image.registry` | TensorFlow ResNet image registry | `docker.io` | diff --git a/bitnami/tensorflow-resnet/templates/NOTES.txt b/bitnami/tensorflow-resnet/templates/NOTES.txt index be4367846..0d9dd1107 100755 --- a/bitnami/tensorflow-resnet/templates/NOTES.txt +++ b/bitnami/tensorflow-resnet/templates/NOTES.txt @@ -7,20 +7,20 @@ {{- if contains "NodePort" .Values.serviceType }} export APP_HOST=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - export APP_PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.spec.ports[0].nodePort}") + export APP_PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "tensorflow-resnet.fullname" . }} -o jsonpath="{.spec.ports[0].nodePort}") {{- else if contains "LoadBalancer" .Values.serviceType }} NOTE: It may take a few minutes for the LoadBalancer IP to be available. - Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}' + Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "tensorflow-resnet.fullname" . }}' - export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - export APP_PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.spec.ports[0].port}") + export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "tensorflow-resnet.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + export APP_PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "tensorflow-resnet.fullname" . }} -o jsonpath="{.spec.ports[0].port}") {{- else if contains "ClusterIP" .Values.serviceType }} export APP_HOST=127.0.0.1 - export APP_PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.spec.ports[0].port}") + export APP_PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "tensorflow-resnet.fullname" . }} -o jsonpath="{.spec.ports[0].port}") kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "tensorflow-resnet.fullname" . }} $APP_PORT:$APP_PORT & {{- end }} diff --git a/bitnami/tensorflow-resnet/templates/_helpers.tpl b/bitnami/tensorflow-resnet/templates/_helpers.tpl index 116ecfe30..09d043d19 100644 --- a/bitnami/tensorflow-resnet/templates/_helpers.tpl +++ b/bitnami/tensorflow-resnet/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "name" -}} +{{- define "tensorflow-resnet.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -10,10 +10,18 @@ Expand the name of the chart. Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} -{{- define "fullname" -}} +{{- define "tensorflow-resnet.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- end -}} +{{- end -}} {{/* Return the proper tensorflow-resnet server image name diff --git a/bitnami/tensorflow-resnet/templates/deployment.yaml b/bitnami/tensorflow-resnet/templates/deployment.yaml index 505769a1d..c50771dd5 100644 --- a/bitnami/tensorflow-resnet/templates/deployment.yaml +++ b/bitnami/tensorflow-resnet/templates/deployment.yaml @@ -1,22 +1,22 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ template "fullname" . }} + name: {{ template "tensorflow-resnet.fullname" . }} labels: - app: {{ template "name" . }} + app: {{ template "tensorflow-resnet.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" spec: selector: matchLabels: - app: {{ template "name" . }} + app: {{ template "tensorflow-resnet.name" . }} release: "{{ .Release.Name }}" replicas: {{ .Values.replicaCount }} template: metadata: labels: - app: {{ template "name" . }} + app: {{ template "tensorflow-resnet.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" {{- if or .Values.podAnnotations .Values.metrics.enabled }} diff --git a/bitnami/tensorflow-resnet/templates/svc.yaml b/bitnami/tensorflow-resnet/templates/svc.yaml index 1f0d4466a..e9b919d3c 100644 --- a/bitnami/tensorflow-resnet/templates/svc.yaml +++ b/bitnami/tensorflow-resnet/templates/svc.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "fullname" . }} + name: {{ template "tensorflow-resnet.fullname" . }} labels: - app: {{ template "name" . }} + app: {{ template "tensorflow-resnet.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -13,4 +13,4 @@ spec: - port: {{ .Values.server.port }} protocol: TCP selector: - app: {{ template "name" . }} + app: {{ template "tensorflow-resnet.name" . }} diff --git a/bitnami/tensorflow-resnet/values.yaml b/bitnami/tensorflow-resnet/values.yaml index 74a5e78dc..ed7df8656 100755 --- a/bitnami/tensorflow-resnet/values.yaml +++ b/bitnami/tensorflow-resnet/values.yaml @@ -50,6 +50,14 @@ client: # pullSecrets: # - myRegistryKeySecretName +## String to partially override tensorflow-resnet.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override tensorflow-resnet.fullname template +## +# fullnameOverride: + ## Kubernetes configuration ## For minikube, set this to NodePort, elsewhere use LoadBalancer ## diff --git a/bitnami/tomcat/Chart.yaml b/bitnami/tomcat/Chart.yaml index a8716e615..ead1c0ec2 100644 --- a/bitnami/tomcat/Chart.yaml +++ b/bitnami/tomcat/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: tomcat -version: 3.0.8 +version: 3.0.9 appVersion: 9.0.22 description: Chart for Apache Tomcat keywords: diff --git a/bitnami/tomcat/README.md b/bitnami/tomcat/README.md index 33643fdeb..16daeb197 100644 --- a/bitnami/tomcat/README.md +++ b/bitnami/tomcat/README.md @@ -54,6 +54,8 @@ The following tables lists the configurable parameters of the Tomcat chart and t | `image.tag` | Tomcat Image tag | `{TAG_NAME}` | | `image.pullPolicy` | Tomcat image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override tomcat.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override tomcat.fullname template with a string | `nil` | | `tomcatUsername` | Tomcat admin user | `user` | | `tomcatPassword` | Tomcat admin password | _random 10 character alphanumeric string_ | | `tomcatAllowRemoteManagement` | Enable remote access to management interface | `0` (disabled) | diff --git a/bitnami/tomcat/templates/NOTES.txt b/bitnami/tomcat/templates/NOTES.txt index 9cb46f661..212978cad 100644 --- a/bitnami/tomcat/templates/NOTES.txt +++ b/bitnami/tomcat/templates/NOTES.txt @@ -5,29 +5,29 @@ {{- if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "fullname" . }}) + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "tomcat.fullname" . }}) export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") echo http://$NODE_IP:$NODE_PORT/ {{- else if contains "LoadBalancer" .Values.service.type }} -** Please ensure an external IP is associated to the {{ template "fullname" . }} service before proceeding ** -** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }} ** +** Please ensure an external IP is associated to the {{ template "tomcat.fullname" . }} service before proceeding ** +** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "tomcat.fullname" . }} ** - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "tomcat.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") {{- $port:=.Values.service.port | toString }} echo URL : http://$SERVICE_IP{{- if ne $port "80" }}:{{ .Values.service.port }}{{ end }}/ echo Management URL : http://$SERVICE_IP{{- if ne $port "80" }}:{{ .Values.service.port }}{{ end }}/manager {{- else if contains "ClusterIP" .Values.service.type }} echo URL : http://127.0.0.1:8080/ echo Management URL : http://127.0.0.1:8080/manager - kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "fullname" . }} 8080:{{ .Values.service.port }} + kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "tomcat.fullname" . }} 8080:{{ .Values.service.port }} {{- end }} 2. Login with the following credentials echo Username: {{ .Values.tomcatUsername }} - echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.tomcat-password}" | base64 --decode) + echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "tomcat.fullname" . }} -o jsonpath="{.data.tomcat-password}" | base64 --decode) {{- if and (contains "bitnami/" .Values.image.repository) (not (.Values.image.tag | toString | regexFind "-r\\d+$|sha256:")) }} diff --git a/bitnami/tomcat/templates/_helpers.tpl b/bitnami/tomcat/templates/_helpers.tpl index 9db1b8424..c5b8e32f9 100644 --- a/bitnami/tomcat/templates/_helpers.tpl +++ b/bitnami/tomcat/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "name" -}} +{{- define "tomcat.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -10,10 +10,18 @@ Expand the name of the chart. Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} -{{- define "fullname" -}} +{{- define "tomcat.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- end -}} +{{- end -}} {{/* Return the proper Tomcat image name diff --git a/bitnami/tomcat/templates/deployment.yaml b/bitnami/tomcat/templates/deployment.yaml index 72641b365..3ca996fdb 100644 --- a/bitnami/tomcat/templates/deployment.yaml +++ b/bitnami/tomcat/templates/deployment.yaml @@ -1,21 +1,21 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ template "fullname" . }} + name: {{ template "tomcat.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "tomcat.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" spec: selector: matchLabels: - app: {{ template "fullname" . }} + app: {{ template "tomcat.name" . }} release: "{{ .Release.Name }}" template: metadata: labels: - app: {{ template "fullname" . }} + app: {{ template "tomcat.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" spec: @@ -26,7 +26,7 @@ spec: {{- end}} {{- include "tomcat.imagePullSecrets" . | indent 6 }} containers: - - name: {{ template "fullname" . }} + - name: tomcat image: "{{ template "tomcat.image" . }}" imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: @@ -35,7 +35,7 @@ spec: - name: TOMCAT_PASSWORD valueFrom: secretKeyRef: - name: {{ template "fullname" . }} + name: {{ template "tomcat.fullname" . }} key: tomcat-password - name: TOMCAT_ALLOW_REMOTE_MANAGEMENT value: {{ .Values.tomcatAllowRemoteManagement | quote }} @@ -65,7 +65,7 @@ spec: - name: tomcat-data {{- if .Values.persistence.enabled }} persistentVolumeClaim: - claimName: {{ template "fullname" . }} + claimName: {{ template "tomcat.fullname" . }} {{- else }} emptyDir: {} {{- end -}} diff --git a/bitnami/tomcat/templates/pvc.yaml b/bitnami/tomcat/templates/pvc.yaml index 14c4e2fc0..5ee4838e4 100644 --- a/bitnami/tomcat/templates/pvc.yaml +++ b/bitnami/tomcat/templates/pvc.yaml @@ -2,9 +2,9 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: {{ template "fullname" . }} + name: {{ template "tomcat.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "tomcat.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/bitnami/tomcat/templates/secrets.yaml b/bitnami/tomcat/templates/secrets.yaml index 2f70f550f..b97beafb9 100644 --- a/bitnami/tomcat/templates/secrets.yaml +++ b/bitnami/tomcat/templates/secrets.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "fullname" . }} + name: {{ template "tomcat.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "tomcat.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/bitnami/tomcat/templates/svc.yaml b/bitnami/tomcat/templates/svc.yaml index 8c7493ac6..bb867c0f3 100644 --- a/bitnami/tomcat/templates/svc.yaml +++ b/bitnami/tomcat/templates/svc.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "fullname" . }} + name: {{ template "tomcat.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "tomcat.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -23,4 +23,4 @@ spec: nodePort: {{ .Values.service.nodePorts.http }} {{- end }} selector: - app: {{ template "fullname" . }} + app: {{ template "tomcat.name" . }} diff --git a/bitnami/tomcat/values.yaml b/bitnami/tomcat/values.yaml index bb4637d7b..e562d41d5 100644 --- a/bitnami/tomcat/values.yaml +++ b/bitnami/tomcat/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override tomcat.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override tomcat.fullname template +## +# fullnameOverride: + ## Pod Security Context ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ ## diff --git a/bitnami/wildfly/Chart.yaml b/bitnami/wildfly/Chart.yaml index 32f241c28..e39410350 100644 --- a/bitnami/wildfly/Chart.yaml +++ b/bitnami/wildfly/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: wildfly -version: 2.2.8 +version: 2.2.9 appVersion: 17.0.1 description: Chart for Wildfly keywords: diff --git a/bitnami/wildfly/README.md b/bitnami/wildfly/README.md index e9c9919a0..05311a35e 100644 --- a/bitnami/wildfly/README.md +++ b/bitnami/wildfly/README.md @@ -54,6 +54,8 @@ The following tables lists the configurable parameters of the WildFly chart and | `image.tag` | WildFly Image tag | `{TAG_NAME}` | | `image.pullPolicy` | WildFly image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override wildfly.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override wildfly.fullname template with a string | `nil` | | `wildflyUsername` | WildFly admin user | `user` | | `wildflyPassword` | WildFly admin password | _random 10 character alphanumeric string_ | | `securityContext.enabled` | Enable security context | `true` | diff --git a/bitnami/wildfly/templates/NOTES.txt b/bitnami/wildfly/templates/NOTES.txt index d9293cbad..ce27fc898 100644 --- a/bitnami/wildfly/templates/NOTES.txt +++ b/bitnami/wildfly/templates/NOTES.txt @@ -5,29 +5,29 @@ {{- if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "fullname" . }}) + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "wildfly.fullname" . }}) export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") echo http://$NODE_IP:$NODE_PORT/ {{- else if contains "LoadBalancer" .Values.service.type }} -** Please ensure an external IP is associated to the {{ template "fullname" . }} service before proceeding ** -** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }} ** +** Please ensure an external IP is associated to the {{ template "wildfly.fullname" . }} service before proceeding ** +** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "wildfly.fullname" . }} ** - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "wildfly.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") {{- $port:=.Values.service.port | toString }} echo URL : http://$SERVICE_IP{{- if ne $port "80" }}:{{ .Values.service.port }}{{ end }}/ echo Management Url : http://$SERVICE_IP:{{ .Values.service.mgmtPort }}/ {{- else if contains "ClusterIP" .Values.service.type }} echo URL : http://127.0.0.1:8080/ echo Management URL : http://127.0.0.1:9990/ - kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "fullname" . }} 8080:{{ .Values.service.port}} 9990:{{ .Values.service.mgmtPort }} + kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "wildfly.fullname" . }} 8080:{{ .Values.service.port}} 9990:{{ .Values.service.mgmtPort }} {{- end }} 2. Login with the following credentials echo Username: {{ .Values.wildflyUsername }} - echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.wildfly-password}" | base64 --decode) + echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "wildfly.fullname" . }} -o jsonpath="{.data.wildfly-password}" | base64 --decode) {{- if and (contains "bitnami/" .Values.image.repository) (not (.Values.image.tag | toString | regexFind "-r\\d+$|sha256:")) }} diff --git a/bitnami/wildfly/templates/_helpers.tpl b/bitnami/wildfly/templates/_helpers.tpl index 7b1456e95..4b362f4c8 100644 --- a/bitnami/wildfly/templates/_helpers.tpl +++ b/bitnami/wildfly/templates/_helpers.tpl @@ -2,17 +2,25 @@ {{/* Expand the name of the chart. */}} -{{- define "name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 24 -}} +{{- define "wildfly.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* Create a default fully qualified app name. -We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} -{{- define "fullname" -}} +{{- define "wildfly.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} -{{- printf "%s-%s" .Release.Name $name | trunc 24 -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} {{- end -}} {{/* diff --git a/bitnami/wildfly/templates/deployment.yaml b/bitnami/wildfly/templates/deployment.yaml index 5827db4c8..1467ff060 100644 --- a/bitnami/wildfly/templates/deployment.yaml +++ b/bitnami/wildfly/templates/deployment.yaml @@ -1,21 +1,21 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ template "fullname" . }} + name: {{ template "wildfly.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "wildfly.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" spec: selector: matchLabels: - app: {{ template "fullname" . }} + app: {{ template "wildfly.name" . }} release: "{{ .Release.Name }}" template: metadata: labels: - app: {{ template "fullname" . }} + app: {{ template "wildfly.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" spec: @@ -26,7 +26,7 @@ spec: {{- end }} {{- include "wildfly.imagePullSecrets" . | indent 6 }} containers: - - name: {{ template "fullname" . }} + - name: wildlfy image: "{{ template "wildfly.image" . }}" imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: @@ -35,7 +35,7 @@ spec: - name: WILDFLY_PASSWORD valueFrom: secretKeyRef: - name: {{ template "fullname" . }} + name: {{ template "wildfly.fullname" . }} key: wildfly-password ports: - name: http @@ -65,7 +65,7 @@ spec: - name: wildfly-data {{- if .Values.persistence.enabled }} persistentVolumeClaim: - claimName: {{ template "fullname" . }} + claimName: {{ template "wildfly.fullname" . }} {{- else }} emptyDir: {} {{- end -}} diff --git a/bitnami/wildfly/templates/pvc.yaml b/bitnami/wildfly/templates/pvc.yaml index 14c4e2fc0..bee0105c8 100644 --- a/bitnami/wildfly/templates/pvc.yaml +++ b/bitnami/wildfly/templates/pvc.yaml @@ -2,9 +2,9 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: {{ template "fullname" . }} + name: {{ template "wildfly.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "wildfly.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/bitnami/wildfly/templates/secrets.yaml b/bitnami/wildfly/templates/secrets.yaml index 6d442c922..e59e8a5d1 100644 --- a/bitnami/wildfly/templates/secrets.yaml +++ b/bitnami/wildfly/templates/secrets.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "fullname" . }} + name: {{ template "wildfly.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "wildfly.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" diff --git a/bitnami/wildfly/templates/svc.yaml b/bitnami/wildfly/templates/svc.yaml index f6f24642e..eea1f7cbd 100644 --- a/bitnami/wildfly/templates/svc.yaml +++ b/bitnami/wildfly/templates/svc.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "fullname" . }} + name: {{ template "wildfly.fullname" . }} labels: - app: {{ template "fullname" . }} + app: {{ template "wildfly.name" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" @@ -29,4 +29,4 @@ spec: nodePort: {{ .Values.service.nodePorts.mgmt }} {{- end }} selector: - app: {{ template "fullname" . }} + app: {{ template "wildfly.name" . }} diff --git a/bitnami/wildfly/values.yaml b/bitnami/wildfly/values.yaml index d45454ddc..87787969f 100644 --- a/bitnami/wildfly/values.yaml +++ b/bitnami/wildfly/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override wildfly.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override wildfly.fullname template +## +# fullnameOverride: + ## Specify a imagePullPolicy ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images ## diff --git a/bitnami/zookeeper/Chart.yaml b/bitnami/zookeeper/Chart.yaml index 936afbec0..c60ef5e51 100644 --- a/bitnami/zookeeper/Chart.yaml +++ b/bitnami/zookeeper/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: zookeeper -version: 3.0.6 +version: 3.0.7 appVersion: 3.5.5 description: A centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services for distributed applications. keywords: diff --git a/bitnami/zookeeper/templates/_helpers.tpl b/bitnami/zookeeper/templates/_helpers.tpl index fac78d68c..2af6a4a34 100644 --- a/bitnami/zookeeper/templates/_helpers.tpl +++ b/bitnami/zookeeper/templates/_helpers.tpl @@ -3,7 +3,7 @@ Expand the name of the chart. */}} {{- define "zookeeper.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 24 -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* @@ -13,13 +13,13 @@ If release name contains chart name it will be used as a full name. */}} {{- define "zookeeper.fullname" -}} {{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 24 | trimSuffix "-" -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} {{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} {{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 24 | trimSuffix "-" -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} {{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 24 | trimSuffix "-" -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} {{- end -}} {{- end -}}