From aa2b138f8782c7f0f12cc484259e1f87642cabaa Mon Sep 17 00:00:00 2001 From: Marcos Bjoerkelund Date: Wed, 17 Jul 2019 13:34:09 +0200 Subject: [PATCH 01/17] Sync with official Harbor chart --- bitnami/harbor/README.md | 4 +- bitnami/harbor/templates/ingress/ingress.yaml | 81 ++++++++----------- .../harbor/templates/nginx/deployment.yaml | 4 +- bitnami/harbor/templates/nginx/service.yaml | 10 ++- bitnami/harbor/values-production.yaml | 13 ++- bitnami/harbor/values.yaml | 15 +++- 6 files changed, 72 insertions(+), 55 deletions(-) diff --git a/bitnami/harbor/README.md b/bitnami/harbor/README.md index f4ecae425..a995ceb31 100644 --- a/bitnami/harbor/README.md +++ b/bitnami/harbor/README.md @@ -109,7 +109,7 @@ The following table lists the configurable parameters of the Harbor chart and th | **Expose** | | `service.type` | The way how to expose the service: `Ingress`, `ClusterIP`, `NodePort` or `LoadBalancer` | `ingress` | | `service.tls.enabled` | Enable the tls or not | `true` | -| `service.ingress.controller` | The ingress controller type. Currently supports `default` and `gce` | `default` | +| `service.ingress.controller` | The ingress controller type. Currently supports `default`, `gce` and `ncp` | `default` | | `service.tls.secretName` | Fill the name of secret if you want to use your own TLS certificate and private key. The secret must contain two keys named `tls.crt` and `tls.key` that contain the certificate and private key to use for TLS. Will be generated automatically if not set | `nil` | | `service.tls.notarySecretName` | By default, the Notary service will use the same cert and key as described above. Fill the name of secret if you want to use a separated one. Only needed when the `service.type` is `ingress`. | `nil` | | `service.tls.commonName` | The common name used to generate the certificate, it's necessary when the `service.type` is `ClusterIP` or `NodePort` and `service.tls.secretName` is null | `nil` | @@ -131,6 +131,8 @@ The following table lists the configurable parameters of the Harbor chart and th | `service.loadBalancer.ports.httpPort` | The service port Harbor listens on when serving with HTTP | `80` | | `service.loadBalancer.ports.httpsPort` | The service port Harbor listens on when serving with HTTP | `30002` | | `service.loadBalancer.ports.notaryPort` | The service port Notary listens on. Only needed when `notary.enabled` is set to `true` | `nil` | +| `service.loadBalancer.annotations` | The annotations attached to the loadBalancer service | {} | +| `service.loadBalancer.sourceRanges` | List of IP address ranges to assign to loadBalancerSourceRanges | [] | | **Persistence** | | `persistence.enabled` | Enable the data persistence or not | `true` | | `persistence.resourcePolicy` | Setting it to `keep` to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted | `keep` | diff --git a/bitnami/harbor/templates/ingress/ingress.yaml b/bitnami/harbor/templates/ingress/ingress.yaml index 0117083f9..6337e3b84 100644 --- a/bitnami/harbor/templates/ingress/ingress.yaml +++ b/bitnami/harbor/templates/ingress/ingress.yaml @@ -1,6 +1,28 @@ {{- if eq .Values.service.type "Ingress" }} {{- $ingress := .Values.service.ingress -}} {{- $tls := .Values.service.tls -}} +{{- if eq .Values.expose.ingress.controller "gce" }} + {{- $_ := set . "portal_path" "/*" -}} + {{- $_ := set . "api_path" "/api/*" -}} + {{- $_ := set . "service_path" "/service/*" -}} + {{- $_ := set . "v2_path" "/v2/*" -}} + {{- $_ := set . "chartrepo_path" "/chartrepo/*" -}} + {{- $_ := set . "controller_path" "/c/*" -}} +{{- else if eq .Values.expose.ingress.controller "ncp" }} + {{- $_ := set . "portal_path" "/" -}} + {{- $_ := set . "api_path" "/api/.*" -}} + {{- $_ := set . "service_path" "/service/.*" -}} + {{- $_ := set . "v2_path" "/v2/.*" -}} + {{- $_ := set . "chartrepo_path" "/chartrepo/.*" -}} + {{- $_ := set . "controller_path" "/c/.*" -}} +{{- else }} + {{- $_ := set . "portal_path" "/" -}} + {{- $_ := set . "api_path" "/api/" -}} + {{- $_ := set . "service_path" "/service/" -}} + {{- $_ := set . "v2_path" "/v2/" -}} + {{- $_ := set . "chartrepo_path" "/chartrepo/" -}} + {{- $_ := set . "controller_path" "/c/" -}} +{{- end }} apiVersion: extensions/v1beta1 kind: Ingress metadata: @@ -34,73 +56,35 @@ spec: {{- end }} {{- end }} {{- end }} -{{- if eq .Values.service.ingress.controller "gce" }} - rules: - - http: - paths: - - path: /* - backend: - serviceName: "{{ template "harbor.portal" . }}" - servicePort: http - - path: /api/* - backend: - serviceName: "{{ template "harbor.core" . }}" - servicePort: http - - path: /service/* - backend: - serviceName: "{{ template "harbor.core" . }}" - servicePort: http - - path: /v2/* - backend: - serviceName: "{{ template "harbor.core" . }}" - servicePort: http - - path: /chartrepo/* - backend: - serviceName: "{{ template "harbor.core" . }}" - servicePort: http - - path: /c/* - backend: - serviceName: "{{ template "harbor.core" . }}" - servicePort: http - {{- if $ingress.hosts.core }} - host: {{ $ingress.hosts.core }} - {{- end }} - {{- if .Values.notary.enabled }} - - http: - paths: - - path: / - backend: - serviceName: "{{ template "harbor.notary-server" . }}" - servicePort: notary-server - {{- if $ingress.hosts.notary }} - host: {{ $ingress.hosts.notary }} - {{- end }} + {{- if eq .Values.expose.ingress.controller "ncp" }} + backend: + serviceName: "{{ template "harbor.portal" . }}" + servicePort: http {{- end }} -{{- else }} rules: - http: paths: - - path: / + - path: {{ .portal_path }} backend: serviceName: "{{ template "harbor.portal" . }}" servicePort: http - - path: /api/ + - path: {{ .api_path }} backend: serviceName: "{{ template "harbor.core" . }}" servicePort: http - - path: /service/ + - path: {{ .service_path }} backend: serviceName: "{{ template "harbor.core" . }}" servicePort: http - - path: /v2/ + - path: {{ .v2_path }} backend: serviceName: "{{ template "harbor.core" . }}" servicePort: http - - path: /chartrepo/ + - path: {{ .chartrepo_path }} backend: serviceName: "{{ template "harbor.core" . }}" servicePort: http - - path: /c/ + - path: {{ .controller_path }} backend: serviceName: "{{ template "harbor.core" . }}" servicePort: http @@ -119,4 +103,3 @@ spec: {{- end }} {{- end }} {{- end }} -{{- end }} \ No newline at end of file diff --git a/bitnami/harbor/templates/nginx/deployment.yaml b/bitnami/harbor/templates/nginx/deployment.yaml index e9dcd9cd1..24a63d6e6 100644 --- a/bitnami/harbor/templates/nginx/deployment.yaml +++ b/bitnami/harbor/templates/nginx/deployment.yaml @@ -7,7 +7,7 @@ metadata: {{- include "harbor.labels" . | nindent 4 }} app.kubernetes.io/component: nginx spec: - replicas: 1 + replicas: {{ .Values.nginx.replicas }} selector: matchLabels: {{ include "harbor.matchLabels" . | nindent 6 }} app.kubernetes.io/component: nginx @@ -109,4 +109,4 @@ spec: {{- with .Values.nginx.tolerations }} tolerations: {{ tpl (toYaml .) $ | nindent 8 }} {{- end }} - {{- end }} \ No newline at end of file + {{- end }} diff --git a/bitnami/harbor/templates/nginx/service.yaml b/bitnami/harbor/templates/nginx/service.yaml index 5708d6547..a5a7605fa 100644 --- a/bitnami/harbor/templates/nginx/service.yaml +++ b/bitnami/harbor/templates/nginx/service.yaml @@ -55,8 +55,16 @@ spec: {{- $loadBalancer := .Values.service.loadBalancer }} name: {{ $loadBalancer.name }} labels: {{ include "harbor.labels" . | nindent 4 }} + {{- with $loadBalancer.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} spec: type: LoadBalancer + {{- with $loadBalancer.sourceRanges }} + loadBalancerSourceRanges: + {{- toYaml . | nindent 4 }} + {{- end }} ports: - name: http port: {{ $loadBalancer.ports.httpPort }} @@ -75,4 +83,4 @@ spec: selector: {{- include "harbor.matchLabels" . | nindent 4 }} app.kubernetes.io/component: nginx -{{- end }} \ No newline at end of file +{{- end }} diff --git a/bitnami/harbor/values-production.yaml b/bitnami/harbor/values-production.yaml index 1d532a76b..9f6cd2c8e 100644 --- a/bitnami/harbor/values-production.yaml +++ b/bitnami/harbor/values-production.yaml @@ -253,7 +253,7 @@ service: # described above. Fill the name of secret if you want to use a # separated one. Only needed when the type is "ingress". notarySecretName: "" - # The commmon name used to generate the certificate, it's necessary + # The common name used to generate the certificate, it's necessary # when the type isn't "ingress" and "secretName" is null commonName: "" ingress: @@ -263,6 +263,7 @@ service: # set to the type of ingress controller if it has specific requirements. # leave as `default` for most ingress controllers. # set to `gce` if using the GCE ingress controller + # set to `ncp` if using the NCP (NSX-T Container Plugin) ingress controller controller: default annotations: ingress.kubernetes.io/ssl-redirect: "true" @@ -280,6 +281,8 @@ service: # The service port Notary listens on. Only needed when notary.enabled # is set to true notaryPort: 4443 + annotations: {} + sourceRanges: [] nodePort: # The name of NodePort service name: harbor @@ -327,6 +330,14 @@ service: # If Harbor is deployed behind the proxy, set it as the URL of proxy externalURL: https://core.harbor.domain +## UAA Authentication Options +# If you're using UAA for authentication behind a self-signed +# certificate you will need to provide the CA Cert. +# Set uaaSecretName below to provide a pre-created secret that +# contains a base64 encoded CA Certificate named `ca.crt`. +# uaaSecretName: + + ## Kubernetes Security Context ## https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ ## diff --git a/bitnami/harbor/values.yaml b/bitnami/harbor/values.yaml index a1a0fbbbf..3d6ef81b5 100644 --- a/bitnami/harbor/values.yaml +++ b/bitnami/harbor/values.yaml @@ -253,7 +253,7 @@ service: # described above. Fill the name of secret if you want to use a # separated one. Only needed when the type is "ingress". notarySecretName: "" - # The commmon name used to generate the certificate, it's necessary + # The common name used to generate the certificate, it's necessary # when the type isn't "ingress" and "secretName" is null commonName: "" ingress: @@ -263,6 +263,7 @@ service: # set to the type of ingress controller if it has specific requirements. # leave as `default` for most ingress controllers. # set to `gce` if using the GCE ingress controller + # set to `ncp` if using the NCP (NSX-T Container Plugin) ingress controller controller: default annotations: ingress.kubernetes.io/ssl-redirect: "true" @@ -280,6 +281,8 @@ service: # The service port Notary listens on. Only needed when notary.enabled # is set to true notaryPort: 4443 + annotations: {} + sourceRanges: [] nodePort: # The name of NodePort service name: harbor @@ -311,6 +314,8 @@ service: # The service port Notary listens on. Only needed when notary.enabled # is set to true notaryPort: 4443 + annotations: {} + sourceRanges: [] # The external URL for Harbor core service. It is used to # 1) populate the docker/helm commands showed on portal @@ -327,6 +332,14 @@ service: # If Harbor is deployed behind the proxy, set it as the URL of proxy externalURL: https://core.harbor.domain +## UAA Authentication Options +# If you're using UAA for authentication behind a self-signed +# certificate you will need to provide the CA Cert. +# Set uaaSecretName below to provide a pre-created secret that +# contains a base64 encoded CA Certificate named `ca.crt`. +# uaaSecretName: + + ## Kubernetes Security Context ## https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ ## From cb62b2fddb19c1dce52bf987a058fcaa8a33ed3e Mon Sep 17 00:00:00 2001 From: Marcos Bjoerkelund Date: Wed, 17 Jul 2019 13:36:51 +0200 Subject: [PATCH 02/17] update chart version --- bitnami/harbor/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/harbor/Chart.yaml b/bitnami/harbor/Chart.yaml index 6bdb68c00..de4bc40fb 100644 --- a/bitnami/harbor/Chart.yaml +++ b/bitnami/harbor/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: harbor -version: 0.0.7 +version: 0.0.8 appVersion: 1.8.1 description: Harbor is an an open source trusted cloud native registry project that stores, signs, and scans content keywords: From 2c3fbbdaa0afa7ea67ee4ae339e4c159d6e6b102 Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Wed, 17 Jul 2019 15:35:06 +0000 Subject: [PATCH 03/17] Synchronize upstreamed folder to e206fe9c8 --- upstreamed/opencart/Chart.yaml | 2 +- upstreamed/opencart/README.md | 2 - upstreamed/opencart/templates/_helpers.tpl | 8 --- upstreamed/opencart/values.yaml | 8 --- upstreamed/phpbb/Chart.yaml | 2 +- upstreamed/phpbb/README.md | 68 +++++++++++----------- upstreamed/phpbb/templates/_helpers.tpl | 8 --- upstreamed/phpbb/values.yaml | 8 --- upstreamed/redis/Chart.yaml | 2 +- upstreamed/redis/README.md | 2 - upstreamed/redis/values-production.yaml | 8 --- upstreamed/redis/values.yaml | 8 --- upstreamed/redmine/Chart.yaml | 2 +- upstreamed/redmine/README.md | 4 +- upstreamed/redmine/templates/_helpers.tpl | 8 --- upstreamed/redmine/values.yaml | 8 --- upstreamed/testlink/Chart.yaml | 2 +- upstreamed/testlink/README.md | 2 - upstreamed/testlink/templates/_helpers.tpl | 8 --- upstreamed/testlink/values.yaml | 7 --- 20 files changed, 39 insertions(+), 128 deletions(-) diff --git a/upstreamed/opencart/Chart.yaml b/upstreamed/opencart/Chart.yaml index a03657587..c47d222d3 100644 --- a/upstreamed/opencart/Chart.yaml +++ b/upstreamed/opencart/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: opencart -version: 4.5.4 +version: 4.5.5 appVersion: 3.0.3-2 description: A free and open source e-commerce platform for online merchants. It provides a professional and reliable foundation for a successful online store. keywords: diff --git a/upstreamed/opencart/README.md b/upstreamed/opencart/README.md index 28ed772d3..762977dce 100644 --- a/upstreamed/opencart/README.md +++ b/upstreamed/opencart/README.md @@ -56,8 +56,6 @@ The following table lists the configurable parameters of the OpenCart chart and | `image.tag` | OpenCart 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 opencart.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override opencart.fullname template with a string | `nil` | | `opencartHost` | OpenCart host to create application URLs | `nil` | | `service.type` | Kubernetes Service type | `LoadBalancer` | | `service.port` | Service HTTP port | `80` | diff --git a/upstreamed/opencart/templates/_helpers.tpl b/upstreamed/opencart/templates/_helpers.tpl index b52bffbce..cccd57823 100644 --- a/upstreamed/opencart/templates/_helpers.tpl +++ b/upstreamed/opencart/templates/_helpers.tpl @@ -11,17 +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 "opencart.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/upstreamed/opencart/values.yaml b/upstreamed/opencart/values.yaml index 9daf9ccae..68c5e7d9e 100644 --- a/upstreamed/opencart/values.yaml +++ b/upstreamed/opencart/values.yaml @@ -26,14 +26,6 @@ image: # pullSecrets: # - myRegistryKeySecretName -## String to partially override opencart.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override opencart.fullname template -## -# fullnameOverride: - ## OpenCart host to create application URLs ## ref: https://github.com/bitnami/bitnami-docker-opencart#configuration ## diff --git a/upstreamed/phpbb/Chart.yaml b/upstreamed/phpbb/Chart.yaml index 41b0804c1..a27af921f 100644 --- a/upstreamed/phpbb/Chart.yaml +++ b/upstreamed/phpbb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: phpbb -version: 4.4.4 +version: 4.4.5 appVersion: 3.2.7 description: Community forum that supports the notion of users and groups, file attachments, full-text search, notifications and more. keywords: diff --git a/upstreamed/phpbb/README.md b/upstreamed/phpbb/README.md index a6b5c6f83..2094895a4 100644 --- a/upstreamed/phpbb/README.md +++ b/upstreamed/phpbb/README.md @@ -55,9 +55,7 @@ The following table lists the configurable parameters of the phpBB chart and the | `image.repository` | phpBB image name | `bitnami/phpbb` | | `image.tag` | phpBB 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 phpbb.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override phpbb.fullname template with a string | `nil` | +| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | | `phpbbUser` | User of the application | `user` | | `phpbbPassword` | Application password | _random 10 character long alphanumeric string_ | | `phpbbEmail` | Admin email | `user@example.com` | @@ -70,44 +68,44 @@ The following table lists the configurable parameters of the phpBB chart and the | `externalDatabase.user` | Existing username in the external db | `bn_phpbb` | | `externalDatabase.password` | Password for the above username | `nil` | | `externalDatabase.database` | Name of the existing database | `bitnami_phpbb` | -| `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 phpbb installation | `phpbb.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) | `phpbb.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` | +| `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 phpbb installation | `phpbb.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) | `phpbb.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` | | `mariadb.enabled` | Use or not the MariaDB chart | `true` | -| `mariadb.rootUser.password` | MariaDB admin password | `nil` | -| `mariadb.db.name` | Database name to create | `bitnami_phpbb` | -| `mariadb.db.user` | Database user to create | `bn_phpbb` | -| `mariadb.db.password` | Password for the database | _random 10 character long alphanumeric string_ | -| `service.type` | Kubernetes Service type | `LoadBalancer` | -| `service.port` | Service HTTP port (Dashboard) | `80` | -| `nodePorts.http` | Kubernetes http node port | `""` | -| `nodePorts.https` | Kubernetes https node port | `""` | -| `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` | -| `service.nodePorts.http` | Kubernetes http node port | `""` | -| `service.nodePorts.https` | Kubernetes https node port | `""` | -| `service.loadBalancerIP` | LoadBalancer service IP | `""` | +| `mariadb.rootUser.password` | MariaDB admin password | `nil` | +| `mariadb.db.name` | Database name to create | `bitnami_phpbb` | +| `mariadb.db.user` | Database user to create | `bn_phpbb` | +| `mariadb.db.password` | Password for the database | _random 10 character long alphanumeric string_ | +| `service.type` | Kubernetes Service type | `LoadBalancer` | +| `service.port` | Service HTTP port (Dashboard) | `80` | +| `nodePorts.http` | Kubernetes http node port | `""` | +| `nodePorts.https` | Kubernetes https node port | `""` | +| `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` | +| `service.nodePorts.http` | Kubernetes http node port | `""` | +| `service.nodePorts.https` | Kubernetes https node port | `""` | +| `service.loadBalancerIP` | LoadBalancer service IP | `""` | | `persistence.enabled` | Enable persistence using PVC | `true` | | `persistence.phpbb.storageClass` | PVC Storage Class for phpBB volume | `nil` (uses alpha storage class annotation) | | `persistence.phpbb.accessMode` | PVC Access Mode for phpBB volume | `ReadWriteOnce` | | `persistence.phpbb.size` | PVC Storage Request for phpBB volume | `8Gi` | | `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | -| `podAnnotations` | Pod annotations | `{}` | -| `metrics.enabled` | Start a side-car prometheus exporter | `false` | -| `metrics.image.registry` | Apache exporter image registry | `docker.io` | -| `metrics.image.repository` | Apache exporter image name | `lusotycoon/apache-exporter` | -| `metrics.image.tag` | Apache exporter image tag | `v0.5.0` | -| `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: "9117"}`| -| `metrics.resources` | Exporter resource requests/limit | {} | +| `podAnnotations` | Pod annotations | `{}` | +| `metrics.enabled` | Start a side-car prometheus exporter | `false` | +| `metrics.image.registry` | Apache exporter image registry | `docker.io` | +| `metrics.image.repository` | Apache exporter image name | `lusotycoon/apache-exporter` | +| `metrics.image.tag` | Apache exporter image tag | `v0.5.0` | +| `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: "9117"}` | +| `metrics.resources` | Exporter resource requests/limit | {} | The above parameters map to the env variables defined in [bitnami/phpbb](http://github.com/bitnami/bitnami-docker-phpbb). For more information please refer to the [bitnami/phpbb](http://github.com/bitnami/bitnami-docker-phpbb) image documentation. diff --git a/upstreamed/phpbb/templates/_helpers.tpl b/upstreamed/phpbb/templates/_helpers.tpl index b4aedddc8..fa1476b58 100644 --- a/upstreamed/phpbb/templates/_helpers.tpl +++ b/upstreamed/phpbb/templates/_helpers.tpl @@ -11,17 +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 "phpbb.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/upstreamed/phpbb/values.yaml b/upstreamed/phpbb/values.yaml index 195b15c65..10d48afb0 100644 --- a/upstreamed/phpbb/values.yaml +++ b/upstreamed/phpbb/values.yaml @@ -26,14 +26,6 @@ image: # pullSecrets: # - myRegistryKeySecretName -## String to partially override phpbb.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override phpbb.fullname template -## -# fullnameOverride: - ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-phpbb#environment-variables ## diff --git a/upstreamed/redis/Chart.yaml b/upstreamed/redis/Chart.yaml index 47df8c046..8722703d3 100644 --- a/upstreamed/redis/Chart.yaml +++ b/upstreamed/redis/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: redis -version: 8.1.3 +version: 8.1.4 appVersion: 5.0.5 description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets. keywords: diff --git a/upstreamed/redis/README.md b/upstreamed/redis/README.md index 70003b29f..122c9d044 100644 --- a/upstreamed/redis/README.md +++ b/upstreamed/redis/README.md @@ -130,8 +130,6 @@ The following table lists the configurable parameters of the Redis chart and the | `image.tag` | Redis Image tag | `{TAG_NAME}` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `nil` | -| `nameOverride` | String to partially override redis.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override redis.fullname template with a string | `nil` | | `cluster.enabled` | Use master-slave topology | `true` | | `cluster.slaveCount` | Number of slaves | `1` | | `existingSecret` | Name of existing secret object (for password authentication) | `nil` | diff --git a/upstreamed/redis/values-production.yaml b/upstreamed/redis/values-production.yaml index 59c032b5e..0caba7801 100644 --- a/upstreamed/redis/values-production.yaml +++ b/upstreamed/redis/values-production.yaml @@ -29,14 +29,6 @@ image: # pullSecrets: # - myRegistryKeySecretName -## String to partially override redis.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override redis.fullname template -## -# fullnameOverride: - ## Cluster settings cluster: enabled: true diff --git a/upstreamed/redis/values.yaml b/upstreamed/redis/values.yaml index 9a3e335a9..80b15ab7d 100644 --- a/upstreamed/redis/values.yaml +++ b/upstreamed/redis/values.yaml @@ -29,14 +29,6 @@ image: # pullSecrets: # - myRegistryKeySecretName -## String to partially override redis.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override redis.fullname template -## -# fullnameOverride: - ## Cluster settings cluster: enabled: true diff --git a/upstreamed/redmine/Chart.yaml b/upstreamed/redmine/Chart.yaml index ff9eac1c1..e14320bd7 100644 --- a/upstreamed/redmine/Chart.yaml +++ b/upstreamed/redmine/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: redmine -version: 10.0.8 +version: 10.0.9 appVersion: 4.0.4 description: A flexible project management web application. keywords: diff --git a/upstreamed/redmine/README.md b/upstreamed/redmine/README.md index 37974a5de..6dc30ee07 100644 --- a/upstreamed/redmine/README.md +++ b/upstreamed/redmine/README.md @@ -63,9 +63,7 @@ The following table lists the configurable parameters of the Redmine chart and t | `image.repository` | Redmine image name | `bitnami/redmine` | | `image.tag` | Redmine 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 redmine.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override redmine.fullname template with a string | `nil` | +| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | | `redmineUsername` | User of the application | `user` | | `redminePassword` | Application password | _random 10 character long alphanumeric string_ | | `redmineEmail` | Admin email | `user@example.com` | diff --git a/upstreamed/redmine/templates/_helpers.tpl b/upstreamed/redmine/templates/_helpers.tpl index eea79fc45..e3c2048dc 100644 --- a/upstreamed/redmine/templates/_helpers.tpl +++ b/upstreamed/redmine/templates/_helpers.tpl @@ -11,17 +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 "redmine.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/upstreamed/redmine/values.yaml b/upstreamed/redmine/values.yaml index 304d4928c..ef1afaf6e 100644 --- a/upstreamed/redmine/values.yaml +++ b/upstreamed/redmine/values.yaml @@ -26,14 +26,6 @@ image: # pullSecrets: # - myRegistryKeySecretName -## String to partially override redmine.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override redmine.fullname template -## -# fullnameOverride: - ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-redmine/#environment-variables ## diff --git a/upstreamed/testlink/Chart.yaml b/upstreamed/testlink/Chart.yaml index 24c79a48c..e22e0cf42 100644 --- a/upstreamed/testlink/Chart.yaml +++ b/upstreamed/testlink/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: testlink -version: 4.4.4 +version: 4.4.5 appVersion: 1.9.19 description: Web-based test management system that facilitates software quality assurance. icon: https://bitnami.com/assets/stacks/testlink/img/testlink-stack-220x234.png diff --git a/upstreamed/testlink/README.md b/upstreamed/testlink/README.md index 88fbeb204..2fa513cda 100644 --- a/upstreamed/testlink/README.md +++ b/upstreamed/testlink/README.md @@ -56,8 +56,6 @@ The following table lists the configurable parameters of the TestLink chart and | `image.tag` | TestLink 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 testlink.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override testlink.fullname template with a string | `nil` | | `testlinkUsername` | Admin username | `user` | | `testlinkPassword` | Admin user password | _random 10 character long alphanumeric string_ | | `testlinkEmail` | Admin user email | `user@example.com` | diff --git a/upstreamed/testlink/templates/_helpers.tpl b/upstreamed/testlink/templates/_helpers.tpl index 7a9833b10..d2ebf7345 100644 --- a/upstreamed/testlink/templates/_helpers.tpl +++ b/upstreamed/testlink/templates/_helpers.tpl @@ -11,17 +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 "testlink.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/upstreamed/testlink/values.yaml b/upstreamed/testlink/values.yaml index 74b910683..e4158bdd4 100644 --- a/upstreamed/testlink/values.yaml +++ b/upstreamed/testlink/values.yaml @@ -26,13 +26,6 @@ image: # pullSecrets: # - myRegistryKeySecretName -## String to partially override testlink.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override testlink.fullname template -## -# fullnameOverride: ## List of nodeSelectors to limit where testlink can run ## i.e From 2226db4d9a31aa3ce94a44efd44ad9074905b500 Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Wed, 17 Jul 2019 16:35:00 +0000 Subject: [PATCH 04/17] Synchronize upstreamed folder to 57286b258 --- upstreamed/dokuwiki/Chart.yaml | 2 +- upstreamed/dokuwiki/README.md | 2 - upstreamed/dokuwiki/templates/_helpers.tpl | 8 -- upstreamed/dokuwiki/values.yaml | 8 -- upstreamed/mongodb/Chart.yaml | 2 +- upstreamed/mongodb/README.md | 2 - upstreamed/mongodb/values-production.yaml | 8 -- upstreamed/mongodb/values.yaml | 8 -- upstreamed/orangehrm/Chart.yaml | 2 +- upstreamed/orangehrm/README.md | 2 - upstreamed/orangehrm/templates/_helpers.tpl | 8 -- upstreamed/orangehrm/values.yaml | 8 -- upstreamed/parse/Chart.yaml | 2 +- upstreamed/parse/README.md | 34 +++--- upstreamed/parse/templates/_helpers.tpl | 18 +-- upstreamed/parse/values.yaml | 8 -- upstreamed/phabricator/Chart.yaml | 2 +- upstreamed/phabricator/README.md | 112 +++++++++--------- upstreamed/phabricator/templates/_helpers.tpl | 8 -- upstreamed/phabricator/values.yaml | 8 -- 20 files changed, 77 insertions(+), 175 deletions(-) diff --git a/upstreamed/dokuwiki/Chart.yaml b/upstreamed/dokuwiki/Chart.yaml index 4c1cdf697..acee32306 100644 --- a/upstreamed/dokuwiki/Chart.yaml +++ b/upstreamed/dokuwiki/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: dokuwiki -version: 4.3.3 +version: 4.3.4 appVersion: 0.20180422.201901061035 description: DokuWiki is a standards-compliant, simple to use wiki optimized for creating documentation. It is targeted at developer teams, workgroups, and small companies. diff --git a/upstreamed/dokuwiki/README.md b/upstreamed/dokuwiki/README.md index e9c1f100a..f33aad844 100644 --- a/upstreamed/dokuwiki/README.md +++ b/upstreamed/dokuwiki/README.md @@ -54,8 +54,6 @@ The following table lists the configurable parameters of the DokuWiki chart and | `image.tag` | DokuWiki image tag | `{TAG_NAME}` | | `image.pullPolicy` | Image pull policy | `Always` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | -| `nameOverride` | String to partially override dokuwiki.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override dokuwiki.fullname template with a string | `nil` | | `dokuwikiUsername` | User of the application | `user` | | `dokuwikiFullName` | User's full name | `User Name` | | `dokuwikiPassword` | Application password | _random 10 character alphanumeric string_ | diff --git a/upstreamed/dokuwiki/templates/_helpers.tpl b/upstreamed/dokuwiki/templates/_helpers.tpl index 3b7eab4db..836064c9a 100644 --- a/upstreamed/dokuwiki/templates/_helpers.tpl +++ b/upstreamed/dokuwiki/templates/_helpers.tpl @@ -11,17 +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 "dokuwiki.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/upstreamed/dokuwiki/values.yaml b/upstreamed/dokuwiki/values.yaml index 0a23a421d..d12c60090 100644 --- a/upstreamed/dokuwiki/values.yaml +++ b/upstreamed/dokuwiki/values.yaml @@ -26,14 +26,6 @@ image: # pullSecrets: # - myRegistryKeySecretName -## String to partially override dokuwiki.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override dokuwiki.fullname template -## -# fullnameOverride: - ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables ## diff --git a/upstreamed/mongodb/Chart.yaml b/upstreamed/mongodb/Chart.yaml index 05d39a0c9..a42085138 100644 --- a/upstreamed/mongodb/Chart.yaml +++ b/upstreamed/mongodb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mongodb -version: 6.1.3 +version: 6.1.4 appVersion: 4.0.10 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications. keywords: diff --git a/upstreamed/mongodb/README.md b/upstreamed/mongodb/README.md index 61cedbd66..46332c348 100644 --- a/upstreamed/mongodb/README.md +++ b/upstreamed/mongodb/README.md @@ -55,8 +55,6 @@ The following table lists the configurable parameters of the MongoDB chart and t | `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 mongodb.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override mongodb.fullname template with a string | `nil` | | `clusterDomain` | Default Kubernetes cluster domain | `cluster.local` | | `usePassword` | Enable password authentication | `true` | | `existingSecret` | Existing secret with MongoDB credentials | `nil` | diff --git a/upstreamed/mongodb/values-production.yaml b/upstreamed/mongodb/values-production.yaml index 26bb1fb3b..0a70ce225 100644 --- a/upstreamed/mongodb/values-production.yaml +++ b/upstreamed/mongodb/values-production.yaml @@ -34,14 +34,6 @@ image: ## ref: https://github.com/bitnami/minideb-extras-base debug: false -## String to partially override mongodb.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override mongodb.fullname template -## -# fullnameOverride: - ## Enable authentication ## ref: https://docs.mongodb.com/manual/tutorial/enable-authentication/ # diff --git a/upstreamed/mongodb/values.yaml b/upstreamed/mongodb/values.yaml index e30e1c65d..cc8ab2f55 100644 --- a/upstreamed/mongodb/values.yaml +++ b/upstreamed/mongodb/values.yaml @@ -34,14 +34,6 @@ image: ## ref: https://github.com/bitnami/minideb-extras-base debug: false -## String to partially override mongodb.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override mongodb.fullname template -## -# fullnameOverride: - ## Enable authentication ## ref: https://docs.mongodb.com/manual/tutorial/enable-authentication/ # diff --git a/upstreamed/orangehrm/Chart.yaml b/upstreamed/orangehrm/Chart.yaml index e4db4c34c..55a86ede1 100644 --- a/upstreamed/orangehrm/Chart.yaml +++ b/upstreamed/orangehrm/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: orangehrm -version: 4.4.5 +version: 4.4.6 appVersion: 4.3.2-0 description: OrangeHRM is a free HR management system that offers a wealth of modules to suit the needs of your business. diff --git a/upstreamed/orangehrm/README.md b/upstreamed/orangehrm/README.md index a96d9c697..b1c9d5d49 100644 --- a/upstreamed/orangehrm/README.md +++ b/upstreamed/orangehrm/README.md @@ -56,8 +56,6 @@ The following table lists the configurable parameters of the OrangeHRM chart and | `image.tag` | OrangeHRM 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 orangehrm.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override orangehrm.fullname template with a string | `nil` | | `orangehrmUsername` | User of the application | `user` | | `orangehrmPassword` | Application password | _random 10 character long alphanumeric string_ | | `smtpHost` | SMTP host | `nil` | diff --git a/upstreamed/orangehrm/templates/_helpers.tpl b/upstreamed/orangehrm/templates/_helpers.tpl index 16ac1dccc..53374ec7f 100644 --- a/upstreamed/orangehrm/templates/_helpers.tpl +++ b/upstreamed/orangehrm/templates/_helpers.tpl @@ -11,17 +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 "orangehrm.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/upstreamed/orangehrm/values.yaml b/upstreamed/orangehrm/values.yaml index eb3f0d511..394ab2007 100644 --- a/upstreamed/orangehrm/values.yaml +++ b/upstreamed/orangehrm/values.yaml @@ -26,14 +26,6 @@ image: # pullSecrets: # - myRegistryKeySecretName -## String to partially override orangehrm.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override orangehrm.fullname template -## -# fullnameOverride: - ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-orangehrm#configuration ## diff --git a/upstreamed/parse/Chart.yaml b/upstreamed/parse/Chart.yaml index 3a79a99f7..bd2b21774 100644 --- a/upstreamed/parse/Chart.yaml +++ b/upstreamed/parse/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: parse -version: 6.2.15 +version: 6.2.16 appVersion: 3.6.0 description: Parse is a platform that enables users to add a scalable and powerful backend to launch a full-featured app for iOS, Android, JavaScript, Windows, Unity, and more. keywords: diff --git a/upstreamed/parse/README.md b/upstreamed/parse/README.md index f66aad4ea..eaf9b4cd5 100644 --- a/upstreamed/parse/README.md +++ b/upstreamed/parse/README.md @@ -49,8 +49,6 @@ The following table lists the configurable parameters of the Parse chart and the |---------------------------------------|------------------------------------------|-------------------------------------------------------- | | `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) | -| `nameOverride` | String to partially override parse.fullname template with a string (will prepend the release name) | `nil`| -| `fullnameOverride` | String to fully override parse.fullname template with a string | `nil`| | `service.type` | Kubernetes Service type | `LoadBalancer` | | `service.port` | Service HTTP port (Dashboard) | `80` | | `service.loadBalancerIP` | `loadBalancerIP` for the Parse Service | `nil` | @@ -86,22 +84,22 @@ The following table lists the configurable parameters of the Parse chart and the | `persistence.storageClass` | PVC Storage Class for Parse volume | `nil` (uses alpha storage class annotation) | | `persistence.accessMode` | PVC Access Mode for Parse volume | `ReadWriteOnce` | | `persistence.size` | PVC Storage Request for Parse volume | `8Gi` | -| `ingress.enabled` | Enable ingress controller resource | `false` | -| `ingress.annotations` | Ingress annotations | `[]` | -| `ingress.certManager` | Add annotations for cert-manager | `false` | -| `ingress.dashboard.hosts[0].name` | Hostname to your Parse Dashboard installation | `ghost.local` | -| `ingress.dashboard.hosts[0].path` | Path within the url structure | `/` | -| `ingress.dashboard.hosts[0].tls` | Utilize TLS backend in ingress | `false` | -| `ingress.dashboard.hosts[0].tlsHosts` | Array of TLS hosts for ingress record (defaults to `ingress.hosts[0].name` if `nil`) | `nil` | -| `ingress.dashboard.hosts[0].tlsSecret`| TLS Secret (certificates) | `ghost.local-tls-secret` | -| `ingress.server.hosts[0].name` | Hostname to your Parse Server installation | `ghost.local` | -| `ingress.server.hosts[0].path` | Path within the url structure | `/` | -| `ingress.server.hosts[0].tls` | Utilize TLS backend in ingress | `false` | -| `ingress.server.hosts[0].tlsHosts` | Array of TLS hosts for ingress record (defaults to `ingress.hosts[0].name` if `nil`) | `nil` | -| `ingress.server.hosts[0].tlsSecret` | TLS Secret (certificates) | `ghost.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` | +| `ingress.enabled` | Enable ingress controller resource | `false` | +| `ingress.annotations` | Ingress annotations | `[]` | +| `ingress.certManager` | Add annotations for cert-manager | `false` | +| `ingress.dashboard.hosts[0].name` | Hostname to your Parse Dashboard installation | `ghost.local` | +| `ingress.dashboard.hosts[0].path` | Path within the url structure | `/` | +| `ingress.dashboard.hosts[0].tls` | Utilize TLS backend in ingress | `false` | +| `ingress.dashboard.hosts[0].tlsHosts` | Array of TLS hosts for ingress record (defaults to `ingress.hosts[0].name` if `nil`) | `nil` | +| `ingress.dashboard.hosts[0].tlsSecret` | TLS Secret (certificates) | `ghost.local-tls-secret` | +| `ingress.server.hosts[0].name` | Hostname to your Parse Server installation | `ghost.local` | +| `ingress.server.hosts[0].path` | Path within the url structure | `/` | +| `ingress.server.hosts[0].tls` | Utilize TLS backend in ingress | `false` | +| `ingress.server.hosts[0].tlsHosts` | Array of TLS hosts for ingress record (defaults to `ingress.hosts[0].name` if `nil`) | `nil` | +| `ingress.server.hosts[0].tlsSecret` | TLS Secret (certificates) | `ghost.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` | | `mongodb.usePassword` | Enable MongoDB password authentication | `true` | | `mongodb.password` | MongoDB admin password | `nil` | | `mongodb.persistence.enabled` | Enable MongoDB persistence using PVC | `true` | diff --git a/upstreamed/parse/templates/_helpers.tpl b/upstreamed/parse/templates/_helpers.tpl index 845a79a4d..39a34e9dc 100644 --- a/upstreamed/parse/templates/_helpers.tpl +++ b/upstreamed/parse/templates/_helpers.tpl @@ -18,32 +18,16 @@ 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 "parse.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. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "parse.mongodb.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- printf "%s-%s" .Values.fullnameOverride "mongodb" | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} {{- printf "%s-%s" .Release.Name "mongodb" | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s-%s" .Release.Name $name "mongodb" | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/parse/values.yaml b/upstreamed/parse/values.yaml index 2c8be5979..e36c457a4 100644 --- a/upstreamed/parse/values.yaml +++ b/upstreamed/parse/values.yaml @@ -7,14 +7,6 @@ # imagePullSecrets: # - myRegistryKeySecretName -## String to partially override parse.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override parse.fullname template -## -# fullnameOverride: - ## Kubernetes serviceType for Parse Deployment ## ref: http://kubernetes.io/docs/user-guide/services/#publishing-services---service-types ## diff --git a/upstreamed/phabricator/Chart.yaml b/upstreamed/phabricator/Chart.yaml index 61f76c130..c79d16437 100644 --- a/upstreamed/phabricator/Chart.yaml +++ b/upstreamed/phabricator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: phabricator -version: 5.0.4 +version: 5.0.5 appVersion: 2019.26.0 description: Collection of open source web applications that help software companies build better software. keywords: diff --git a/upstreamed/phabricator/README.md b/upstreamed/phabricator/README.md index 018bbebe1..917f97c9f 100644 --- a/upstreamed/phabricator/README.md +++ b/upstreamed/phabricator/README.md @@ -47,64 +47,62 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the Phabricator 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` | Phabricator image registry | `docker.io` | -| `image.repository` | Phabricator image name | `bitnami/phabricator` | -| `image.tag` | Phabricator 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 phabricator.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override phabricator.fullname template with a string | `nil` | -| `phabricatorHost` | Phabricator host to create application URLs | `nil` | -| `phabricatorAlternateFileDomain` | Phabricator alternate domain to upload files | `nil` | -| `phabricatorUsername` | User of the application | `user` | -| `phabricatorPassword` | Application password | _random 10 character long alphanumeric string_ | -| `phabricatorEmail` | Admin email | `user@example.com` | -| `phabricatorFirstName` | First name | `First Name` | -| `phabricatorLastName` | Last name | `Last Name` | -| `smtpHost` | SMTP host | `nil` | -| `smtpPort` | SMTP port | `nil` | -| `smtpUser` | SMTP user | `nil` | -| `smtpPassword` | SMTP password | `nil` | -| `smtpProtocol` | SMTP protocol [`ssl`, `tls`] | `nil` | -| `mariadb.rootUser.password` | MariaDB admin password | `nil` | -| `service.type` | Kubernetes Service type | `LoadBalancer` | -| `service.port` | Service HTTP port | `80` | -| `service.httpsPort` | Service HTTP port | `443` | -| `service.loadBalancerIP` | `loadBalancerIP` for the Phabricator Service | `nil` | -| `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` | -| `service.nodePorts.http` | Kubernetes http node port | `""` | -| `service.nodePorts.https` | Kubernetes https node port | `""` | -| `persistence.enabled` | Enable persistence using PVC | `true` | -| `persistence.phabricator.storageClass` | PVC Storage Class for Phabricator volume | `nil` (uses alpha storage class annotation) | -| `persistence.phabricator.accessMode` | PVC Access Mode for Phabricator volume | `ReadWriteOnce` | -| `persistence.phabricator.size` | PVC Storage Request for Phabricator volume | `8Gi` | -| `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | -| `ingress.enabled` | Enable ingress controller resource | `false` | -| `ingress.hosts[0].name` | Hostname to your Phabricator installation | `phabricator.local` | -| `ingress.hosts[0].path` | Path within the url structure | `/` | -| `ingress.hosts[0].tls` | Utilize TLS backend in ingress | `false` | -| `ingress.hosts[0].certManager` | Add annotations for cert-manager | `false` | -| `ingress.hosts[0].tlsSecret` | TLS Secret (certificates) | `phabricator.local-tls-secret` | -| `ingress.hosts[0].annotations` | Annotations for this host's ingress record | `[]` | -| `ingress.secrets[0].name` | TLS Secret Name | `nil` | -| `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` | -| `ingress.secrets[0].key` | TLS Secret Key | `nil` | -| `podAnnotations` | Pod annotations | `{}` | -| `metrics.enabled` | Start a side-car prometheus exporter | `false` | -| `metrics.image.registry` | Apache exporter image registry | `docker.io` | -| `metrics.image.repository` | Apache exporter image name | `lusotycoon/apache-exporter` | -| `metrics.image.tag` | Apache exporter image tag | `v0.5.0` | -| `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) | +| 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` | Phabricator image registry | `docker.io` | +| `image.repository` | Phabricator image name | `bitnami/phabricator` | +| `image.tag` | Phabricator 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) | +| `phabricatorHost` | Phabricator host to create application URLs | `nil` | +| `phabricatorAlternateFileDomain` | Phabricator alternate domain to upload files | `nil` | +| `phabricatorUsername` | User of the application | `user` | +| `phabricatorPassword` | Application password | _random 10 character long alphanumeric string_ | +| `phabricatorEmail` | Admin email | `user@example.com` | +| `phabricatorFirstName` | First name | `First Name` | +| `phabricatorLastName` | Last name | `Last Name` | +| `smtpHost` | SMTP host | `nil` | +| `smtpPort` | SMTP port | `nil` | +| `smtpUser` | SMTP user | `nil` | +| `smtpPassword` | SMTP password | `nil` | +| `smtpProtocol` | SMTP protocol [`ssl`, `tls`] | `nil` | +| `mariadb.rootUser.password` | MariaDB admin password | `nil` | +| `service.type` | Kubernetes Service type | `LoadBalancer` | +| `service.port` | Service HTTP port | `80` | +| `service.httpsPort` | Service HTTP port | `443` | +| `service.loadBalancerIP` | `loadBalancerIP` for the Phabricator Service | `nil` | +| `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` | +| `service.nodePorts.http` | Kubernetes http node port | `""` | +| `service.nodePorts.https` | Kubernetes https node port | `""` | +| `persistence.enabled` | Enable persistence using PVC | `true` | +| `persistence.phabricator.storageClass` | PVC Storage Class for Phabricator volume | `nil` (uses alpha storage class annotation) | +| `persistence.phabricator.accessMode` | PVC Access Mode for Phabricator volume | `ReadWriteOnce` | +| `persistence.phabricator.size` | PVC Storage Request for Phabricator volume | `8Gi` | +| `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | +| `ingress.enabled` | Enable ingress controller resource | `false` | +| `ingress.hosts[0].name` | Hostname to your Phabricator installation | `phabricator.local` | +| `ingress.hosts[0].path` | Path within the url structure | `/` | +| `ingress.hosts[0].tls` | Utilize TLS backend in ingress | `false` | +| `ingress.hosts[0].certManager` | Add annotations for cert-manager | `false` | +| `ingress.hosts[0].tlsSecret` | TLS Secret (certificates) | `phabricator.local-tls-secret` | +| `ingress.hosts[0].annotations` | Annotations for this host's ingress record | `[]` | +| `ingress.secrets[0].name` | TLS Secret Name | `nil` | +| `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` | +| `ingress.secrets[0].key` | TLS Secret Key | `nil` | +| `podAnnotations` | Pod annotations | `{}` | +| `metrics.enabled` | Start a side-car prometheus exporter | `false` | +| `metrics.image.registry` | Apache exporter image registry | `docker.io` | +| `metrics.image.repository` | Apache exporter image name | `lusotycoon/apache-exporter` | +| `metrics.image.tag` | Apache exporter image tag | `v0.5.0` | +| `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: "9117"}` | -| `metrics.resources` | Exporter resource requests/limit | {} | -| `nodeSelector` | Node labels for pod assignment | `nil` | -| `affinity` | Node/pod affinities | `nil` | -| `tolerations` | List of node taints to tolerate | `nil` | +| `metrics.resources` | Exporter resource requests/limit | {} | +| `nodeSelector` | Node labels for pod assignment | `nil` | +| `affinity` | Node/pod affinities | `nil` | +| `tolerations` | List of node taints to tolerate | `nil` | The above parameters map to the env variables defined in [bitnami/phabricator](http://github.com/bitnami/bitnami-docker-phabricator). For more information please refer to the [bitnami/phabricator](http://github.com/bitnami/bitnami-docker-phabricator) image documentation. diff --git a/upstreamed/phabricator/templates/_helpers.tpl b/upstreamed/phabricator/templates/_helpers.tpl index 8e0b99222..2c9d214c9 100644 --- a/upstreamed/phabricator/templates/_helpers.tpl +++ b/upstreamed/phabricator/templates/_helpers.tpl @@ -11,17 +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 "phabricator.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/upstreamed/phabricator/values.yaml b/upstreamed/phabricator/values.yaml index 54c790fd9..d82c3bc11 100644 --- a/upstreamed/phabricator/values.yaml +++ b/upstreamed/phabricator/values.yaml @@ -26,14 +26,6 @@ image: # pullSecrets: # - myRegistryKeySecretName -## String to partially override phabricator.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override phabricator.fullname template -## -# fullnameOverride: - ## Phabricator host to create application URLs ## ref: https://github.com/bitnami/bitnami-docker-phabricator#configuration ## From 9a7bc929ea8cf64fa860854e5ac4babd7cffa927 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Wed, 17 Jul 2019 17:03:15 +0000 Subject: [PATCH 05/17] [bitnami/jenkins] Release 3.0.1 updating components versions Signed-off-by: Bitnami Containers --- bitnami/jenkins/Chart.yaml | 4 ++-- bitnami/jenkins/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bitnami/jenkins/Chart.yaml b/bitnami/jenkins/Chart.yaml index 5aab6a066..ceffd3346 100644 --- a/bitnami/jenkins/Chart.yaml +++ b/bitnami/jenkins/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: jenkins -version: 3.0.0 -appVersion: 2.176.1 +version: 3.0.1 +appVersion: 2.176.2 description: The leading open source automation server keywords: - jenkins diff --git a/bitnami/jenkins/values.yaml b/bitnami/jenkins/values.yaml index 1fbf1b083..1c5a04a87 100644 --- a/bitnami/jenkins/values.yaml +++ b/bitnami/jenkins/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/jenkins - tag: 2.176.1-debian-9-r13 + tag: 2.176.2-debian-9-r0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images From 10af9fd9f752e213939e035c87a5651c03fe8ba9 Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Wed, 17 Jul 2019 17:35:05 +0000 Subject: [PATCH 06/17] Synchronize upstreamed folder to 4f03f7aad --- upstreamed/drupal/Chart.yaml | 2 +- upstreamed/drupal/README.md | 2 - upstreamed/drupal/templates/_helpers.tpl | 8 -- upstreamed/drupal/values.yaml | 8 -- upstreamed/external-dns/Chart.yaml | 2 +- upstreamed/external-dns/README.md | 16 ++- upstreamed/ghost/Chart.yaml | 2 +- upstreamed/ghost/README.md | 6 +- upstreamed/ghost/values.yaml | 8 -- upstreamed/jasperreports/Chart.yaml | 2 +- upstreamed/jasperreports/README.md | 100 +++++++++--------- .../jasperreports/templates/_helpers.tpl | 8 -- upstreamed/jasperreports/values.yaml | 8 -- upstreamed/joomla/Chart.yaml | 2 +- upstreamed/joomla/README.md | 2 - upstreamed/joomla/templates/_helpers.tpl | 8 -- upstreamed/joomla/values.yaml | 8 -- upstreamed/mariadb/Chart.yaml | 2 +- upstreamed/mariadb/README.md | 2 - upstreamed/mariadb/values-production.yaml | 8 -- upstreamed/mariadb/values.yaml | 8 -- upstreamed/mediawiki/Chart.yaml | 2 +- upstreamed/mediawiki/README.md | 2 - upstreamed/mediawiki/templates/_helpers.tpl | 8 -- upstreamed/mediawiki/values.yaml | 8 -- upstreamed/osclass/Chart.yaml | 2 +- upstreamed/osclass/README.md | 2 + upstreamed/osclass/templates/_helpers.tpl | 9 ++ upstreamed/osclass/values.yaml | 8 ++ upstreamed/suitecrm/Chart.yaml | 2 +- upstreamed/suitecrm/README.md | 4 +- upstreamed/suitecrm/templates/_helpers.tpl | 8 -- upstreamed/suitecrm/values.yaml | 8 -- 33 files changed, 87 insertions(+), 188 deletions(-) diff --git a/upstreamed/drupal/Chart.yaml b/upstreamed/drupal/Chart.yaml index beba55284..cf64bdfea 100644 --- a/upstreamed/drupal/Chart.yaml +++ b/upstreamed/drupal/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: drupal -version: 3.3.7 +version: 3.3.8 appVersion: 8.7.4 description: One of the most versatile open source content management systems. keywords: diff --git a/upstreamed/drupal/README.md b/upstreamed/drupal/README.md index 535bab212..53c2ec0a6 100644 --- a/upstreamed/drupal/README.md +++ b/upstreamed/drupal/README.md @@ -56,8 +56,6 @@ The following table lists the configurable parameters of the Drupal chart and th | `image.tag` | Drupal Image tag | `{TAG_NAME}` | | `image.pullPolicy` | Drupal 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 drupal.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override drupal.fullname template with a string | `nil` | | `drupalProfile` | Drupal installation profile | `standard` | | `drupalUsername` | User of the application | `user` | | `drupalPassword` | Application password | _random 10 character long alphanumeric string_ | diff --git a/upstreamed/drupal/templates/_helpers.tpl b/upstreamed/drupal/templates/_helpers.tpl index 3e8ec59b0..933ca769e 100644 --- a/upstreamed/drupal/templates/_helpers.tpl +++ b/upstreamed/drupal/templates/_helpers.tpl @@ -11,17 +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 "drupal.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/upstreamed/drupal/values.yaml b/upstreamed/drupal/values.yaml index 301ec6728..82e49da1f 100644 --- a/upstreamed/drupal/values.yaml +++ b/upstreamed/drupal/values.yaml @@ -26,14 +26,6 @@ image: # pullSecrets: # - myRegistryKeySecretName -## String to partially override drupal.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override drupal.fullname template -## -# fullnameOverride: - ## Installation Profile ## ref: https://github.com/bitnami/bitnami-docker-drupal#configuration ## diff --git a/upstreamed/external-dns/Chart.yaml b/upstreamed/external-dns/Chart.yaml index 17fb64fd7..60c8649c3 100644 --- a/upstreamed/external-dns/Chart.yaml +++ b/upstreamed/external-dns/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: external-dns -version: 2.3.1 +version: 2.3.2 appVersion: 0.5.15 description: ExternalDNS is a Kubernetes addon that configures public DNS servers with information about exposed Kubernetes services to make them discoverable. keywords: diff --git a/upstreamed/external-dns/README.md b/upstreamed/external-dns/README.md index 09ba113a6..e2b2d0628 100644 --- a/upstreamed/external-dns/README.md +++ b/upstreamed/external-dns/README.md @@ -54,13 +54,11 @@ The following table lists the configurable parameters of the external-dns chart | `image.tag` | ExternalDNS Image tag | `{TAG_NAME}` | | `image.pullPolicy` | ExternalDNS 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 external-dns.fullname template with a string (will prepend the release name)| `nil` | -| `fullnameOverride` | String to fully override external-dns.fullname template with a string | `nil` | | `sources` | K8s resources type to be observed for new DNS entries by ExternalDNS | `[service, ingress]` | | `provider` | DNS provider where the DNS records will be created (mandatory) (options: aws, azure, google, ...) | `aws` | | `publishInternalServices` | Whether to publish DNS records for ClusterIP services or not | `false` | -| `aws.credentials.accessKey` | When using the AWS provider, set `aws_access_key_id` in the AWS credentials (optional) | `""` | -| `aws.credentials.secretKey` | When using the AWS provider, set `aws_secret_access_key` in the AWS credentials (optional) | `""` | +| `aws.credentials.accessKey` | When using the AWS provider, set `aws_access_key_id` in the AWS credentials (optional) | `""` | +| `aws.credentials.secretKey` | When using the AWS provider, set `aws_secret_access_key` in the AWS credentials (optional) | `""` | | `aws.credentials.mountPath` | When using the AWS provider, determine `mountPath` for `credentials` secret | `"/.aws"` | | `aws.region` | When using the AWS provider, `AWS_DEFAULT_REGION` to set in the environment (optional) | `us-east-1` | | `aws.zoneType` | When using the AWS provider, filter for zones of this type (optional, options: public, private) | `""` | @@ -80,7 +78,7 @@ The following table lists the configurable parameters of the external-dns chart | `google.serviceAccountSecret` | When using the Google provider, specify the existing secret which contains credentials.json (optional) | `""` | | `google.serviceAccountKey` | When using the Google provider, specify the service account key JSON file. (required when `google.serviceAccountSecret` is not provided. In this case a new secret will be created holding this service account | `""` | | `infoblox.gridHost` | When using the Infoblox provider, specify the Infoblox Grid host (required when provider=infoblox) | `""` | -| `infoblox.wapiUsername` | When using the Infoblox provider, specify the Infoblox WAPI username | `"admin"` | +| `infoblox.wapiUsername` | When using the Infoblox provider, specify the Infoblox WAPI username | `"admin"` | | `infoblox.wapiPassword` | When using the Infoblox provider, specify the Infoblox WAPI password (required when provider=infoblox) | `""` | | `infoblox.domainFilter` | When using the Infoblox provider, specify the domain (optional) | `""` | | `infoblox.noSslVerify` | When using the Infoblox provider, disable SSL verification (optional) | `false` | @@ -115,9 +113,9 @@ The following table lists the configurable parameters of the external-dns chart | `extraArgs` | Extra arguments to be passed to external-dns | `{}` | | `extraEnv` | Extra environment variables to be passed to external-dns | `[]` | | `replicas` | Desired number of ExternalDNS replicas | `1` | -| `affinity` | Affinity for pod assignment (this value is evaluated as a template) | `{}` | -| `nodeSelector` | Node labels for pod assignment (this value is evaluated as a template) | `{}` | -| `tolerations` | Tolerations for pod assignment (this value is evaluated as a template) | `[]` | +| `affinity` | Affinity for pod assignment (this value is evaluated as a template) | `{}` | +| `nodeSelector` | Node labels for pod assignment (this value is evaluated as a template) | `{}` | +| `tolerations` | Tolerations for pod assignment (this value is evaluated as a template) | `[]` | | `podAnnotations` | Additional annotations to apply to the pod. | `{}` | | `podLabels` | Additional labels to be added to pods | {} | | `podSecurityContext.fsGroup` | Group ID for the container | `1001` | @@ -135,7 +133,7 @@ The following table lists the configurable parameters of the external-dns chart | `rbac.create` | Wether to create & use RBAC resources or not | `false` | | `rbac.serviceAccountName` | ServiceAccount (ignored if rbac.create == true) | `default` | | `rbac.apiVersion` | Version of the RBAC API | `v1beta1` | -| `rbac.pspEnabled` | PodSecurityPolicy | `false` | +| `rbac.pspEnabled` | PodSecurityPolicy | `false` | | `resources` | CPU/Memory resource requests/limits. | `{}` | | `livenessProbe` | Deployment Liveness Probe | See `values.yaml` | | `readinessProbe` | Deployment Readiness Probe | See `values.yaml` | diff --git a/upstreamed/ghost/Chart.yaml b/upstreamed/ghost/Chart.yaml index 95c502f63..6676ebfc9 100644 --- a/upstreamed/ghost/Chart.yaml +++ b/upstreamed/ghost/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: ghost -version: 6.7.29 +version: 6.7.30 appVersion: 2.25.7 description: A simple, powerful publishing platform that allows you to share your stories with the world keywords: diff --git a/upstreamed/ghost/README.md b/upstreamed/ghost/README.md index 2c8063504..7e99ea0d9 100644 --- a/upstreamed/ghost/README.md +++ b/upstreamed/ghost/README.md @@ -56,14 +56,12 @@ The following table lists the configurable parameters of the Ghost chart and the | `image.tag` | Ghost 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 ghost.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override ghost.fullname template with a string | `nil` | | `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | | `volumePermissions.image.repository`| Init container volume-permissions image name | `bitnami/minideb` | | `volumePermissions.image.tag` | Init container volume-permissions image tag | `latest` | | `volumePermissions.image.pullPolicy`| Init container volume-permissions image pull policy | `Always` | | `ghostHost` | Ghost host to create application URLs | `nil` | -| `ghostPort` | Ghost port to use in application URLs (defaults to `service.port` if `nil`) | `nil` | +| `ghostPort` | Ghost port to use in application URLs (defaults to `service.port` if `nil`) | `nil` | | `ghostProtocol` | Protocol (http or https) to use in the application URLs | `http` | | `ghostPath` | Ghost path to create application URLs | `nil` | | `ghostUsername` | User of the application | `user@example.com` | @@ -85,7 +83,7 @@ The following table lists the configurable parameters of the Ghost chart and the | `service.nodePorts.http` | Kubernetes http node port | `""` | | `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` | | `service.loadBalancerIP` | LoadBalancerIP for the Ghost service | `` | -| `service.annotations` | Service annotations | `` | +| `service.annotations` | Service annotations | `` | | `ingress.enabled` | Enable ingress controller resource | `false` | | `ingress.annotations` | Ingress annotations | `[]` | | `ingress.certManager` | Add annotations for cert-manager | `false` | diff --git a/upstreamed/ghost/values.yaml b/upstreamed/ghost/values.yaml index 05dfee8a8..a816efa34 100644 --- a/upstreamed/ghost/values.yaml +++ b/upstreamed/ghost/values.yaml @@ -26,14 +26,6 @@ image: # pullSecrets: # - myRegistryKeySecretName -## String to partially override ghost.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override ghost.fullname template -## -# fullnameOverride: - ## Init containers parameters: ## volumePermissions: Change the owner of the persist volume mountpoint to RunAsUser:fsGroup ## diff --git a/upstreamed/jasperreports/Chart.yaml b/upstreamed/jasperreports/Chart.yaml index fb6cf5316..b68cb9d39 100644 --- a/upstreamed/jasperreports/Chart.yaml +++ b/upstreamed/jasperreports/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: jasperreports -version: 4.2.7 +version: 4.2.8 appVersion: 7.2.0 description: The JasperReports server can be used as a stand-alone or embedded reporting and BI server that offers web-based reporting, analytic tools and visualization, diff --git a/upstreamed/jasperreports/README.md b/upstreamed/jasperreports/README.md index a0b2644f5..d13aa13bf 100644 --- a/upstreamed/jasperreports/README.md +++ b/upstreamed/jasperreports/README.md @@ -47,57 +47,55 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the JasperReports 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` | JasperReports image registry | `docker.io` | -| `image.repository` | JasperReports Image name | `bitnami/jasperreports` | -| `image.tag` | JasperReports 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 jasperreports.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override jasperreports.fullname template with a string | `nil` | -| `jasperreportsUsername` | User of the application | `user` | -| `jasperreportsPassword` | Application password | _random 10 character long alphanumeric string_ | -| `jasperreportsEmail` | User email | `user@example.com` | -| `smtpHost` | SMTP host | `nil` | -| `smtpPort` | SMTP port | `nil` | -| `smtpEmail` | SMTP email | `nil` | -| `smtpUser` | SMTP user | `nil` | -| `smtpPassword` | SMTP password | `nil` | -| `smtpProtocol` | SMTP protocol [`ssl`, `none`] | `nil` | -| `allowEmptyPassword` | Allow DB blank passwords | `yes` | -| `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 JasperReports installation | `jasperreports.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) | `jasperreports.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` | -| `externalDatabase.host` | Host of the external database | `nil` | -| `externalDatabase.port` | Port of the external database | `3306` | -| `externalDatabase.user` | Existing username in the external db | `bn_jasperreports` | -| `externalDatabase.password` | Password for the above username | `nil` | -| `externalDatabase.database` | Name of the existing database | `bitnami_jasperreports` | -| `mariadb.enabled` | Whether to use the MariaDB chart | `true` | -| `mariadb.db.name` | Database name to create | `bitnami_jasperreports` | -| `mariadb.db.user` | Database user to create | `bn_jasperreports` | -| `mariadb.db.password` | Password for the database | `nil` | -| `mariadb.rootUser.password` | MariaDB admin password | `nil` | -| `service.type` | Kubernetes Service type | `LoadBalancer` | -| `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` | -| `service.port` | Service HTTP port | `80` | -| `service.nodePorts.http` | Kubernetes http node port | `""` | -| `persistence.enabled` | Enable persistence using PVC | `true` | -| `persistence.storageClass` | PVC Storage Class for JasperReports volume | `nil` (uses alpha storage annotation) | -| `persistence.accessMode` | PVC Access Mode for JasperReports volume | `ReadWriteOnce` | -| `persistence.size` | PVC Storage Request for JasperReports volume | `8Gi` | -| `resources` | CPU/Memory resource requests/limits | `{Memory: 512Mi, CPU: 300m}` | +| 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` | JasperReports image registry | `docker.io` | +| `image.repository` | JasperReports Image name | `bitnami/jasperreports` | +| `image.tag` | JasperReports 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) | +| `jasperreportsUsername` | User of the application | `user` | +| `jasperreportsPassword` | Application password | _random 10 character long alphanumeric string_ | +| `jasperreportsEmail` | User email | `user@example.com` | +| `smtpHost` | SMTP host | `nil` | +| `smtpPort` | SMTP port | `nil` | +| `smtpEmail` | SMTP email | `nil` | +| `smtpUser` | SMTP user | `nil` | +| `smtpPassword` | SMTP password | `nil` | +| `smtpProtocol` | SMTP protocol [`ssl`, `none`] | `nil` | +| `allowEmptyPassword` | Allow DB blank passwords | `yes` | +| `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 JasperReports installation | `jasperreports.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) | `jasperreports.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` | +| `externalDatabase.host` | Host of the external database | `nil` | +| `externalDatabase.port` | Port of the external database | `3306` | +| `externalDatabase.user` | Existing username in the external db | `bn_jasperreports` | +| `externalDatabase.password` | Password for the above username | `nil` | +| `externalDatabase.database` | Name of the existing database | `bitnami_jasperreports` | +| `mariadb.enabled` | Whether to use the MariaDB chart | `true` | +| `mariadb.db.name` | Database name to create | `bitnami_jasperreports` | +| `mariadb.db.user` | Database user to create | `bn_jasperreports` | +| `mariadb.db.password` | Password for the database | `nil` | +| `mariadb.rootUser.password` | MariaDB admin password | `nil` | +| `service.type` | Kubernetes Service type | `LoadBalancer` | +| `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` | +| `service.port` | Service HTTP port | `80` | +| `service.nodePorts.http` | Kubernetes http node port | `""` | +| `persistence.enabled` | Enable persistence using PVC | `true` | +| `persistence.storageClass` | PVC Storage Class for JasperReports volume | `nil` (uses alpha storage annotation) | +| `persistence.accessMode` | PVC Access Mode for JasperReports volume | `ReadWriteOnce` | +| `persistence.size` | PVC Storage Request for JasperReports volume | `8Gi` | +| `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | The above parameters map to the env variables defined in [bitnami/jasperreports](http://github.com/bitnami/bitnami-docker-jasperreports). For more information please refer to the [bitnami/jasperreports](http://github.com/bitnami/bitnami-docker-jasperreports) image documentation. diff --git a/upstreamed/jasperreports/templates/_helpers.tpl b/upstreamed/jasperreports/templates/_helpers.tpl index 0253a76f8..ca05bc7fa 100644 --- a/upstreamed/jasperreports/templates/_helpers.tpl +++ b/upstreamed/jasperreports/templates/_helpers.tpl @@ -11,17 +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 "jasperreports.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/upstreamed/jasperreports/values.yaml b/upstreamed/jasperreports/values.yaml index 978f62aff..881089519 100644 --- a/upstreamed/jasperreports/values.yaml +++ b/upstreamed/jasperreports/values.yaml @@ -26,14 +26,6 @@ image: # pullSecrets: # - myRegistryKeySecretName -## String to partially override jasperreports.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override jasperreports.fullname template -## -# fullnameOverride: - ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-jasperreports#configuration ## diff --git a/upstreamed/joomla/Chart.yaml b/upstreamed/joomla/Chart.yaml index ddb88f907..db5440f7d 100644 --- a/upstreamed/joomla/Chart.yaml +++ b/upstreamed/joomla/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: joomla -version: 4.3.7 +version: 4.3.8 appVersion: 3.9.9 description: PHP content management system (CMS) for publishing web content keywords: diff --git a/upstreamed/joomla/README.md b/upstreamed/joomla/README.md index 424c283ea..ca0560472 100644 --- a/upstreamed/joomla/README.md +++ b/upstreamed/joomla/README.md @@ -56,8 +56,6 @@ The following table lists the configurable parameters of the Joomla! chart and t | `image.tag` | Joomla! Image tag | `{TAG_NAME}` | | `image.pullPolicy` | Image pull policy | `Always` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | -| `nameOverride` | String to partially override joomla.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override joomla.fullname template with a string | `nil` | | `joomlaUsername` | User of the application | `user` | | `joomlaPassword` | Application password | _random 10 character long alphanumeric string_ | | `joomlaEmail` | Admin email | `user@example.com` | diff --git a/upstreamed/joomla/templates/_helpers.tpl b/upstreamed/joomla/templates/_helpers.tpl index d81e51cd6..9862ea702 100644 --- a/upstreamed/joomla/templates/_helpers.tpl +++ b/upstreamed/joomla/templates/_helpers.tpl @@ -11,17 +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 "joomla.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/upstreamed/joomla/values.yaml b/upstreamed/joomla/values.yaml index eef09990d..f6e493516 100644 --- a/upstreamed/joomla/values.yaml +++ b/upstreamed/joomla/values.yaml @@ -26,14 +26,6 @@ image: # pullSecrets: # - myRegistryKeySecretName -## String to partially override joomla.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override joomla.fullname template -## -# fullnameOverride: - ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-joomla#environment-variables ## diff --git a/upstreamed/mariadb/Chart.yaml b/upstreamed/mariadb/Chart.yaml index 7998e64c1..39849274b 100644 --- a/upstreamed/mariadb/Chart.yaml +++ b/upstreamed/mariadb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mariadb -version: 6.5.7 +version: 6.5.8 appVersion: 10.3.16 description: Fast, reliable, scalable, and easy to use open-source relational database system. MariaDB Server is intended for mission-critical, heavy-load production systems as well as for embedding into mass-deployed software. Highly available MariaDB cluster. keywords: diff --git a/upstreamed/mariadb/README.md b/upstreamed/mariadb/README.md index 7198ec18f..b1ba58126 100644 --- a/upstreamed/mariadb/README.md +++ b/upstreamed/mariadb/README.md @@ -57,8 +57,6 @@ The following table lists the configurable parameters of the MariaDB chart and t | `image.pullPolicy` | MariaDB 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 mariadb.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override mariadb.fullname template with a string | `nil` | | `service.type` | Kubernetes service type | `ClusterIP` | | `service.clusterIp` | Specific cluster IP when service type is cluster IP. Use None for headless service | `nil` | | `service.port` | MySQL service port | `3306` | diff --git a/upstreamed/mariadb/values-production.yaml b/upstreamed/mariadb/values-production.yaml index d35847d3f..9fea62c77 100644 --- a/upstreamed/mariadb/values-production.yaml +++ b/upstreamed/mariadb/values-production.yaml @@ -36,14 +36,6 @@ image: ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging debug: false -## String to partially override mariadb.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override mariadb.fullname template -## -# fullnameOverride: - service: ## Kubernetes service type, ClusterIP and NodePort are supported at present type: ClusterIP diff --git a/upstreamed/mariadb/values.yaml b/upstreamed/mariadb/values.yaml index 2c4d73f29..acd242f06 100644 --- a/upstreamed/mariadb/values.yaml +++ b/upstreamed/mariadb/values.yaml @@ -36,14 +36,6 @@ image: ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging debug: false -## String to partially override mariadb.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override mariadb.fullname template -## -# fullnameOverride: - service: ## Kubernetes service type, ClusterIP and NodePort are supported at present type: ClusterIP diff --git a/upstreamed/mediawiki/Chart.yaml b/upstreamed/mediawiki/Chart.yaml index ac87fff84..75ec08b90 100644 --- a/upstreamed/mediawiki/Chart.yaml +++ b/upstreamed/mediawiki/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mediawiki -version: 6.3.7 +version: 6.3.8 appVersion: 1.33.0 description: Extremely powerful, scalable software and a feature-rich wiki implementation that uses PHP to process and display data stored in a database. home: http://www.mediawiki.org/ diff --git a/upstreamed/mediawiki/README.md b/upstreamed/mediawiki/README.md index 657c76981..d0d9b178c 100644 --- a/upstreamed/mediawiki/README.md +++ b/upstreamed/mediawiki/README.md @@ -56,8 +56,6 @@ The following table lists the configurable parameters of the MediaWiki chart and | `image.tag` | MediaWiki 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 mediawiki.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override mediawiki.fullname template with a string | `nil` | | `mediawikiUser` | User of the application | `user` | | `mediawikiPassword` | Application password | _random 10 character long alphanumeric string_ | | `mediawikiEmail` | Admin email | `user@example.com` | diff --git a/upstreamed/mediawiki/templates/_helpers.tpl b/upstreamed/mediawiki/templates/_helpers.tpl index 3f75466fe..57adf0e7e 100644 --- a/upstreamed/mediawiki/templates/_helpers.tpl +++ b/upstreamed/mediawiki/templates/_helpers.tpl @@ -11,17 +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 "mediawiki.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/upstreamed/mediawiki/values.yaml b/upstreamed/mediawiki/values.yaml index 4660228b7..3685f6a02 100644 --- a/upstreamed/mediawiki/values.yaml +++ b/upstreamed/mediawiki/values.yaml @@ -26,14 +26,6 @@ image: # pullSecrets: # - myRegistryKeySecretName -## String to partially override mediawiki.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override mediawiki.fullname template -## -# fullnameOverride: - ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-mediawiki#environment-variables ## diff --git a/upstreamed/osclass/Chart.yaml b/upstreamed/osclass/Chart.yaml index f48ae89ef..823fb8d56 100644 --- a/upstreamed/osclass/Chart.yaml +++ b/upstreamed/osclass/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: osclass -version: 4.4.5 +version: 5.0.0 appVersion: 3.7.4 description: Osclass is a php script that allows you to quickly create and manage your own free classifieds site. diff --git a/upstreamed/osclass/README.md b/upstreamed/osclass/README.md index f277b0508..6d3dae87c 100644 --- a/upstreamed/osclass/README.md +++ b/upstreamed/osclass/README.md @@ -56,6 +56,8 @@ The following table lists the configurable parameters of the Osclass chart and t | `image.tag` | Osclass 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 osclass.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override osclass.fullname template with a string | `nil` | | `osclassHost` | Osclass host to create application URLs | `nil` | | `osclassLoadBalancerIP` | `loadBalancerIP` for the Osclass Service | `nil` | | `osclassUsername` | User of the application | `user` | diff --git a/upstreamed/osclass/templates/_helpers.tpl b/upstreamed/osclass/templates/_helpers.tpl index a60c101e0..a9ca080f8 100644 --- a/upstreamed/osclass/templates/_helpers.tpl +++ b/upstreamed/osclass/templates/_helpers.tpl @@ -11,9 +11,18 @@ 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 "osclass.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/upstreamed/osclass/values.yaml b/upstreamed/osclass/values.yaml index 7a29fa6d6..2efc51f61 100644 --- a/upstreamed/osclass/values.yaml +++ b/upstreamed/osclass/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override osclass.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override osclass.fullname template +## +# fullnameOverride: + ## Osclass host to create application URLs ## ref: https://github.com/bitnami/bitnami-docker-osclass#configuration ## diff --git a/upstreamed/suitecrm/Chart.yaml b/upstreamed/suitecrm/Chart.yaml index eb719f9d9..0c54b1f26 100644 --- a/upstreamed/suitecrm/Chart.yaml +++ b/upstreamed/suitecrm/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: suitecrm -version: 5.4.6 +version: 5.4.7 appVersion: 7.11.6 description: SuiteCRM is a completely open source enterprise-grade Customer Relationship Management (CRM) application. SuiteCRM is a software fork of the popular customer relationship management (CRM) system SugarCRM. keywords: diff --git a/upstreamed/suitecrm/README.md b/upstreamed/suitecrm/README.md index 4b6cf30f7..0e5b368a5 100644 --- a/upstreamed/suitecrm/README.md +++ b/upstreamed/suitecrm/README.md @@ -55,9 +55,7 @@ The following table lists the configurable parameters of the SuiteCRM chart and | `image.repository` | SuiteCRM image name | `bitnami/suitecrm` | | `image.tag` | SuiteCRM 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 suitecrm.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override suitecrm.fullname template with a string | `nil` | +| `image.pullSecrets` | Specify docker-registry secret names as an array| `[]` (does not add image pull secrets to deployed pods)| | `suitecrmHost` | SuiteCRM host to create application URLs | `nil` | | `suitecrmUsername` | User of the application | `user` | | `suitecrmPassword` | Application password | _random 10 character alphanumeric string_ | diff --git a/upstreamed/suitecrm/templates/_helpers.tpl b/upstreamed/suitecrm/templates/_helpers.tpl index d7806a595..457a226fc 100644 --- a/upstreamed/suitecrm/templates/_helpers.tpl +++ b/upstreamed/suitecrm/templates/_helpers.tpl @@ -11,17 +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 "suitecrm.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/upstreamed/suitecrm/values.yaml b/upstreamed/suitecrm/values.yaml index 90a2bc01d..d5ae7898b 100644 --- a/upstreamed/suitecrm/values.yaml +++ b/upstreamed/suitecrm/values.yaml @@ -26,14 +26,6 @@ image: # pullSecrets: # - myRegistryKeySecretName -## String to partially override suitecrm.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override suitecrm.fullname template -## -# fullnameOverride: - ## SuiteCRM host to create application URLs ## ref: https://github.com/bitnami/bitnami-docker-suitecrm#configuration ## From aede4d01e63635b0672fcf6c5936a2cf28656f07 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 18 Jul 2019 06:19:45 +0000 Subject: [PATCH 07/17] fix(kafka): Fix mapping value for resources. --- bitnami/kafka/Chart.yaml | 2 +- bitnami/kafka/values-production.yaml | 2 +- bitnami/kafka/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bitnami/kafka/Chart.yaml b/bitnami/kafka/Chart.yaml index 631ba2cb1..ad7080a7a 100644 --- a/bitnami/kafka/Chart.yaml +++ b/bitnami/kafka/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: kafka -version: 4.0.0 +version: 4.0.1 appVersion: 2.3.0 description: Apache Kafka is a distributed streaming platform. keywords: diff --git a/bitnami/kafka/values-production.yaml b/bitnami/kafka/values-production.yaml index 40b6c1551..e3e270cef 100644 --- a/bitnami/kafka/values-production.yaml +++ b/bitnami/kafka/values-production.yaml @@ -282,7 +282,7 @@ affinity: {} ## Configure resource requests and limits ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ ## -resources: +resources: {} # limits: # cpu: 200m # memory: 1Gi diff --git a/bitnami/kafka/values.yaml b/bitnami/kafka/values.yaml index ddbf90453..560700006 100644 --- a/bitnami/kafka/values.yaml +++ b/bitnami/kafka/values.yaml @@ -282,7 +282,7 @@ affinity: {} ## Configure resource requests and limits ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ ## -resources: +resources: {} # limits: # cpu: 200m # memory: 1Gi From 14ebd1f78732fb248b8198f88c38d27535dff2c2 Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Thu, 18 Jul 2019 11:35:53 +0000 Subject: [PATCH 08/17] Synchronize upstreamed folder to 7188bbee1 --- upstreamed/mongodb/Chart.yaml | 2 +- upstreamed/mongodb/README.md | 2 ++ upstreamed/mongodb/values-production.yaml | 8 ++++++++ upstreamed/mongodb/values.yaml | 8 ++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/upstreamed/mongodb/Chart.yaml b/upstreamed/mongodb/Chart.yaml index a42085138..392d26c21 100644 --- a/upstreamed/mongodb/Chart.yaml +++ b/upstreamed/mongodb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mongodb -version: 6.1.4 +version: 6.1.5 appVersion: 4.0.10 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications. keywords: diff --git a/upstreamed/mongodb/README.md b/upstreamed/mongodb/README.md index 46332c348..61cedbd66 100644 --- a/upstreamed/mongodb/README.md +++ b/upstreamed/mongodb/README.md @@ -55,6 +55,8 @@ The following table lists the configurable parameters of the MongoDB chart and t | `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 mongodb.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override mongodb.fullname template with a string | `nil` | | `clusterDomain` | Default Kubernetes cluster domain | `cluster.local` | | `usePassword` | Enable password authentication | `true` | | `existingSecret` | Existing secret with MongoDB credentials | `nil` | diff --git a/upstreamed/mongodb/values-production.yaml b/upstreamed/mongodb/values-production.yaml index 0a70ce225..26bb1fb3b 100644 --- a/upstreamed/mongodb/values-production.yaml +++ b/upstreamed/mongodb/values-production.yaml @@ -34,6 +34,14 @@ image: ## ref: https://github.com/bitnami/minideb-extras-base debug: false +## String to partially override mongodb.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override mongodb.fullname template +## +# fullnameOverride: + ## Enable authentication ## ref: https://docs.mongodb.com/manual/tutorial/enable-authentication/ # diff --git a/upstreamed/mongodb/values.yaml b/upstreamed/mongodb/values.yaml index cc8ab2f55..e30e1c65d 100644 --- a/upstreamed/mongodb/values.yaml +++ b/upstreamed/mongodb/values.yaml @@ -34,6 +34,14 @@ image: ## ref: https://github.com/bitnami/minideb-extras-base debug: false +## String to partially override mongodb.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override mongodb.fullname template +## +# fullnameOverride: + ## Enable authentication ## ref: https://docs.mongodb.com/manual/tutorial/enable-authentication/ # From beea47bfca6bf81a76b5d7b340d18ea10c49f2bc Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Thu, 18 Jul 2019 12:35:42 +0000 Subject: [PATCH 09/17] Synchronize upstreamed folder to 4a9f6a189 --- upstreamed/dokuwiki/Chart.yaml | 2 +- upstreamed/dokuwiki/README.md | 2 + upstreamed/dokuwiki/templates/_helpers.tpl | 8 ++ upstreamed/dokuwiki/values.yaml | 8 ++ upstreamed/drupal/Chart.yaml | 2 +- upstreamed/drupal/README.md | 2 + upstreamed/drupal/templates/_helpers.tpl | 8 ++ upstreamed/drupal/values.yaml | 8 ++ upstreamed/external-dns/Chart.yaml | 2 +- upstreamed/external-dns/README.md | 16 +-- upstreamed/jasperreports/Chart.yaml | 2 +- upstreamed/jasperreports/README.md | 100 +++++++++--------- .../jasperreports/templates/_helpers.tpl | 8 ++ upstreamed/jasperreports/values.yaml | 8 ++ upstreamed/joomla/Chart.yaml | 2 +- upstreamed/joomla/README.md | 2 + upstreamed/joomla/templates/_helpers.tpl | 8 ++ upstreamed/joomla/values.yaml | 8 ++ upstreamed/mariadb/Chart.yaml | 2 +- upstreamed/mariadb/README.md | 2 + upstreamed/mariadb/values-production.yaml | 8 ++ upstreamed/mariadb/values.yaml | 8 ++ upstreamed/mediawiki/Chart.yaml | 2 +- upstreamed/mediawiki/README.md | 2 + upstreamed/mediawiki/templates/_helpers.tpl | 8 ++ upstreamed/mediawiki/values.yaml | 8 ++ upstreamed/parse/Chart.yaml | 2 +- upstreamed/parse/README.md | 34 +++--- upstreamed/parse/templates/_helpers.tpl | 18 +++- upstreamed/parse/values.yaml | 8 ++ 30 files changed, 217 insertions(+), 81 deletions(-) diff --git a/upstreamed/dokuwiki/Chart.yaml b/upstreamed/dokuwiki/Chart.yaml index acee32306..9e5b6de85 100644 --- a/upstreamed/dokuwiki/Chart.yaml +++ b/upstreamed/dokuwiki/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: dokuwiki -version: 4.3.4 +version: 5.0.0 appVersion: 0.20180422.201901061035 description: DokuWiki is a standards-compliant, simple to use wiki optimized for creating documentation. It is targeted at developer teams, workgroups, and small companies. diff --git a/upstreamed/dokuwiki/README.md b/upstreamed/dokuwiki/README.md index f33aad844..e9c1f100a 100644 --- a/upstreamed/dokuwiki/README.md +++ b/upstreamed/dokuwiki/README.md @@ -54,6 +54,8 @@ The following table lists the configurable parameters of the DokuWiki chart and | `image.tag` | DokuWiki image tag | `{TAG_NAME}` | | `image.pullPolicy` | Image pull policy | `Always` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override dokuwiki.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override dokuwiki.fullname template with a string | `nil` | | `dokuwikiUsername` | User of the application | `user` | | `dokuwikiFullName` | User's full name | `User Name` | | `dokuwikiPassword` | Application password | _random 10 character alphanumeric string_ | diff --git a/upstreamed/dokuwiki/templates/_helpers.tpl b/upstreamed/dokuwiki/templates/_helpers.tpl index 836064c9a..3b7eab4db 100644 --- a/upstreamed/dokuwiki/templates/_helpers.tpl +++ b/upstreamed/dokuwiki/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 "dokuwiki.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/upstreamed/dokuwiki/values.yaml b/upstreamed/dokuwiki/values.yaml index d12c60090..0a23a421d 100644 --- a/upstreamed/dokuwiki/values.yaml +++ b/upstreamed/dokuwiki/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override dokuwiki.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override dokuwiki.fullname template +## +# fullnameOverride: + ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables ## diff --git a/upstreamed/drupal/Chart.yaml b/upstreamed/drupal/Chart.yaml index cf64bdfea..19f5b9498 100644 --- a/upstreamed/drupal/Chart.yaml +++ b/upstreamed/drupal/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: drupal -version: 3.3.8 +version: 4.0.0 appVersion: 8.7.4 description: One of the most versatile open source content management systems. keywords: diff --git a/upstreamed/drupal/README.md b/upstreamed/drupal/README.md index 53c2ec0a6..535bab212 100644 --- a/upstreamed/drupal/README.md +++ b/upstreamed/drupal/README.md @@ -56,6 +56,8 @@ The following table lists the configurable parameters of the Drupal chart and th | `image.tag` | Drupal Image tag | `{TAG_NAME}` | | `image.pullPolicy` | Drupal 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 drupal.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override drupal.fullname template with a string | `nil` | | `drupalProfile` | Drupal installation profile | `standard` | | `drupalUsername` | User of the application | `user` | | `drupalPassword` | Application password | _random 10 character long alphanumeric string_ | diff --git a/upstreamed/drupal/templates/_helpers.tpl b/upstreamed/drupal/templates/_helpers.tpl index 933ca769e..3e8ec59b0 100644 --- a/upstreamed/drupal/templates/_helpers.tpl +++ b/upstreamed/drupal/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 "drupal.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/upstreamed/drupal/values.yaml b/upstreamed/drupal/values.yaml index 82e49da1f..301ec6728 100644 --- a/upstreamed/drupal/values.yaml +++ b/upstreamed/drupal/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override drupal.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override drupal.fullname template +## +# fullnameOverride: + ## Installation Profile ## ref: https://github.com/bitnami/bitnami-docker-drupal#configuration ## diff --git a/upstreamed/external-dns/Chart.yaml b/upstreamed/external-dns/Chart.yaml index 60c8649c3..982bb1919 100644 --- a/upstreamed/external-dns/Chart.yaml +++ b/upstreamed/external-dns/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: external-dns -version: 2.3.2 +version: 2.3.3 appVersion: 0.5.15 description: ExternalDNS is a Kubernetes addon that configures public DNS servers with information about exposed Kubernetes services to make them discoverable. keywords: diff --git a/upstreamed/external-dns/README.md b/upstreamed/external-dns/README.md index e2b2d0628..09ba113a6 100644 --- a/upstreamed/external-dns/README.md +++ b/upstreamed/external-dns/README.md @@ -54,11 +54,13 @@ The following table lists the configurable parameters of the external-dns chart | `image.tag` | ExternalDNS Image tag | `{TAG_NAME}` | | `image.pullPolicy` | ExternalDNS 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 external-dns.fullname template with a string (will prepend the release name)| `nil` | +| `fullnameOverride` | String to fully override external-dns.fullname template with a string | `nil` | | `sources` | K8s resources type to be observed for new DNS entries by ExternalDNS | `[service, ingress]` | | `provider` | DNS provider where the DNS records will be created (mandatory) (options: aws, azure, google, ...) | `aws` | | `publishInternalServices` | Whether to publish DNS records for ClusterIP services or not | `false` | -| `aws.credentials.accessKey` | When using the AWS provider, set `aws_access_key_id` in the AWS credentials (optional) | `""` | -| `aws.credentials.secretKey` | When using the AWS provider, set `aws_secret_access_key` in the AWS credentials (optional) | `""` | +| `aws.credentials.accessKey` | When using the AWS provider, set `aws_access_key_id` in the AWS credentials (optional) | `""` | +| `aws.credentials.secretKey` | When using the AWS provider, set `aws_secret_access_key` in the AWS credentials (optional) | `""` | | `aws.credentials.mountPath` | When using the AWS provider, determine `mountPath` for `credentials` secret | `"/.aws"` | | `aws.region` | When using the AWS provider, `AWS_DEFAULT_REGION` to set in the environment (optional) | `us-east-1` | | `aws.zoneType` | When using the AWS provider, filter for zones of this type (optional, options: public, private) | `""` | @@ -78,7 +80,7 @@ The following table lists the configurable parameters of the external-dns chart | `google.serviceAccountSecret` | When using the Google provider, specify the existing secret which contains credentials.json (optional) | `""` | | `google.serviceAccountKey` | When using the Google provider, specify the service account key JSON file. (required when `google.serviceAccountSecret` is not provided. In this case a new secret will be created holding this service account | `""` | | `infoblox.gridHost` | When using the Infoblox provider, specify the Infoblox Grid host (required when provider=infoblox) | `""` | -| `infoblox.wapiUsername` | When using the Infoblox provider, specify the Infoblox WAPI username | `"admin"` | +| `infoblox.wapiUsername` | When using the Infoblox provider, specify the Infoblox WAPI username | `"admin"` | | `infoblox.wapiPassword` | When using the Infoblox provider, specify the Infoblox WAPI password (required when provider=infoblox) | `""` | | `infoblox.domainFilter` | When using the Infoblox provider, specify the domain (optional) | `""` | | `infoblox.noSslVerify` | When using the Infoblox provider, disable SSL verification (optional) | `false` | @@ -113,9 +115,9 @@ The following table lists the configurable parameters of the external-dns chart | `extraArgs` | Extra arguments to be passed to external-dns | `{}` | | `extraEnv` | Extra environment variables to be passed to external-dns | `[]` | | `replicas` | Desired number of ExternalDNS replicas | `1` | -| `affinity` | Affinity for pod assignment (this value is evaluated as a template) | `{}` | -| `nodeSelector` | Node labels for pod assignment (this value is evaluated as a template) | `{}` | -| `tolerations` | Tolerations for pod assignment (this value is evaluated as a template) | `[]` | +| `affinity` | Affinity for pod assignment (this value is evaluated as a template) | `{}` | +| `nodeSelector` | Node labels for pod assignment (this value is evaluated as a template) | `{}` | +| `tolerations` | Tolerations for pod assignment (this value is evaluated as a template) | `[]` | | `podAnnotations` | Additional annotations to apply to the pod. | `{}` | | `podLabels` | Additional labels to be added to pods | {} | | `podSecurityContext.fsGroup` | Group ID for the container | `1001` | @@ -133,7 +135,7 @@ The following table lists the configurable parameters of the external-dns chart | `rbac.create` | Wether to create & use RBAC resources or not | `false` | | `rbac.serviceAccountName` | ServiceAccount (ignored if rbac.create == true) | `default` | | `rbac.apiVersion` | Version of the RBAC API | `v1beta1` | -| `rbac.pspEnabled` | PodSecurityPolicy | `false` | +| `rbac.pspEnabled` | PodSecurityPolicy | `false` | | `resources` | CPU/Memory resource requests/limits. | `{}` | | `livenessProbe` | Deployment Liveness Probe | See `values.yaml` | | `readinessProbe` | Deployment Readiness Probe | See `values.yaml` | diff --git a/upstreamed/jasperreports/Chart.yaml b/upstreamed/jasperreports/Chart.yaml index b68cb9d39..e9025882a 100644 --- a/upstreamed/jasperreports/Chart.yaml +++ b/upstreamed/jasperreports/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: jasperreports -version: 4.2.8 +version: 5.0.0 appVersion: 7.2.0 description: The JasperReports server can be used as a stand-alone or embedded reporting and BI server that offers web-based reporting, analytic tools and visualization, diff --git a/upstreamed/jasperreports/README.md b/upstreamed/jasperreports/README.md index d13aa13bf..a0b2644f5 100644 --- a/upstreamed/jasperreports/README.md +++ b/upstreamed/jasperreports/README.md @@ -47,55 +47,57 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the JasperReports 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` | JasperReports image registry | `docker.io` | -| `image.repository` | JasperReports Image name | `bitnami/jasperreports` | -| `image.tag` | JasperReports 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) | -| `jasperreportsUsername` | User of the application | `user` | -| `jasperreportsPassword` | Application password | _random 10 character long alphanumeric string_ | -| `jasperreportsEmail` | User email | `user@example.com` | -| `smtpHost` | SMTP host | `nil` | -| `smtpPort` | SMTP port | `nil` | -| `smtpEmail` | SMTP email | `nil` | -| `smtpUser` | SMTP user | `nil` | -| `smtpPassword` | SMTP password | `nil` | -| `smtpProtocol` | SMTP protocol [`ssl`, `none`] | `nil` | -| `allowEmptyPassword` | Allow DB blank passwords | `yes` | -| `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 JasperReports installation | `jasperreports.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) | `jasperreports.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` | -| `externalDatabase.host` | Host of the external database | `nil` | -| `externalDatabase.port` | Port of the external database | `3306` | -| `externalDatabase.user` | Existing username in the external db | `bn_jasperreports` | -| `externalDatabase.password` | Password for the above username | `nil` | -| `externalDatabase.database` | Name of the existing database | `bitnami_jasperreports` | -| `mariadb.enabled` | Whether to use the MariaDB chart | `true` | -| `mariadb.db.name` | Database name to create | `bitnami_jasperreports` | -| `mariadb.db.user` | Database user to create | `bn_jasperreports` | -| `mariadb.db.password` | Password for the database | `nil` | -| `mariadb.rootUser.password` | MariaDB admin password | `nil` | -| `service.type` | Kubernetes Service type | `LoadBalancer` | -| `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` | -| `service.port` | Service HTTP port | `80` | -| `service.nodePorts.http` | Kubernetes http node port | `""` | -| `persistence.enabled` | Enable persistence using PVC | `true` | -| `persistence.storageClass` | PVC Storage Class for JasperReports volume | `nil` (uses alpha storage annotation) | -| `persistence.accessMode` | PVC Access Mode for JasperReports volume | `ReadWriteOnce` | -| `persistence.size` | PVC Storage Request for JasperReports volume | `8Gi` | -| `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | +| 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` | JasperReports image registry | `docker.io` | +| `image.repository` | JasperReports Image name | `bitnami/jasperreports` | +| `image.tag` | JasperReports 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 jasperreports.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override jasperreports.fullname template with a string | `nil` | +| `jasperreportsUsername` | User of the application | `user` | +| `jasperreportsPassword` | Application password | _random 10 character long alphanumeric string_ | +| `jasperreportsEmail` | User email | `user@example.com` | +| `smtpHost` | SMTP host | `nil` | +| `smtpPort` | SMTP port | `nil` | +| `smtpEmail` | SMTP email | `nil` | +| `smtpUser` | SMTP user | `nil` | +| `smtpPassword` | SMTP password | `nil` | +| `smtpProtocol` | SMTP protocol [`ssl`, `none`] | `nil` | +| `allowEmptyPassword` | Allow DB blank passwords | `yes` | +| `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 JasperReports installation | `jasperreports.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) | `jasperreports.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` | +| `externalDatabase.host` | Host of the external database | `nil` | +| `externalDatabase.port` | Port of the external database | `3306` | +| `externalDatabase.user` | Existing username in the external db | `bn_jasperreports` | +| `externalDatabase.password` | Password for the above username | `nil` | +| `externalDatabase.database` | Name of the existing database | `bitnami_jasperreports` | +| `mariadb.enabled` | Whether to use the MariaDB chart | `true` | +| `mariadb.db.name` | Database name to create | `bitnami_jasperreports` | +| `mariadb.db.user` | Database user to create | `bn_jasperreports` | +| `mariadb.db.password` | Password for the database | `nil` | +| `mariadb.rootUser.password` | MariaDB admin password | `nil` | +| `service.type` | Kubernetes Service type | `LoadBalancer` | +| `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` | +| `service.port` | Service HTTP port | `80` | +| `service.nodePorts.http` | Kubernetes http node port | `""` | +| `persistence.enabled` | Enable persistence using PVC | `true` | +| `persistence.storageClass` | PVC Storage Class for JasperReports volume | `nil` (uses alpha storage annotation) | +| `persistence.accessMode` | PVC Access Mode for JasperReports volume | `ReadWriteOnce` | +| `persistence.size` | PVC Storage Request for JasperReports volume | `8Gi` | +| `resources` | CPU/Memory resource requests/limits | `{Memory: 512Mi, CPU: 300m}` | The above parameters map to the env variables defined in [bitnami/jasperreports](http://github.com/bitnami/bitnami-docker-jasperreports). For more information please refer to the [bitnami/jasperreports](http://github.com/bitnami/bitnami-docker-jasperreports) image documentation. diff --git a/upstreamed/jasperreports/templates/_helpers.tpl b/upstreamed/jasperreports/templates/_helpers.tpl index ca05bc7fa..0253a76f8 100644 --- a/upstreamed/jasperreports/templates/_helpers.tpl +++ b/upstreamed/jasperreports/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 "jasperreports.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/upstreamed/jasperreports/values.yaml b/upstreamed/jasperreports/values.yaml index 881089519..978f62aff 100644 --- a/upstreamed/jasperreports/values.yaml +++ b/upstreamed/jasperreports/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override jasperreports.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override jasperreports.fullname template +## +# fullnameOverride: + ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-jasperreports#configuration ## diff --git a/upstreamed/joomla/Chart.yaml b/upstreamed/joomla/Chart.yaml index db5440f7d..9cd16a656 100644 --- a/upstreamed/joomla/Chart.yaml +++ b/upstreamed/joomla/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: joomla -version: 4.3.8 +version: 5.0.0 appVersion: 3.9.9 description: PHP content management system (CMS) for publishing web content keywords: diff --git a/upstreamed/joomla/README.md b/upstreamed/joomla/README.md index ca0560472..424c283ea 100644 --- a/upstreamed/joomla/README.md +++ b/upstreamed/joomla/README.md @@ -56,6 +56,8 @@ The following table lists the configurable parameters of the Joomla! chart and t | `image.tag` | Joomla! Image tag | `{TAG_NAME}` | | `image.pullPolicy` | Image pull policy | `Always` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override joomla.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override joomla.fullname template with a string | `nil` | | `joomlaUsername` | User of the application | `user` | | `joomlaPassword` | Application password | _random 10 character long alphanumeric string_ | | `joomlaEmail` | Admin email | `user@example.com` | diff --git a/upstreamed/joomla/templates/_helpers.tpl b/upstreamed/joomla/templates/_helpers.tpl index 9862ea702..d81e51cd6 100644 --- a/upstreamed/joomla/templates/_helpers.tpl +++ b/upstreamed/joomla/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 "joomla.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/upstreamed/joomla/values.yaml b/upstreamed/joomla/values.yaml index f6e493516..eef09990d 100644 --- a/upstreamed/joomla/values.yaml +++ b/upstreamed/joomla/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override joomla.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override joomla.fullname template +## +# fullnameOverride: + ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-joomla#environment-variables ## diff --git a/upstreamed/mariadb/Chart.yaml b/upstreamed/mariadb/Chart.yaml index 39849274b..04cf5f261 100644 --- a/upstreamed/mariadb/Chart.yaml +++ b/upstreamed/mariadb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mariadb -version: 6.5.8 +version: 6.5.9 appVersion: 10.3.16 description: Fast, reliable, scalable, and easy to use open-source relational database system. MariaDB Server is intended for mission-critical, heavy-load production systems as well as for embedding into mass-deployed software. Highly available MariaDB cluster. keywords: diff --git a/upstreamed/mariadb/README.md b/upstreamed/mariadb/README.md index b1ba58126..7198ec18f 100644 --- a/upstreamed/mariadb/README.md +++ b/upstreamed/mariadb/README.md @@ -57,6 +57,8 @@ The following table lists the configurable parameters of the MariaDB chart and t | `image.pullPolicy` | MariaDB 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 mariadb.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override mariadb.fullname template with a string | `nil` | | `service.type` | Kubernetes service type | `ClusterIP` | | `service.clusterIp` | Specific cluster IP when service type is cluster IP. Use None for headless service | `nil` | | `service.port` | MySQL service port | `3306` | diff --git a/upstreamed/mariadb/values-production.yaml b/upstreamed/mariadb/values-production.yaml index 9fea62c77..d35847d3f 100644 --- a/upstreamed/mariadb/values-production.yaml +++ b/upstreamed/mariadb/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 mariadb.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override mariadb.fullname template +## +# fullnameOverride: + service: ## Kubernetes service type, ClusterIP and NodePort are supported at present type: ClusterIP diff --git a/upstreamed/mariadb/values.yaml b/upstreamed/mariadb/values.yaml index acd242f06..2c4d73f29 100644 --- a/upstreamed/mariadb/values.yaml +++ b/upstreamed/mariadb/values.yaml @@ -36,6 +36,14 @@ image: ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging debug: false +## String to partially override mariadb.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override mariadb.fullname template +## +# fullnameOverride: + service: ## Kubernetes service type, ClusterIP and NodePort are supported at present type: ClusterIP diff --git a/upstreamed/mediawiki/Chart.yaml b/upstreamed/mediawiki/Chart.yaml index 75ec08b90..45674b6ff 100644 --- a/upstreamed/mediawiki/Chart.yaml +++ b/upstreamed/mediawiki/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mediawiki -version: 6.3.8 +version: 7.0.0 appVersion: 1.33.0 description: Extremely powerful, scalable software and a feature-rich wiki implementation that uses PHP to process and display data stored in a database. home: http://www.mediawiki.org/ diff --git a/upstreamed/mediawiki/README.md b/upstreamed/mediawiki/README.md index d0d9b178c..657c76981 100644 --- a/upstreamed/mediawiki/README.md +++ b/upstreamed/mediawiki/README.md @@ -56,6 +56,8 @@ The following table lists the configurable parameters of the MediaWiki chart and | `image.tag` | MediaWiki 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 mediawiki.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override mediawiki.fullname template with a string | `nil` | | `mediawikiUser` | User of the application | `user` | | `mediawikiPassword` | Application password | _random 10 character long alphanumeric string_ | | `mediawikiEmail` | Admin email | `user@example.com` | diff --git a/upstreamed/mediawiki/templates/_helpers.tpl b/upstreamed/mediawiki/templates/_helpers.tpl index 57adf0e7e..3f75466fe 100644 --- a/upstreamed/mediawiki/templates/_helpers.tpl +++ b/upstreamed/mediawiki/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 "mediawiki.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/upstreamed/mediawiki/values.yaml b/upstreamed/mediawiki/values.yaml index 3685f6a02..4660228b7 100644 --- a/upstreamed/mediawiki/values.yaml +++ b/upstreamed/mediawiki/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override mediawiki.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override mediawiki.fullname template +## +# fullnameOverride: + ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-mediawiki#environment-variables ## diff --git a/upstreamed/parse/Chart.yaml b/upstreamed/parse/Chart.yaml index bd2b21774..e2a0bad10 100644 --- a/upstreamed/parse/Chart.yaml +++ b/upstreamed/parse/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: parse -version: 6.2.16 +version: 7.0.0 appVersion: 3.6.0 description: Parse is a platform that enables users to add a scalable and powerful backend to launch a full-featured app for iOS, Android, JavaScript, Windows, Unity, and more. keywords: diff --git a/upstreamed/parse/README.md b/upstreamed/parse/README.md index eaf9b4cd5..f66aad4ea 100644 --- a/upstreamed/parse/README.md +++ b/upstreamed/parse/README.md @@ -49,6 +49,8 @@ The following table lists the configurable parameters of the Parse chart and the |---------------------------------------|------------------------------------------|-------------------------------------------------------- | | `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) | +| `nameOverride` | String to partially override parse.fullname template with a string (will prepend the release name) | `nil`| +| `fullnameOverride` | String to fully override parse.fullname template with a string | `nil`| | `service.type` | Kubernetes Service type | `LoadBalancer` | | `service.port` | Service HTTP port (Dashboard) | `80` | | `service.loadBalancerIP` | `loadBalancerIP` for the Parse Service | `nil` | @@ -84,22 +86,22 @@ The following table lists the configurable parameters of the Parse chart and the | `persistence.storageClass` | PVC Storage Class for Parse volume | `nil` (uses alpha storage class annotation) | | `persistence.accessMode` | PVC Access Mode for Parse volume | `ReadWriteOnce` | | `persistence.size` | PVC Storage Request for Parse volume | `8Gi` | -| `ingress.enabled` | Enable ingress controller resource | `false` | -| `ingress.annotations` | Ingress annotations | `[]` | -| `ingress.certManager` | Add annotations for cert-manager | `false` | -| `ingress.dashboard.hosts[0].name` | Hostname to your Parse Dashboard installation | `ghost.local` | -| `ingress.dashboard.hosts[0].path` | Path within the url structure | `/` | -| `ingress.dashboard.hosts[0].tls` | Utilize TLS backend in ingress | `false` | -| `ingress.dashboard.hosts[0].tlsHosts` | Array of TLS hosts for ingress record (defaults to `ingress.hosts[0].name` if `nil`) | `nil` | -| `ingress.dashboard.hosts[0].tlsSecret` | TLS Secret (certificates) | `ghost.local-tls-secret` | -| `ingress.server.hosts[0].name` | Hostname to your Parse Server installation | `ghost.local` | -| `ingress.server.hosts[0].path` | Path within the url structure | `/` | -| `ingress.server.hosts[0].tls` | Utilize TLS backend in ingress | `false` | -| `ingress.server.hosts[0].tlsHosts` | Array of TLS hosts for ingress record (defaults to `ingress.hosts[0].name` if `nil`) | `nil` | -| `ingress.server.hosts[0].tlsSecret` | TLS Secret (certificates) | `ghost.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` | +| `ingress.enabled` | Enable ingress controller resource | `false` | +| `ingress.annotations` | Ingress annotations | `[]` | +| `ingress.certManager` | Add annotations for cert-manager | `false` | +| `ingress.dashboard.hosts[0].name` | Hostname to your Parse Dashboard installation | `ghost.local` | +| `ingress.dashboard.hosts[0].path` | Path within the url structure | `/` | +| `ingress.dashboard.hosts[0].tls` | Utilize TLS backend in ingress | `false` | +| `ingress.dashboard.hosts[0].tlsHosts` | Array of TLS hosts for ingress record (defaults to `ingress.hosts[0].name` if `nil`) | `nil` | +| `ingress.dashboard.hosts[0].tlsSecret`| TLS Secret (certificates) | `ghost.local-tls-secret` | +| `ingress.server.hosts[0].name` | Hostname to your Parse Server installation | `ghost.local` | +| `ingress.server.hosts[0].path` | Path within the url structure | `/` | +| `ingress.server.hosts[0].tls` | Utilize TLS backend in ingress | `false` | +| `ingress.server.hosts[0].tlsHosts` | Array of TLS hosts for ingress record (defaults to `ingress.hosts[0].name` if `nil`) | `nil` | +| `ingress.server.hosts[0].tlsSecret` | TLS Secret (certificates) | `ghost.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` | | `mongodb.usePassword` | Enable MongoDB password authentication | `true` | | `mongodb.password` | MongoDB admin password | `nil` | | `mongodb.persistence.enabled` | Enable MongoDB persistence using PVC | `true` | diff --git a/upstreamed/parse/templates/_helpers.tpl b/upstreamed/parse/templates/_helpers.tpl index 39a34e9dc..845a79a4d 100644 --- a/upstreamed/parse/templates/_helpers.tpl +++ b/upstreamed/parse/templates/_helpers.tpl @@ -18,16 +18,32 @@ 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 "parse.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. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "parse.mongodb.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- printf "%s-%s" .Values.fullnameOverride "mongodb" | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} {{- printf "%s-%s" .Release.Name "mongodb" | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s-%s" .Release.Name $name "mongodb" | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/parse/values.yaml b/upstreamed/parse/values.yaml index e36c457a4..2c8be5979 100644 --- a/upstreamed/parse/values.yaml +++ b/upstreamed/parse/values.yaml @@ -7,6 +7,14 @@ # imagePullSecrets: # - myRegistryKeySecretName +## String to partially override parse.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override parse.fullname template +## +# fullnameOverride: + ## Kubernetes serviceType for Parse Deployment ## ref: http://kubernetes.io/docs/user-guide/services/#publishing-services---service-types ## From 340aba24432d5a68e0e2648523dcb7782935a3d9 Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Thu, 18 Jul 2019 13:34:58 +0000 Subject: [PATCH 10/17] Synchronize upstreamed folder to 0a3f6842a --- upstreamed/ghost/Chart.yaml | 2 +- upstreamed/ghost/README.md | 6 +- upstreamed/ghost/values.yaml | 8 ++ upstreamed/kubewatch/Chart.yaml | 2 +- upstreamed/kubewatch/README.md | 88 ++++++++++---------- upstreamed/kubewatch/values.yaml | 8 ++ upstreamed/moodle/Chart.yaml | 2 +- upstreamed/moodle/README.md | 2 + upstreamed/moodle/templates/_helpers.tpl | 23 +++-- upstreamed/moodle/templates/deployment.yaml | 2 +- upstreamed/moodle/values.yaml | 8 ++ upstreamed/nats/Chart.yaml | 2 +- upstreamed/nats/README.md | 2 + upstreamed/nats/templates/_helpers.tpl | 8 ++ upstreamed/nats/values-production.yaml | 8 ++ upstreamed/nats/values.yaml | 8 ++ upstreamed/odoo/Chart.yaml | 2 +- upstreamed/odoo/README.md | 2 + upstreamed/odoo/templates/_helpers.tpl | 8 ++ upstreamed/odoo/values.yaml | 8 ++ upstreamed/postgresql/Chart.yaml | 2 +- upstreamed/postgresql/README.md | 2 + upstreamed/postgresql/templates/_helpers.tpl | 9 +- upstreamed/postgresql/values-production.yaml | 8 ++ upstreamed/postgresql/values.yaml | 8 ++ upstreamed/prestashop/Chart.yaml | 2 +- upstreamed/prestashop/README.md | 2 + upstreamed/prestashop/templates/_helpers.tpl | 8 ++ upstreamed/prestashop/values.yaml | 8 ++ upstreamed/rabbitmq/Chart.yaml | 2 +- upstreamed/rabbitmq/README.md | 2 + upstreamed/rabbitmq/values-production.yaml | 12 ++- upstreamed/rabbitmq/values.yaml | 8 ++ upstreamed/suitecrm/Chart.yaml | 2 +- upstreamed/suitecrm/README.md | 4 +- upstreamed/suitecrm/templates/_helpers.tpl | 8 ++ upstreamed/suitecrm/values.yaml | 8 ++ upstreamed/wordpress/Chart.yaml | 2 +- upstreamed/wordpress/README.md | 2 + upstreamed/wordpress/templates/_helpers.tpl | 9 +- upstreamed/wordpress/values-production.yaml | 8 ++ upstreamed/wordpress/values.yaml | 8 ++ 42 files changed, 253 insertions(+), 70 deletions(-) diff --git a/upstreamed/ghost/Chart.yaml b/upstreamed/ghost/Chart.yaml index 6676ebfc9..09c85b191 100644 --- a/upstreamed/ghost/Chart.yaml +++ b/upstreamed/ghost/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: ghost -version: 6.7.30 +version: 6.7.31 appVersion: 2.25.7 description: A simple, powerful publishing platform that allows you to share your stories with the world keywords: diff --git a/upstreamed/ghost/README.md b/upstreamed/ghost/README.md index 7e99ea0d9..2c8063504 100644 --- a/upstreamed/ghost/README.md +++ b/upstreamed/ghost/README.md @@ -56,12 +56,14 @@ The following table lists the configurable parameters of the Ghost chart and the | `image.tag` | Ghost 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 ghost.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override ghost.fullname template with a string | `nil` | | `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | | `volumePermissions.image.repository`| Init container volume-permissions image name | `bitnami/minideb` | | `volumePermissions.image.tag` | Init container volume-permissions image tag | `latest` | | `volumePermissions.image.pullPolicy`| Init container volume-permissions image pull policy | `Always` | | `ghostHost` | Ghost host to create application URLs | `nil` | -| `ghostPort` | Ghost port to use in application URLs (defaults to `service.port` if `nil`) | `nil` | +| `ghostPort` | Ghost port to use in application URLs (defaults to `service.port` if `nil`) | `nil` | | `ghostProtocol` | Protocol (http or https) to use in the application URLs | `http` | | `ghostPath` | Ghost path to create application URLs | `nil` | | `ghostUsername` | User of the application | `user@example.com` | @@ -83,7 +85,7 @@ The following table lists the configurable parameters of the Ghost chart and the | `service.nodePorts.http` | Kubernetes http node port | `""` | | `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` | | `service.loadBalancerIP` | LoadBalancerIP for the Ghost service | `` | -| `service.annotations` | Service annotations | `` | +| `service.annotations` | Service annotations | `` | | `ingress.enabled` | Enable ingress controller resource | `false` | | `ingress.annotations` | Ingress annotations | `[]` | | `ingress.certManager` | Add annotations for cert-manager | `false` | diff --git a/upstreamed/ghost/values.yaml b/upstreamed/ghost/values.yaml index a816efa34..05dfee8a8 100644 --- a/upstreamed/ghost/values.yaml +++ b/upstreamed/ghost/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override ghost.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override ghost.fullname template +## +# fullnameOverride: + ## Init containers parameters: ## volumePermissions: Change the owner of the persist volume mountpoint to RunAsUser:fsGroup ## diff --git a/upstreamed/kubewatch/Chart.yaml b/upstreamed/kubewatch/Chart.yaml index 04623a90b..800184ecf 100644 --- a/upstreamed/kubewatch/Chart.yaml +++ b/upstreamed/kubewatch/Chart.yaml @@ -1,5 +1,5 @@ name: kubewatch -version: 0.8.4 +version: 0.8.5 apiVersion: v1 appVersion: 0.0.4 home: https://github.com/bitnami-labs/kubewatch diff --git a/upstreamed/kubewatch/README.md b/upstreamed/kubewatch/README.md index 88bf2486f..da12e6543 100644 --- a/upstreamed/kubewatch/README.md +++ b/upstreamed/kubewatch/README.md @@ -37,49 +37,51 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the kubewatch 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) | -| `affinity` | node/pod affinities | None | -| `image.registry` | Image registry | `docker.io` | -| `image.repository` | Image repository | `bitnami/kubewatch` | -| `image.tag` | Image tag | `{VERSION}` | -| `image.pullPolicy` | Image pull policy | `Always` | -| `nodeSelector` | node labels for pod assignment | `{}` | -| `podAnnotations` | annotations to add to each pod | `{}` | -| `podLabels` | additional labesl to add to each pod | `{}` | -| `replicaCount` | desired number of pods | `1` | -| `rbac.create` | If true, create & use RBAC resources | `true` | -| `serviceAccount.create` | If true, create a serviceAccount | `true` | -| `serviceAccount.name` | existing ServiceAccount to use (ignored if rbac.create=true) | `` | -| `resources` | pod resource requests & limits | `{}` | -| `slack.enabled` | Enable Slack notifications | `true` | -| `slack.channel` | Slack channel to notify | `""` | -| `slack.token` | Slack API token | `""` | -| `hipchat.enabled` | Enable HipChat notifications | `false` | -| `hipchat.url` | HipChat URL | `""` | -| `hipchat.room` | HipChat room to notify | `""` | -| `hipchat.token` | HipChat token | `""` | -| `mattermost.enabled` | Enable Mattermost notifications | `false` | -| `mattermost.channel` | Mattermost channel to notify | `""` | -| `mattermost.username` | Mattermost user to notify | `""` | -| `mattermost.url` | Mattermost URL | `""` | -| `flock.enabled` | Enable Flock notifications | `false` | -| `flock.url` | Flock URL | `""` | -| `webhook.enabled` | Enable Webhook notifications | `false` | -| `webhook.url` | Webhook URL | `""` | -| `tolerations` | List of node taints to tolerate (requires Kubernetes >= 1.6) | `[]` | -| `namespaceToWatch` | namespace to watch, leave it empty for watching all | `""` | -| `resourcesToWatch` | list of resources which kubewatch should watch and notify slack | `{pod: true, deployment: true}` | -| `resourcesToWatch.pod` | watch changes to [Pods](https://kubernetes.io/docs/concepts/workloads/pods/pod-overview/) | `true` | -| `resourcesToWatch.deployment` | watch changes to [Deployments](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) | `true` | -| `resourcesToWatch.replicationcontroller` | watch changes to [ReplicationControllers](https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/) | `false` | -| `resourcesToWatch.replicaset` | watch changes to [ReplicaSets](https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/) | `false` | -| `resourcesToWatch.daemonset` | watch changes to [DaemonSets](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) | `false` | -| `resourcesToWatch.services` | watch changes to [Services](https://kubernetes.io/docs/concepts/services-networking/service/) | `false` | -| `resourcesToWatch.job` | watch changes to [Jobs](https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/) | `false` | -| `resourcesToWatch.persistentvolume` | watch changes to [PersistentVolumes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/) | `false` | +| 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) | +| `affinity` | node/pod affinities | None | +| `image.registry` | Image registry | `docker.io` | +| `image.repository` | Image repository | `bitnami/kubewatch` | +| `image.tag` | Image tag | `{VERSION}` | +| `image.pullPolicy` | Image pull policy | `Always` | +| `nameOverride` | String to partially override kubewatch.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override kubewatch.fullname template with a string | `nil` | +| `nodeSelector` | node labels for pod assignment | `{}` | +| `podAnnotations` | annotations to add to each pod | `{}` | +| `podLabels` | additional labesl to add to each pod | `{}` | +| `replicaCount` | desired number of pods | `1` | +| `rbac.create` | If true, create & use RBAC resources | `true` | +| `serviceAccount.create` | If true, create a serviceAccount | `true` | +| `serviceAccount.name` | existing ServiceAccount to use (ignored if rbac.create=true) | `` | +| `resources` | pod resource requests & limits | `{}` | +| `slack.enabled` | Enable Slack notifications | `true` | +| `slack.channel` | Slack channel to notify | `""` | +| `slack.token` | Slack API token | `""` | +| `hipchat.enabled` | Enable HipChat notifications | `false` | +| `hipchat.url` | HipChat URL | `""` | +| `hipchat.room` | HipChat room to notify | `""` | +| `hipchat.token` | HipChat token | `""` | +| `mattermost.enabled` | Enable Mattermost notifications | `false` | +| `mattermost.channel` | Mattermost channel to notify | `""` | +| `mattermost.username` | Mattermost user to notify | `""` | +| `mattermost.url` | Mattermost URL | `""` | +| `flock.enabled` | Enable Flock notifications | `false` | +| `flock.url` | Flock URL | `""` | +| `webhook.enabled` | Enable Webhook notifications | `false` | +| `webhook.url` | Webhook URL | `""` | +| `tolerations` | List of node taints to tolerate (requires Kubernetes >= 1.6) | `[]` | +| `namespaceToWatch` | namespace to watch, leave it empty for watching all | `""` | +| `resourcesToWatch` | list of resources which kubewatch should watch and notify slack | `{pod: true, deployment: true}` | +| `resourcesToWatch.pod` | watch changes to [Pods](https://kubernetes.io/docs/concepts/workloads/pods/pod-overview/) | `true` | +| `resourcesToWatch.deployment` | watch changes to [Deployments](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) | `true` | +| `resourcesToWatch.replicationcontroller` | watch changes to [ReplicationControllers](https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/) | `false` | +| `resourcesToWatch.replicaset` | watch changes to [ReplicaSets](https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/) | `false` | +| `resourcesToWatch.daemonset` | watch changes to [DaemonSets](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) | `false` | +| `resourcesToWatch.services` | watch changes to [Services](https://kubernetes.io/docs/concepts/services-networking/service/) | `false` | +| `resourcesToWatch.job` | watch changes to [Jobs](https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/) | `false` | +| `resourcesToWatch.persistentvolume` | watch changes to [PersistentVolumes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/) | `false` | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, diff --git a/upstreamed/kubewatch/values.yaml b/upstreamed/kubewatch/values.yaml index e8748c3ec..f236d3e7b 100644 --- a/upstreamed/kubewatch/values.yaml +++ b/upstreamed/kubewatch/values.yaml @@ -58,6 +58,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override kubewatch.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override kubewatch.fullname template +## +# fullnameOverride: + rbac: # If true, create & use RBAC resources # diff --git a/upstreamed/moodle/Chart.yaml b/upstreamed/moodle/Chart.yaml index 3025ce77e..c0b35b301 100644 --- a/upstreamed/moodle/Chart.yaml +++ b/upstreamed/moodle/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: moodle -version: 4.2.10 +version: 5.0.0 appVersion: 3.7.1 description: Moodle is a learning platform designed to provide educators, administrators and learners with a single robust, secure and integrated system to create personalised learning environments keywords: diff --git a/upstreamed/moodle/README.md b/upstreamed/moodle/README.md index 4056bc7da..c3596bff0 100644 --- a/upstreamed/moodle/README.md +++ b/upstreamed/moodle/README.md @@ -56,6 +56,8 @@ The following table lists the configurable parameters of the Moodle chart and th | `image.tag` | Moodle 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 moodle.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override moodle.fullname template with a string | `nil` | | `moodleUsername` | User of the application | `user` | | `moodlePassword` | Application password | _random 10 character alphanumeric string_ | | `moodleEmail` | Admin email | `user@example.com` | diff --git a/upstreamed/moodle/templates/_helpers.tpl b/upstreamed/moodle/templates/_helpers.tpl index ae6ee9a05..6f7c22e05 100644 --- a/upstreamed/moodle/templates/_helpers.tpl +++ b/upstreamed/moodle/templates/_helpers.tpl @@ -11,24 +11,33 @@ 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 "moodle.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. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "moodle.mariadb.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- printf "%s-%s" .Values.fullnameOverride "mariadb" | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} {{- printf "%s-%s" .Release.Name "mariadb" | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s-%s" .Release.Name $name "mariadb" | 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 "moodle.moodle.fullname" -}} -{{- printf "%s-%s" .Release.Name "moodle" | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* diff --git a/upstreamed/moodle/templates/deployment.yaml b/upstreamed/moodle/templates/deployment.yaml index b8b3a1559..18df17325 100644 --- a/upstreamed/moodle/templates/deployment.yaml +++ b/upstreamed/moodle/templates/deployment.yaml @@ -154,7 +154,7 @@ spec: - name: moodle-data {{- if .Values.persistence.enabled }} persistentVolumeClaim: - claimName: {{ .Values.persistence.existingClaim | default (include "moodle.moodle.fullname" . ) }} + claimName: {{ .Values.persistence.existingClaim | default (include "moodle.fullname" . ) }} {{- else }} emptyDir: {} {{- end }} diff --git a/upstreamed/moodle/values.yaml b/upstreamed/moodle/values.yaml index f02189e42..f4b27143a 100644 --- a/upstreamed/moodle/values.yaml +++ b/upstreamed/moodle/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override moodle.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override moodle.fullname template +## +# fullnameOverride: + ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-moodle#configuration ## diff --git a/upstreamed/nats/Chart.yaml b/upstreamed/nats/Chart.yaml index 18f715de4..ecc7db57c 100644 --- a/upstreamed/nats/Chart.yaml +++ b/upstreamed/nats/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: nats -version: 3.0.4 +version: 4.0.0 appVersion: 2.0.2 description: An open-source, cloud-native messaging system keywords: diff --git a/upstreamed/nats/README.md b/upstreamed/nats/README.md index e2b253f13..31d4097f9 100644 --- a/upstreamed/nats/README.md +++ b/upstreamed/nats/README.md @@ -54,6 +54,8 @@ The following table lists the configurable parameters of the NATS chart and thei | `image.tag` | NATS 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 nats.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override nats.fullname template with a string | `nil` | | `auth.enabled` | Switch to enable/disable client authentication | `true` | | `auth.user` | Client authentication user | `nats_cluster` | | `auth.password` | Client authentication password | `random alhpanumeric string (10)` | diff --git a/upstreamed/nats/templates/_helpers.tpl b/upstreamed/nats/templates/_helpers.tpl index 6159ca095..b52eed847 100644 --- a/upstreamed/nats/templates/_helpers.tpl +++ b/upstreamed/nats/templates/_helpers.tpl @@ -12,9 +12,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 "nats.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 -}} {{- define "nats.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} diff --git a/upstreamed/nats/values-production.yaml b/upstreamed/nats/values-production.yaml index ed41dd43d..0d3c812ac 100644 --- a/upstreamed/nats/values-production.yaml +++ b/upstreamed/nats/values-production.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - name: myRegistryKeySecretName +## String to partially override nats.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override nats.fullname template +## +# fullnameOverride: + ## NATS replicas replicaCount: 3 diff --git a/upstreamed/nats/values.yaml b/upstreamed/nats/values.yaml index 5bbc26a90..e9c3f6a86 100644 --- a/upstreamed/nats/values.yaml +++ b/upstreamed/nats/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - name: myRegistryKeySecretName +## String to partially override nats.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override nats.fullname template +## +# fullnameOverride: + ## NATS replicas replicaCount: 1 diff --git a/upstreamed/odoo/Chart.yaml b/upstreamed/odoo/Chart.yaml index 5d5c3189b..bd34c5ea3 100644 --- a/upstreamed/odoo/Chart.yaml +++ b/upstreamed/odoo/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: odoo -version: 8.1.8 +version: 9.0.0 appVersion: 12.0.20190715 description: A suite of web based open source business apps. home: https://www.odoo.com/ diff --git a/upstreamed/odoo/README.md b/upstreamed/odoo/README.md index ebc0e16dc..243c84977 100644 --- a/upstreamed/odoo/README.md +++ b/upstreamed/odoo/README.md @@ -56,6 +56,8 @@ The following table lists the configurable parameters of the Odoo chart and thei | `image.tag` | Odoo Image tag | `{TAG_NAME}` | | `image.pullPolicy` | Image pull policy | `Always` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override odoo.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override odoo.fullname template with a string | `nil` | | `odooUsername` | User of the application | `user@example.com` | | `odooPassword` | Admin account password | _random 10 character long alphanumeric string_ | | `odooEmail` | Admin account email | `user@example.com` | diff --git a/upstreamed/odoo/templates/_helpers.tpl b/upstreamed/odoo/templates/_helpers.tpl index fd57f8739..a2b9c2bf5 100644 --- a/upstreamed/odoo/templates/_helpers.tpl +++ b/upstreamed/odoo/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 "odoo.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/upstreamed/odoo/values.yaml b/upstreamed/odoo/values.yaml index 5174ab49c..dbf7c04a4 100644 --- a/upstreamed/odoo/values.yaml +++ b/upstreamed/odoo/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override odoo.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override odoo.fullname template +## +# fullnameOverride: + ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-odoo#configuration ## diff --git a/upstreamed/postgresql/Chart.yaml b/upstreamed/postgresql/Chart.yaml index 1418e9886..c44f41859 100644 --- a/upstreamed/postgresql/Chart.yaml +++ b/upstreamed/postgresql/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: postgresql -version: 5.3.13 +version: 6.0.0 appVersion: 11.4.0 description: Chart for PostgreSQL, an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance. keywords: diff --git a/upstreamed/postgresql/README.md b/upstreamed/postgresql/README.md index 8e7d48132..34d68a557 100644 --- a/upstreamed/postgresql/README.md +++ b/upstreamed/postgresql/README.md @@ -60,6 +60,8 @@ The following tables lists the configurable parameters of the PostgreSQL chart a | `image.pullPolicy` | PostgreSQL Image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify Image pull secrets | `nil` (does not add image pull secrets to deployed pods) | | `image.debug` | Specify if debug values should be set | `false` | +| `nameOverride` | String to partially override postgresql.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override postgresql.fullname template with a string | `nil` | | `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | | `volumePermissions.image.repository` | Init container volume-permissions image name | `bitnami/minideb` | | `volumePermissions.image.tag` | Init container volume-permissions image tag | `latest` | diff --git a/upstreamed/postgresql/templates/_helpers.tpl b/upstreamed/postgresql/templates/_helpers.tpl index 27f73c6c2..2c456f636 100644 --- a/upstreamed/postgresql/templates/_helpers.tpl +++ b/upstreamed/postgresql/templates/_helpers.tpl @@ -12,13 +12,16 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this */}} {{- define "postgresql.fullname" -}} {{- if .Values.fullnameOverride -}} -{{- printf .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- .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. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). @@ -309,4 +312,4 @@ Get the readiness probe command {{- if contains "bitnami/" .Values.image.repository }} [ -f /opt/bitnami/postgresql/tmp/.initialized ] {{- end -}} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/upstreamed/postgresql/values-production.yaml b/upstreamed/postgresql/values-production.yaml index b44ff8760..a68d5cdf2 100644 --- a/upstreamed/postgresql/values-production.yaml +++ b/upstreamed/postgresql/values-production.yaml @@ -32,6 +32,14 @@ image: ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging debug: false +## String to partially override postgresql.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override postgresql.fullname template +## +# fullnameOverride: + ## ## Init containers parameters: ## volumePermissions: Change the owner of the persist volume mountpoint to RunAsUser:fsGroup diff --git a/upstreamed/postgresql/values.yaml b/upstreamed/postgresql/values.yaml index 259f856d4..2aadc70b2 100644 --- a/upstreamed/postgresql/values.yaml +++ b/upstreamed/postgresql/values.yaml @@ -32,6 +32,14 @@ image: ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging debug: false +## String to partially override postgresql.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override postgresql.fullname template +## +# fullnameOverride: + ## ## Init containers parameters: ## volumePermissions: Change the owner of the persist volume mountpoint to RunAsUser:fsGroup diff --git a/upstreamed/prestashop/Chart.yaml b/upstreamed/prestashop/Chart.yaml index 4d38afda0..b6e318c4f 100644 --- a/upstreamed/prestashop/Chart.yaml +++ b/upstreamed/prestashop/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prestashop -version: 6.6.6 +version: 7.0.0 appVersion: 1.7.6-0 description: A popular open source ecommerce solution. Professional tools are easily accessible to increase online sales including instant guest checkout, abandoned cart reminders and automated Email marketing. keywords: diff --git a/upstreamed/prestashop/README.md b/upstreamed/prestashop/README.md index a8db99c2d..45454a1cb 100644 --- a/upstreamed/prestashop/README.md +++ b/upstreamed/prestashop/README.md @@ -56,6 +56,8 @@ The following table lists the configurable parameters of the PrestaShop chart an | `image.tag` | PrestaShop 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 prestashop.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override prestashop.fullname template with a string | `nil` | | `service.type` | Kubernetes Service type | `LoadBalancer` | | `service.port` | Service HTTP port | `80` | | `service.httpsPort` | Service HTTPS port | `443` | diff --git a/upstreamed/prestashop/templates/_helpers.tpl b/upstreamed/prestashop/templates/_helpers.tpl index 86a67622f..b4777def9 100644 --- a/upstreamed/prestashop/templates/_helpers.tpl +++ b/upstreamed/prestashop/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 "prestashop.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/upstreamed/prestashop/values.yaml b/upstreamed/prestashop/values.yaml index e7061c79b..6a79cf685 100644 --- a/upstreamed/prestashop/values.yaml +++ b/upstreamed/prestashop/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override prestashop.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override prestashop.fullname template +## +# fullnameOverride: + ## PrestaShop host to create application URLs ## ref: https://github.com/bitnami/bitnami-docker-prestashop#configuration ## diff --git a/upstreamed/rabbitmq/Chart.yaml b/upstreamed/rabbitmq/Chart.yaml index 4d8a91d51..b06771c10 100644 --- a/upstreamed/rabbitmq/Chart.yaml +++ b/upstreamed/rabbitmq/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: rabbitmq -version: 6.2.1 +version: 6.2.2 appVersion: 3.7.16 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP) keywords: diff --git a/upstreamed/rabbitmq/README.md b/upstreamed/rabbitmq/README.md index 8b3f83a39..885f7219e 100644 --- a/upstreamed/rabbitmq/README.md +++ b/upstreamed/rabbitmq/README.md @@ -55,6 +55,8 @@ The following table lists the configurable parameters of the RabbitMQ chart and | `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `nil` | | `image.debug` | Specify if debug values should be set | `false` | +| `nameOverride` | String to partially override rabbitmq.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override rabbitmq.fullname template with a string | `nil` | | `rbacEnabled` | Specify if rbac is enabled in your cluster | `true` | | `podManagementPolicy` | Pod management policy | `OrderedReady` | | `rabbitmq.username` | RabbitMQ application username | `user` | diff --git a/upstreamed/rabbitmq/values-production.yaml b/upstreamed/rabbitmq/values-production.yaml index da270973a..ee9a772da 100644 --- a/upstreamed/rabbitmq/values-production.yaml +++ b/upstreamed/rabbitmq/values-production.yaml @@ -32,6 +32,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override rabbitmq.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override rabbitmq.fullname template +## +# fullnameOverride: + ## Use an alternate scheduler, e.g. "stork". ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ ## @@ -133,9 +141,9 @@ rabbitmq: extraConfiguration: |- #disk_free_limit.absolute = 50MB #management.load_definitions = /app/load_definition.json - + ## Configuration file content: advanced configuration - ## Use this as additional configuraton in classic config format (Erlang term configuration format) + ## Use this as additional configuraton in classic config format (Erlang term configuration format) advancedConfiguration: |- ## Kubernetes service type diff --git a/upstreamed/rabbitmq/values.yaml b/upstreamed/rabbitmq/values.yaml index f51b7b910..e39b43a78 100644 --- a/upstreamed/rabbitmq/values.yaml +++ b/upstreamed/rabbitmq/values.yaml @@ -32,6 +32,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override rabbitmq.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override rabbitmq.fullname template +## +# fullnameOverride: + ## Use an alternate scheduler, e.g. "stork". ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ ## diff --git a/upstreamed/suitecrm/Chart.yaml b/upstreamed/suitecrm/Chart.yaml index 0c54b1f26..9d5a94cce 100644 --- a/upstreamed/suitecrm/Chart.yaml +++ b/upstreamed/suitecrm/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: suitecrm -version: 5.4.7 +version: 6.0.0 appVersion: 7.11.6 description: SuiteCRM is a completely open source enterprise-grade Customer Relationship Management (CRM) application. SuiteCRM is a software fork of the popular customer relationship management (CRM) system SugarCRM. keywords: diff --git a/upstreamed/suitecrm/README.md b/upstreamed/suitecrm/README.md index 0e5b368a5..4b6cf30f7 100644 --- a/upstreamed/suitecrm/README.md +++ b/upstreamed/suitecrm/README.md @@ -55,7 +55,9 @@ The following table lists the configurable parameters of the SuiteCRM chart and | `image.repository` | SuiteCRM image name | `bitnami/suitecrm` | | `image.tag` | SuiteCRM 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 suitecrm.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override suitecrm.fullname template with a string | `nil` | | `suitecrmHost` | SuiteCRM host to create application URLs | `nil` | | `suitecrmUsername` | User of the application | `user` | | `suitecrmPassword` | Application password | _random 10 character alphanumeric string_ | diff --git a/upstreamed/suitecrm/templates/_helpers.tpl b/upstreamed/suitecrm/templates/_helpers.tpl index 457a226fc..d7806a595 100644 --- a/upstreamed/suitecrm/templates/_helpers.tpl +++ b/upstreamed/suitecrm/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 "suitecrm.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/upstreamed/suitecrm/values.yaml b/upstreamed/suitecrm/values.yaml index d5ae7898b..90a2bc01d 100644 --- a/upstreamed/suitecrm/values.yaml +++ b/upstreamed/suitecrm/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override suitecrm.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override suitecrm.fullname template +## +# fullnameOverride: + ## SuiteCRM host to create application URLs ## ref: https://github.com/bitnami/bitnami-docker-suitecrm#configuration ## diff --git a/upstreamed/wordpress/Chart.yaml b/upstreamed/wordpress/Chart.yaml index 1e520c74b..a8373b873 100644 --- a/upstreamed/wordpress/Chart.yaml +++ b/upstreamed/wordpress/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: wordpress -version: 5.13.2 +version: 6.0.0 appVersion: 5.2.2 description: Web publishing platform for building blogs and websites. icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png diff --git a/upstreamed/wordpress/README.md b/upstreamed/wordpress/README.md index 3148a2ab6..b1207502e 100644 --- a/upstreamed/wordpress/README.md +++ b/upstreamed/wordpress/README.md @@ -56,6 +56,8 @@ The following table lists the configurable parameters of the WordPress chart and | `image.tag` | WordPress 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 wordpress.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override wordpress.fullname template with a string | `nil` | | `wordpressSkipInstall` | Skip wizard installation | `false` | | `wordpressUsername` | User of the application | `user` | | `wordpressPassword` | Application password | _random 10 character long alphanumeric string_ | diff --git a/upstreamed/wordpress/templates/_helpers.tpl b/upstreamed/wordpress/templates/_helpers.tpl index fe4bd97a2..2391d077d 100644 --- a/upstreamed/wordpress/templates/_helpers.tpl +++ b/upstreamed/wordpress/templates/_helpers.tpl @@ -11,10 +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 "wordpress.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. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/upstreamed/wordpress/values-production.yaml b/upstreamed/wordpress/values-production.yaml index 316632cec..8f6b67e43 100644 --- a/upstreamed/wordpress/values-production.yaml +++ b/upstreamed/wordpress/values-production.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override wordpress.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override wordpress.fullname template +## +# fullnameOverride: + ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-wordpress#environment-variables ## diff --git a/upstreamed/wordpress/values.yaml b/upstreamed/wordpress/values.yaml index 0c192f86b..7a691f306 100644 --- a/upstreamed/wordpress/values.yaml +++ b/upstreamed/wordpress/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override wordpress.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override wordpress.fullname template +## +# fullnameOverride: + ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-wordpress#environment-variables ## From 30a5a32d7d14302944d4ae1101dc06eeb892df3f Mon Sep 17 00:00:00 2001 From: Konstantin Misyutin Date: Thu, 18 Jul 2019 16:48:07 +0300 Subject: [PATCH 11/17] add missed service annotations for bitnami/cassandra chart --- bitnami/cassandra/Chart.yaml | 2 +- bitnami/cassandra/templates/service.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bitnami/cassandra/Chart.yaml b/bitnami/cassandra/Chart.yaml index 578b12f80..ff7194183 100644 --- a/bitnami/cassandra/Chart.yaml +++ b/bitnami/cassandra/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: cassandra -version: 2.3.5 +version: 2.3.6 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/templates/service.yaml b/bitnami/cassandra/templates/service.yaml index fe2c51698..ee94e7d1e 100644 --- a/bitnami/cassandra/templates/service.yaml +++ b/bitnami/cassandra/templates/service.yaml @@ -7,6 +7,10 @@ metadata: chart: {{ template "cassandra.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + annotations: + {{- range $key, $value := .Values.service.annotations }} + {{ $key }}: {{ $value | quote }} + {{- end }} spec: {{- if .Values.service.nodePort }} nodePort: {{ .Values.service.nodePort }} From 33dbbd06a521d6f3e4d13c2ff9becf4f4cadda45 Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Thu, 18 Jul 2019 14:35:20 +0000 Subject: [PATCH 12/17] Synchronize upstreamed folder to a66116846 --- upstreamed/opencart/Chart.yaml | 2 +- upstreamed/opencart/README.md | 2 + upstreamed/opencart/templates/_helpers.tpl | 8 ++ upstreamed/opencart/values.yaml | 8 ++ upstreamed/owncloud/Chart.yaml | 2 +- upstreamed/owncloud/README.md | 20 ++-- upstreamed/owncloud/templates/_helpers.tpl | 8 ++ upstreamed/owncloud/values.yaml | 8 ++ upstreamed/phabricator/Chart.yaml | 2 +- upstreamed/phabricator/README.md | 112 +++++++++--------- upstreamed/phabricator/templates/_helpers.tpl | 8 ++ upstreamed/phabricator/values.yaml | 8 ++ upstreamed/phpbb/Chart.yaml | 2 +- upstreamed/phpbb/README.md | 68 +++++------ upstreamed/phpbb/templates/_helpers.tpl | 8 ++ upstreamed/phpbb/values.yaml | 8 ++ upstreamed/phpmyadmin/Chart.yaml | 2 +- upstreamed/phpmyadmin/README.md | 68 +++++------ upstreamed/phpmyadmin/values.yaml | 8 ++ upstreamed/redis/Chart.yaml | 2 +- upstreamed/redis/README.md | 2 + upstreamed/redis/values-production.yaml | 8 ++ upstreamed/redis/values.yaml | 8 ++ upstreamed/redmine/Chart.yaml | 2 +- upstreamed/redmine/README.md | 4 +- upstreamed/redmine/templates/_helpers.tpl | 8 ++ upstreamed/redmine/values.yaml | 8 ++ upstreamed/testlink/Chart.yaml | 2 +- upstreamed/testlink/README.md | 2 + upstreamed/testlink/templates/_helpers.tpl | 8 ++ upstreamed/testlink/values.yaml | 7 ++ 31 files changed, 274 insertions(+), 139 deletions(-) diff --git a/upstreamed/opencart/Chart.yaml b/upstreamed/opencart/Chart.yaml index c47d222d3..c101cdc41 100644 --- a/upstreamed/opencart/Chart.yaml +++ b/upstreamed/opencart/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: opencart -version: 4.5.5 +version: 5.0.0 appVersion: 3.0.3-2 description: A free and open source e-commerce platform for online merchants. It provides a professional and reliable foundation for a successful online store. keywords: diff --git a/upstreamed/opencart/README.md b/upstreamed/opencart/README.md index 762977dce..28ed772d3 100644 --- a/upstreamed/opencart/README.md +++ b/upstreamed/opencart/README.md @@ -56,6 +56,8 @@ The following table lists the configurable parameters of the OpenCart chart and | `image.tag` | OpenCart 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 opencart.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override opencart.fullname template with a string | `nil` | | `opencartHost` | OpenCart host to create application URLs | `nil` | | `service.type` | Kubernetes Service type | `LoadBalancer` | | `service.port` | Service HTTP port | `80` | diff --git a/upstreamed/opencart/templates/_helpers.tpl b/upstreamed/opencart/templates/_helpers.tpl index cccd57823..b52bffbce 100644 --- a/upstreamed/opencart/templates/_helpers.tpl +++ b/upstreamed/opencart/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 "opencart.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/upstreamed/opencart/values.yaml b/upstreamed/opencart/values.yaml index 68c5e7d9e..9daf9ccae 100644 --- a/upstreamed/opencart/values.yaml +++ b/upstreamed/opencart/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override opencart.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override opencart.fullname template +## +# fullnameOverride: + ## OpenCart host to create application URLs ## ref: https://github.com/bitnami/bitnami-docker-opencart#configuration ## diff --git a/upstreamed/owncloud/Chart.yaml b/upstreamed/owncloud/Chart.yaml index c1918d1eb..781a928bb 100644 --- a/upstreamed/owncloud/Chart.yaml +++ b/upstreamed/owncloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: owncloud -version: 4.3.6 +version: 5.0.0 appVersion: 10.2.1 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: diff --git a/upstreamed/owncloud/README.md b/upstreamed/owncloud/README.md index cc69b6a48..13fc87d22 100644 --- a/upstreamed/owncloud/README.md +++ b/upstreamed/owncloud/README.md @@ -56,6 +56,8 @@ The following table lists the configurable parameters of the ownCloud chart and | `image.tag` | ownCloud 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 owncloud.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override owncloud.fullname template with a string | `nil` | | `ingress.enabled` | Enable ingress controller resource | `false` | | `ingress.hosts[0].name` | Hostname to your ownCloud installation | `owncloud.local` | | `ingress.hosts[0].path` | Path within the url structure | `/` | @@ -91,15 +93,15 @@ The following table lists the configurable parameters of the ownCloud chart and | `persistence.owncloud.accessMode` | PVC Access Mode for ownCloud volume | `ReadWriteOnce` | | `persistence.owncloud.size` | PVC Storage Request for ownCloud volume | `8Gi` | | `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | -| `podAnnotations` | Pod annotations | `{}` | -| `metrics.enabled` | Start a side-car prometheus exporter | `false` | -| `metrics.image.registry` | Apache exporter image registry | `docker.io` | -| `metrics.image.repository` | Apache exporter image name | `lusotycoon/apache-exporter` | -| `metrics.image.tag` | Apache exporter image tag | `v0.5.0` | -| `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: "9117"}` | -| `metrics.resources` | Exporter resource requests/limit | {} | +| `podAnnotations` | Pod annotations | `{}` | +| `metrics.enabled` | Start a side-car prometheus exporter | `false` | +| `metrics.image.registry` | Apache exporter image registry | `docker.io` | +| `metrics.image.repository` | Apache exporter image name | `lusotycoon/apache-exporter` | +| `metrics.image.tag` | Apache exporter image tag | `v0.5.0` | +| `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: "9117"}` | +| `metrics.resources` | Exporter resource requests/limit | {} | The above parameters map to the env variables defined in [bitnami/owncloud](http://github.com/bitnami/bitnami-docker-owncloud). For more information please refer to the [bitnami/owncloud](http://github.com/bitnami/bitnami-docker-owncloud) image documentation. diff --git a/upstreamed/owncloud/templates/_helpers.tpl b/upstreamed/owncloud/templates/_helpers.tpl index 1e3ad787d..5f9962fa2 100644 --- a/upstreamed/owncloud/templates/_helpers.tpl +++ b/upstreamed/owncloud/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 "owncloud.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/upstreamed/owncloud/values.yaml b/upstreamed/owncloud/values.yaml index 4863d2ecf..2f301f17c 100644 --- a/upstreamed/owncloud/values.yaml +++ b/upstreamed/owncloud/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override owncloud.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override owncloud.fullname template +## +# fullnameOverride: + ## For Kubernetes v1.4, v1.5 and v1.6, use 'extensions/v1beta1' ## For Kubernetes v1.7, use 'networking.k8s.io/v1' networkPolicyApiVersion: extensions/v1beta1 diff --git a/upstreamed/phabricator/Chart.yaml b/upstreamed/phabricator/Chart.yaml index c79d16437..b0f2400f8 100644 --- a/upstreamed/phabricator/Chart.yaml +++ b/upstreamed/phabricator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: phabricator -version: 5.0.5 +version: 6.0.0 appVersion: 2019.26.0 description: Collection of open source web applications that help software companies build better software. keywords: diff --git a/upstreamed/phabricator/README.md b/upstreamed/phabricator/README.md index 917f97c9f..018bbebe1 100644 --- a/upstreamed/phabricator/README.md +++ b/upstreamed/phabricator/README.md @@ -47,62 +47,64 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the Phabricator 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` | Phabricator image registry | `docker.io` | -| `image.repository` | Phabricator image name | `bitnami/phabricator` | -| `image.tag` | Phabricator 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) | -| `phabricatorHost` | Phabricator host to create application URLs | `nil` | -| `phabricatorAlternateFileDomain` | Phabricator alternate domain to upload files | `nil` | -| `phabricatorUsername` | User of the application | `user` | -| `phabricatorPassword` | Application password | _random 10 character long alphanumeric string_ | -| `phabricatorEmail` | Admin email | `user@example.com` | -| `phabricatorFirstName` | First name | `First Name` | -| `phabricatorLastName` | Last name | `Last Name` | -| `smtpHost` | SMTP host | `nil` | -| `smtpPort` | SMTP port | `nil` | -| `smtpUser` | SMTP user | `nil` | -| `smtpPassword` | SMTP password | `nil` | -| `smtpProtocol` | SMTP protocol [`ssl`, `tls`] | `nil` | -| `mariadb.rootUser.password` | MariaDB admin password | `nil` | -| `service.type` | Kubernetes Service type | `LoadBalancer` | -| `service.port` | Service HTTP port | `80` | -| `service.httpsPort` | Service HTTP port | `443` | -| `service.loadBalancerIP` | `loadBalancerIP` for the Phabricator Service | `nil` | -| `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` | -| `service.nodePorts.http` | Kubernetes http node port | `""` | -| `service.nodePorts.https` | Kubernetes https node port | `""` | -| `persistence.enabled` | Enable persistence using PVC | `true` | -| `persistence.phabricator.storageClass` | PVC Storage Class for Phabricator volume | `nil` (uses alpha storage class annotation) | -| `persistence.phabricator.accessMode` | PVC Access Mode for Phabricator volume | `ReadWriteOnce` | -| `persistence.phabricator.size` | PVC Storage Request for Phabricator volume | `8Gi` | -| `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | -| `ingress.enabled` | Enable ingress controller resource | `false` | -| `ingress.hosts[0].name` | Hostname to your Phabricator installation | `phabricator.local` | -| `ingress.hosts[0].path` | Path within the url structure | `/` | -| `ingress.hosts[0].tls` | Utilize TLS backend in ingress | `false` | -| `ingress.hosts[0].certManager` | Add annotations for cert-manager | `false` | -| `ingress.hosts[0].tlsSecret` | TLS Secret (certificates) | `phabricator.local-tls-secret` | -| `ingress.hosts[0].annotations` | Annotations for this host's ingress record | `[]` | -| `ingress.secrets[0].name` | TLS Secret Name | `nil` | -| `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` | -| `ingress.secrets[0].key` | TLS Secret Key | `nil` | -| `podAnnotations` | Pod annotations | `{}` | -| `metrics.enabled` | Start a side-car prometheus exporter | `false` | -| `metrics.image.registry` | Apache exporter image registry | `docker.io` | -| `metrics.image.repository` | Apache exporter image name | `lusotycoon/apache-exporter` | -| `metrics.image.tag` | Apache exporter image tag | `v0.5.0` | -| `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) | +| 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` | Phabricator image registry | `docker.io` | +| `image.repository` | Phabricator image name | `bitnami/phabricator` | +| `image.tag` | Phabricator 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 phabricator.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override phabricator.fullname template with a string | `nil` | +| `phabricatorHost` | Phabricator host to create application URLs | `nil` | +| `phabricatorAlternateFileDomain` | Phabricator alternate domain to upload files | `nil` | +| `phabricatorUsername` | User of the application | `user` | +| `phabricatorPassword` | Application password | _random 10 character long alphanumeric string_ | +| `phabricatorEmail` | Admin email | `user@example.com` | +| `phabricatorFirstName` | First name | `First Name` | +| `phabricatorLastName` | Last name | `Last Name` | +| `smtpHost` | SMTP host | `nil` | +| `smtpPort` | SMTP port | `nil` | +| `smtpUser` | SMTP user | `nil` | +| `smtpPassword` | SMTP password | `nil` | +| `smtpProtocol` | SMTP protocol [`ssl`, `tls`] | `nil` | +| `mariadb.rootUser.password` | MariaDB admin password | `nil` | +| `service.type` | Kubernetes Service type | `LoadBalancer` | +| `service.port` | Service HTTP port | `80` | +| `service.httpsPort` | Service HTTP port | `443` | +| `service.loadBalancerIP` | `loadBalancerIP` for the Phabricator Service | `nil` | +| `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` | +| `service.nodePorts.http` | Kubernetes http node port | `""` | +| `service.nodePorts.https` | Kubernetes https node port | `""` | +| `persistence.enabled` | Enable persistence using PVC | `true` | +| `persistence.phabricator.storageClass` | PVC Storage Class for Phabricator volume | `nil` (uses alpha storage class annotation) | +| `persistence.phabricator.accessMode` | PVC Access Mode for Phabricator volume | `ReadWriteOnce` | +| `persistence.phabricator.size` | PVC Storage Request for Phabricator volume | `8Gi` | +| `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | +| `ingress.enabled` | Enable ingress controller resource | `false` | +| `ingress.hosts[0].name` | Hostname to your Phabricator installation | `phabricator.local` | +| `ingress.hosts[0].path` | Path within the url structure | `/` | +| `ingress.hosts[0].tls` | Utilize TLS backend in ingress | `false` | +| `ingress.hosts[0].certManager` | Add annotations for cert-manager | `false` | +| `ingress.hosts[0].tlsSecret` | TLS Secret (certificates) | `phabricator.local-tls-secret` | +| `ingress.hosts[0].annotations` | Annotations for this host's ingress record | `[]` | +| `ingress.secrets[0].name` | TLS Secret Name | `nil` | +| `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` | +| `ingress.secrets[0].key` | TLS Secret Key | `nil` | +| `podAnnotations` | Pod annotations | `{}` | +| `metrics.enabled` | Start a side-car prometheus exporter | `false` | +| `metrics.image.registry` | Apache exporter image registry | `docker.io` | +| `metrics.image.repository` | Apache exporter image name | `lusotycoon/apache-exporter` | +| `metrics.image.tag` | Apache exporter image tag | `v0.5.0` | +| `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: "9117"}` | -| `metrics.resources` | Exporter resource requests/limit | {} | -| `nodeSelector` | Node labels for pod assignment | `nil` | -| `affinity` | Node/pod affinities | `nil` | -| `tolerations` | List of node taints to tolerate | `nil` | +| `metrics.resources` | Exporter resource requests/limit | {} | +| `nodeSelector` | Node labels for pod assignment | `nil` | +| `affinity` | Node/pod affinities | `nil` | +| `tolerations` | List of node taints to tolerate | `nil` | The above parameters map to the env variables defined in [bitnami/phabricator](http://github.com/bitnami/bitnami-docker-phabricator). For more information please refer to the [bitnami/phabricator](http://github.com/bitnami/bitnami-docker-phabricator) image documentation. diff --git a/upstreamed/phabricator/templates/_helpers.tpl b/upstreamed/phabricator/templates/_helpers.tpl index 2c9d214c9..8e0b99222 100644 --- a/upstreamed/phabricator/templates/_helpers.tpl +++ b/upstreamed/phabricator/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 "phabricator.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/upstreamed/phabricator/values.yaml b/upstreamed/phabricator/values.yaml index d82c3bc11..54c790fd9 100644 --- a/upstreamed/phabricator/values.yaml +++ b/upstreamed/phabricator/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override phabricator.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override phabricator.fullname template +## +# fullnameOverride: + ## Phabricator host to create application URLs ## ref: https://github.com/bitnami/bitnami-docker-phabricator#configuration ## diff --git a/upstreamed/phpbb/Chart.yaml b/upstreamed/phpbb/Chart.yaml index a27af921f..3dc1b984f 100644 --- a/upstreamed/phpbb/Chart.yaml +++ b/upstreamed/phpbb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: phpbb -version: 4.4.5 +version: 5.0.0 appVersion: 3.2.7 description: Community forum that supports the notion of users and groups, file attachments, full-text search, notifications and more. keywords: diff --git a/upstreamed/phpbb/README.md b/upstreamed/phpbb/README.md index 2094895a4..a6b5c6f83 100644 --- a/upstreamed/phpbb/README.md +++ b/upstreamed/phpbb/README.md @@ -55,7 +55,9 @@ The following table lists the configurable parameters of the phpBB chart and the | `image.repository` | phpBB image name | `bitnami/phpbb` | | `image.tag` | phpBB 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 phpbb.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override phpbb.fullname template with a string | `nil` | | `phpbbUser` | User of the application | `user` | | `phpbbPassword` | Application password | _random 10 character long alphanumeric string_ | | `phpbbEmail` | Admin email | `user@example.com` | @@ -68,44 +70,44 @@ The following table lists the configurable parameters of the phpBB chart and the | `externalDatabase.user` | Existing username in the external db | `bn_phpbb` | | `externalDatabase.password` | Password for the above username | `nil` | | `externalDatabase.database` | Name of the existing database | `bitnami_phpbb` | -| `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 phpbb installation | `phpbb.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) | `phpbb.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` | +| `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 phpbb installation | `phpbb.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) | `phpbb.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` | | `mariadb.enabled` | Use or not the MariaDB chart | `true` | -| `mariadb.rootUser.password` | MariaDB admin password | `nil` | -| `mariadb.db.name` | Database name to create | `bitnami_phpbb` | -| `mariadb.db.user` | Database user to create | `bn_phpbb` | -| `mariadb.db.password` | Password for the database | _random 10 character long alphanumeric string_ | -| `service.type` | Kubernetes Service type | `LoadBalancer` | -| `service.port` | Service HTTP port (Dashboard) | `80` | -| `nodePorts.http` | Kubernetes http node port | `""` | -| `nodePorts.https` | Kubernetes https node port | `""` | -| `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` | -| `service.nodePorts.http` | Kubernetes http node port | `""` | -| `service.nodePorts.https` | Kubernetes https node port | `""` | -| `service.loadBalancerIP` | LoadBalancer service IP | `""` | +| `mariadb.rootUser.password` | MariaDB admin password | `nil` | +| `mariadb.db.name` | Database name to create | `bitnami_phpbb` | +| `mariadb.db.user` | Database user to create | `bn_phpbb` | +| `mariadb.db.password` | Password for the database | _random 10 character long alphanumeric string_ | +| `service.type` | Kubernetes Service type | `LoadBalancer` | +| `service.port` | Service HTTP port (Dashboard) | `80` | +| `nodePorts.http` | Kubernetes http node port | `""` | +| `nodePorts.https` | Kubernetes https node port | `""` | +| `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` | +| `service.nodePorts.http` | Kubernetes http node port | `""` | +| `service.nodePorts.https` | Kubernetes https node port | `""` | +| `service.loadBalancerIP` | LoadBalancer service IP | `""` | | `persistence.enabled` | Enable persistence using PVC | `true` | | `persistence.phpbb.storageClass` | PVC Storage Class for phpBB volume | `nil` (uses alpha storage class annotation) | | `persistence.phpbb.accessMode` | PVC Access Mode for phpBB volume | `ReadWriteOnce` | | `persistence.phpbb.size` | PVC Storage Request for phpBB volume | `8Gi` | | `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | -| `podAnnotations` | Pod annotations | `{}` | -| `metrics.enabled` | Start a side-car prometheus exporter | `false` | -| `metrics.image.registry` | Apache exporter image registry | `docker.io` | -| `metrics.image.repository` | Apache exporter image name | `lusotycoon/apache-exporter` | -| `metrics.image.tag` | Apache exporter image tag | `v0.5.0` | -| `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: "9117"}` | -| `metrics.resources` | Exporter resource requests/limit | {} | +| `podAnnotations` | Pod annotations | `{}` | +| `metrics.enabled` | Start a side-car prometheus exporter | `false` | +| `metrics.image.registry` | Apache exporter image registry | `docker.io` | +| `metrics.image.repository` | Apache exporter image name | `lusotycoon/apache-exporter` | +| `metrics.image.tag` | Apache exporter image tag | `v0.5.0` | +| `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: "9117"}`| +| `metrics.resources` | Exporter resource requests/limit | {} | The above parameters map to the env variables defined in [bitnami/phpbb](http://github.com/bitnami/bitnami-docker-phpbb). For more information please refer to the [bitnami/phpbb](http://github.com/bitnami/bitnami-docker-phpbb) image documentation. diff --git a/upstreamed/phpbb/templates/_helpers.tpl b/upstreamed/phpbb/templates/_helpers.tpl index fa1476b58..b4aedddc8 100644 --- a/upstreamed/phpbb/templates/_helpers.tpl +++ b/upstreamed/phpbb/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 "phpbb.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/upstreamed/phpbb/values.yaml b/upstreamed/phpbb/values.yaml index 10d48afb0..195b15c65 100644 --- a/upstreamed/phpbb/values.yaml +++ b/upstreamed/phpbb/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override phpbb.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override phpbb.fullname template +## +# fullnameOverride: + ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-phpbb#environment-variables ## diff --git a/upstreamed/phpmyadmin/Chart.yaml b/upstreamed/phpmyadmin/Chart.yaml index a6f695ea6..e14432978 100644 --- a/upstreamed/phpmyadmin/Chart.yaml +++ b/upstreamed/phpmyadmin/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: phpmyadmin -version: 2.2.8 +version: 2.2.9 appVersion: 4.9.0-1 description: phpMyAdmin is an mysql administration frontend keywords: diff --git a/upstreamed/phpmyadmin/README.md b/upstreamed/phpmyadmin/README.md index d391a70e2..b173e561e 100644 --- a/upstreamed/phpmyadmin/README.md +++ b/upstreamed/phpmyadmin/README.md @@ -44,39 +44,41 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the phpMyAdmin 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` | phpMyAdmin image registry | `docker.io` | -| `image.repository` | phpMyAdmin image name | `bitnami/phpmyadmin` | -| `image.tag` | phpMyAdmin 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) | -| `service.type` | Type of service for phpMyAdmin frontend | `ClusterIP` | -| `service.port` | Port to expose service | `80` | -| `db.port` | Database port to use to connect | `3306` | -| `db.chartName` | Database suffix if included in the same release | `nil` | -| `db.host` | Database host to connect to | `nil` | -| `db.bundleTestDB` | Deploy a MariaDB instance for testing purposes | `false` | -| `ingress.enabled` | Ingress resource to be added | `false` | -| `ingress.annotations` | Ingress annotations | `{ingress.kubernetes.io/rewrite-target: /, nginx.ingress.kubernetes.io/rewrite-target: /}` | -| `ingress.path` | Path to access frontend | `/` | -| `ingress.host` | Ingress host | `nil` | -| `ingress.tls` | TLS for ingress | `[]` | -| `resources` | CPU/Memory resource requests/limits | `{}` | -| `nodeSelector` | Node labels for pod assignment | `{}` | -| `tolerations` | List of node taints to tolerate | `[]` | -| `affinity` | Map of node/pod affinities | `{}` | -| `podAnnotations` | Pod annotations | `{}` | -| `metrics.enabled` | Start a side-car prometheus exporter | `false` | -| `metrics.image.registry` | Apache exporter image registry | `docker.io` | -| `metrics.image.repository` | Apache exporter image name | `lusotycoon/apache-exporter` | -| `metrics.image.tag` | Apache exporter image tag | `v0.5.0` | -| `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: "9117"}` | -| `metrics.resources` | Exporter resource requests/limit | {} | +| 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` | phpMyAdmin image registry | `docker.io` | +| `image.repository` | phpMyAdmin image name | `bitnami/phpmyadmin` | +| `image.tag` | phpMyAdmin 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 phpmyadmin.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override phpmyadmin.fullname template with a string | `nil` | +| `service.type` | Type of service for phpMyAdmin frontend | `ClusterIP` | +| `service.port` | Port to expose service | `80` | +| `db.port` | Database port to use to connect | `3306` | +| `db.chartName` | Database suffix if included in the same release | `nil` | +| `db.host` | Database host to connect to | `nil` | +| `db.bundleTestDB` | Deploy a MariaDB instance for testing purposes | `false` | +| `ingress.enabled` | Ingress resource to be added | `false` | +| `ingress.annotations` | Ingress annotations | `{ingress.kubernetes.io/rewrite-target: /, nginx.ingress.kubernetes.io/rewrite-target: /}` | +| `ingress.path` | Path to access frontend | `/` | +| `ingress.host` | Ingress host | `nil` | +| `ingress.tls` | TLS for ingress | `[]` | +| `resources` | CPU/Memory resource requests/limits | `{}` | +| `nodeSelector` | Node labels for pod assignment | `{}` | +| `tolerations` | List of node taints to tolerate | `[]` | +| `affinity` | Map of node/pod affinities | `{}` | +| `podAnnotations` | Pod annotations | `{}` | +| `metrics.enabled` | Start a side-car prometheus exporter | `false` | +| `metrics.image.registry` | Apache exporter image registry | `docker.io` | +| `metrics.image.repository` | Apache exporter image name | `lusotycoon/apache-exporter` | +| `metrics.image.tag` | Apache exporter image tag | `v0.5.0` | +| `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: "9117"}` | +| `metrics.resources` | Exporter resource requests/limit | {} | For more information please refer to the [bitnami/phpmyadmin](http://github.com/bitnami/bitnami-docker-Phpmyadmin) image documentation. diff --git a/upstreamed/phpmyadmin/values.yaml b/upstreamed/phpmyadmin/values.yaml index ad9d5ecec..0bfa9b259 100644 --- a/upstreamed/phpmyadmin/values.yaml +++ b/upstreamed/phpmyadmin/values.yaml @@ -23,6 +23,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override phpmyadmin.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override phpmyadmin.fullname template +## +# fullnameOverride: + ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-phpmyadmin#environment-variables ## diff --git a/upstreamed/redis/Chart.yaml b/upstreamed/redis/Chart.yaml index 8722703d3..3c5905daf 100644 --- a/upstreamed/redis/Chart.yaml +++ b/upstreamed/redis/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: redis -version: 8.1.4 +version: 8.1.5 appVersion: 5.0.5 description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets. keywords: diff --git a/upstreamed/redis/README.md b/upstreamed/redis/README.md index 122c9d044..70003b29f 100644 --- a/upstreamed/redis/README.md +++ b/upstreamed/redis/README.md @@ -130,6 +130,8 @@ The following table lists the configurable parameters of the Redis chart and the | `image.tag` | Redis Image tag | `{TAG_NAME}` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `nil` | +| `nameOverride` | String to partially override redis.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override redis.fullname template with a string | `nil` | | `cluster.enabled` | Use master-slave topology | `true` | | `cluster.slaveCount` | Number of slaves | `1` | | `existingSecret` | Name of existing secret object (for password authentication) | `nil` | diff --git a/upstreamed/redis/values-production.yaml b/upstreamed/redis/values-production.yaml index 0caba7801..59c032b5e 100644 --- a/upstreamed/redis/values-production.yaml +++ b/upstreamed/redis/values-production.yaml @@ -29,6 +29,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override redis.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override redis.fullname template +## +# fullnameOverride: + ## Cluster settings cluster: enabled: true diff --git a/upstreamed/redis/values.yaml b/upstreamed/redis/values.yaml index 80b15ab7d..9a3e335a9 100644 --- a/upstreamed/redis/values.yaml +++ b/upstreamed/redis/values.yaml @@ -29,6 +29,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override redis.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override redis.fullname template +## +# fullnameOverride: + ## Cluster settings cluster: enabled: true diff --git a/upstreamed/redmine/Chart.yaml b/upstreamed/redmine/Chart.yaml index e14320bd7..171a3aecd 100644 --- a/upstreamed/redmine/Chart.yaml +++ b/upstreamed/redmine/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: redmine -version: 10.0.9 +version: 11.0.0 appVersion: 4.0.4 description: A flexible project management web application. keywords: diff --git a/upstreamed/redmine/README.md b/upstreamed/redmine/README.md index 6dc30ee07..37974a5de 100644 --- a/upstreamed/redmine/README.md +++ b/upstreamed/redmine/README.md @@ -63,7 +63,9 @@ The following table lists the configurable parameters of the Redmine chart and t | `image.repository` | Redmine image name | `bitnami/redmine` | | `image.tag` | Redmine 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 redmine.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override redmine.fullname template with a string | `nil` | | `redmineUsername` | User of the application | `user` | | `redminePassword` | Application password | _random 10 character long alphanumeric string_ | | `redmineEmail` | Admin email | `user@example.com` | diff --git a/upstreamed/redmine/templates/_helpers.tpl b/upstreamed/redmine/templates/_helpers.tpl index e3c2048dc..eea79fc45 100644 --- a/upstreamed/redmine/templates/_helpers.tpl +++ b/upstreamed/redmine/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 "redmine.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/upstreamed/redmine/values.yaml b/upstreamed/redmine/values.yaml index ef1afaf6e..304d4928c 100644 --- a/upstreamed/redmine/values.yaml +++ b/upstreamed/redmine/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override redmine.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override redmine.fullname template +## +# fullnameOverride: + ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-redmine/#environment-variables ## diff --git a/upstreamed/testlink/Chart.yaml b/upstreamed/testlink/Chart.yaml index e22e0cf42..761825980 100644 --- a/upstreamed/testlink/Chart.yaml +++ b/upstreamed/testlink/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: testlink -version: 4.4.5 +version: 5.0.0 appVersion: 1.9.19 description: Web-based test management system that facilitates software quality assurance. icon: https://bitnami.com/assets/stacks/testlink/img/testlink-stack-220x234.png diff --git a/upstreamed/testlink/README.md b/upstreamed/testlink/README.md index 2fa513cda..88fbeb204 100644 --- a/upstreamed/testlink/README.md +++ b/upstreamed/testlink/README.md @@ -56,6 +56,8 @@ The following table lists the configurable parameters of the TestLink chart and | `image.tag` | TestLink 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 testlink.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override testlink.fullname template with a string | `nil` | | `testlinkUsername` | Admin username | `user` | | `testlinkPassword` | Admin user password | _random 10 character long alphanumeric string_ | | `testlinkEmail` | Admin user email | `user@example.com` | diff --git a/upstreamed/testlink/templates/_helpers.tpl b/upstreamed/testlink/templates/_helpers.tpl index d2ebf7345..7a9833b10 100644 --- a/upstreamed/testlink/templates/_helpers.tpl +++ b/upstreamed/testlink/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 "testlink.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/upstreamed/testlink/values.yaml b/upstreamed/testlink/values.yaml index e4158bdd4..74b910683 100644 --- a/upstreamed/testlink/values.yaml +++ b/upstreamed/testlink/values.yaml @@ -26,6 +26,13 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override testlink.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override testlink.fullname template +## +# fullnameOverride: ## List of nodeSelectors to limit where testlink can run ## i.e From 71881b0a5eea959740ac900cb675492b300555f9 Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Thu, 18 Jul 2019 15:35:14 +0000 Subject: [PATCH 13/17] Synchronize upstreamed folder to 676768fa9 --- upstreamed/orangehrm/Chart.yaml | 2 +- upstreamed/orangehrm/README.md | 2 ++ upstreamed/orangehrm/templates/_helpers.tpl | 8 ++++++++ upstreamed/orangehrm/values.yaml | 8 ++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/upstreamed/orangehrm/Chart.yaml b/upstreamed/orangehrm/Chart.yaml index 55a86ede1..cd92430db 100644 --- a/upstreamed/orangehrm/Chart.yaml +++ b/upstreamed/orangehrm/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: orangehrm -version: 4.4.6 +version: 5.0.0 appVersion: 4.3.2-0 description: OrangeHRM is a free HR management system that offers a wealth of modules to suit the needs of your business. diff --git a/upstreamed/orangehrm/README.md b/upstreamed/orangehrm/README.md index b1c9d5d49..a96d9c697 100644 --- a/upstreamed/orangehrm/README.md +++ b/upstreamed/orangehrm/README.md @@ -56,6 +56,8 @@ The following table lists the configurable parameters of the OrangeHRM chart and | `image.tag` | OrangeHRM 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 orangehrm.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override orangehrm.fullname template with a string | `nil` | | `orangehrmUsername` | User of the application | `user` | | `orangehrmPassword` | Application password | _random 10 character long alphanumeric string_ | | `smtpHost` | SMTP host | `nil` | diff --git a/upstreamed/orangehrm/templates/_helpers.tpl b/upstreamed/orangehrm/templates/_helpers.tpl index 53374ec7f..16ac1dccc 100644 --- a/upstreamed/orangehrm/templates/_helpers.tpl +++ b/upstreamed/orangehrm/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 "orangehrm.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/upstreamed/orangehrm/values.yaml b/upstreamed/orangehrm/values.yaml index 394ab2007..eb3f0d511 100644 --- a/upstreamed/orangehrm/values.yaml +++ b/upstreamed/orangehrm/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override orangehrm.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override orangehrm.fullname template +## +# fullnameOverride: + ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-orangehrm#configuration ## From 14d537430802c05a063ad61830188566ad657984 Mon Sep 17 00:00:00 2001 From: Marcos Bjoerkelund Date: Thu, 18 Jul 2019 17:37:54 +0200 Subject: [PATCH 14/17] fix annotations locatino --- bitnami/harbor/values-production.yaml | 4 ++-- bitnami/harbor/values.yaml | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bitnami/harbor/values-production.yaml b/bitnami/harbor/values-production.yaml index 9f6cd2c8e..a07d7bea5 100644 --- a/bitnami/harbor/values-production.yaml +++ b/bitnami/harbor/values-production.yaml @@ -281,8 +281,6 @@ service: # The service port Notary listens on. Only needed when notary.enabled # is set to true notaryPort: 4443 - annotations: {} - sourceRanges: [] nodePort: # The name of NodePort service name: harbor @@ -314,6 +312,8 @@ service: # The service port Notary listens on. Only needed when notary.enabled # is set to true notaryPort: 4443 + annotations: {} + sourceRanges: [] # The external URL for Harbor core service. It is used to # 1) populate the docker/helm commands showed on portal diff --git a/bitnami/harbor/values.yaml b/bitnami/harbor/values.yaml index 3d6ef81b5..6e292e7b6 100644 --- a/bitnami/harbor/values.yaml +++ b/bitnami/harbor/values.yaml @@ -281,8 +281,6 @@ service: # The service port Notary listens on. Only needed when notary.enabled # is set to true notaryPort: 4443 - annotations: {} - sourceRanges: [] nodePort: # The name of NodePort service name: harbor From c06bf854ee700d1714ab4d7d35502f93fb74d0b6 Mon Sep 17 00:00:00 2001 From: Marcos Bjoerkelund Date: Thu, 18 Jul 2019 17:38:47 +0200 Subject: [PATCH 15/17] implement requested changes --- bitnami/harbor/values-production.yaml | 1 - bitnami/harbor/values.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/bitnami/harbor/values-production.yaml b/bitnami/harbor/values-production.yaml index a07d7bea5..b69310005 100644 --- a/bitnami/harbor/values-production.yaml +++ b/bitnami/harbor/values-production.yaml @@ -337,7 +337,6 @@ externalURL: https://core.harbor.domain # contains a base64 encoded CA Certificate named `ca.crt`. # uaaSecretName: - ## Kubernetes Security Context ## https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ ## diff --git a/bitnami/harbor/values.yaml b/bitnami/harbor/values.yaml index 6e292e7b6..3b76c958f 100644 --- a/bitnami/harbor/values.yaml +++ b/bitnami/harbor/values.yaml @@ -337,7 +337,6 @@ externalURL: https://core.harbor.domain # contains a base64 encoded CA Certificate named `ca.crt`. # uaaSecretName: - ## Kubernetes Security Context ## https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ ## From dba03b6827b08c48d76fefeb462d032037ffab67 Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Fri, 19 Jul 2019 07:35:20 +0000 Subject: [PATCH 16/17] Synchronize upstreamed folder to 3923caa17 --- upstreamed/joomla/Chart.yaml | 4 ++-- upstreamed/joomla/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/upstreamed/joomla/Chart.yaml b/upstreamed/joomla/Chart.yaml index 9cd16a656..7bd5da9dd 100644 --- a/upstreamed/joomla/Chart.yaml +++ b/upstreamed/joomla/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: joomla -version: 5.0.0 -appVersion: 3.9.9 +version: 5.0.1 +appVersion: 3.9.10 description: PHP content management system (CMS) for publishing web content keywords: - joomla diff --git a/upstreamed/joomla/values.yaml b/upstreamed/joomla/values.yaml index eef09990d..d4bc5bc2b 100644 --- a/upstreamed/joomla/values.yaml +++ b/upstreamed/joomla/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/joomla - tag: 3.9.9-debian-9-r0 + tag: 3.9.10-debian-9-r0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images From 60b28e6fe3ece15d3b2c4258c9bcc9fbb0e04128 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Fri, 19 Jul 2019 11:39:41 +0000 Subject: [PATCH 17/17] [bitnami/mxnet] Release 1.0.1 updating components versions Signed-off-by: Bitnami Containers --- bitnami/mxnet/Chart.yaml | 4 ++-- bitnami/mxnet/values-production.yaml | 2 +- bitnami/mxnet/values.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bitnami/mxnet/Chart.yaml b/bitnami/mxnet/Chart.yaml index 64897386d..f91f865ca 100644 --- a/bitnami/mxnet/Chart.yaml +++ b/bitnami/mxnet/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: mxnet -version: 1.0.0 -appVersion: 1.4.1 +version: 1.0.1 +appVersion: 1.5.0 description: A flexible and efficient library for deep learning keywords: - mxnet diff --git a/bitnami/mxnet/values-production.yaml b/bitnami/mxnet/values-production.yaml index f96627260..54b0903ef 100644 --- a/bitnami/mxnet/values-production.yaml +++ b/bitnami/mxnet/values-production.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/mxnet - tag: 1.4.1-debian-9-r9 + tag: 1.5.0-debian-9-r0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images diff --git a/bitnami/mxnet/values.yaml b/bitnami/mxnet/values.yaml index 2b85b70d4..103c98479 100644 --- a/bitnami/mxnet/values.yaml +++ b/bitnami/mxnet/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/mxnet - tag: 1.4.1-debian-9-r9 + tag: 1.5.0-debian-9-r0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images