Merge branch 'master' into feature/add_ingress_to_nginx_chart

2026-03-10 06:47:18 +08:00 · 2019-05-06 10:13:30 -04:00
parent a981f8e50c f82a9010f5
commit 52ca1d5cac
38 changed files with 75 additions and 46 deletions
--- a/bitnami/etcd/Chart.yaml
+++ b/bitnami/etcd/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: etcd
-version: 2.2.2
-appVersion: 3.3.12
+version: 2.2.3
+appVersion: 3.3.13
 description: etcd is a distributed key value store that provides a reliable way to store data across a cluster of machines
 keywords:
 - etcd
--- a/bitnami/etcd/values-production.yaml
+++ b/bitnami/etcd/values-production.yaml
@@ -13,7 +13,7 @@
 image:
  registry: docker.io
  repository: bitnami/etcd
-  tag: 3.3.12
+  tag: 3.3.13
  ## 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
--- a/bitnami/etcd/values.yaml
+++ b/bitnami/etcd/values.yaml
@@ -13,7 +13,7 @@
 image:
  registry: docker.io
  repository: bitnami/etcd
-  tag: 3.3.12
+  tag: 3.3.13
  ## 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
--- a/bitnami/minio/Chart.yaml
+++ b/bitnami/minio/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
-version: 0.0.2
-appVersion: 2019.4.23
+version: 0.0.3
+appVersion: 2019.5.2
 description: MinIO is an object storage server, compatible with Amazon S3 cloud storage service, mainly used for storing unstructured data (such as photos, videos, log files, etc.)
 keywords:
 - minio
--- a/bitnami/minio/values-production.yaml
+++ b/bitnami/minio/values-production.yaml
@@ -18,7 +18,7 @@ global:
 image:
  registry: docker.io
  repository: bitnami/minio
-  tag: 2019.4.23
+  tag: 2019.5.2
  ## 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
--- a/bitnami/minio/values.yaml
+++ b/bitnami/minio/values.yaml
@@ -18,7 +18,7 @@ global:
 image:
  registry: docker.io
  repository: bitnami/minio
-  tag: 2019.4.23
+  tag: 2019.5.2
  ## 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
--- a/bitnami/nginx/README.md
+++ b/bitnami/nginx/README.md
@@ -66,6 +66,7 @@ The following tables lists the configurable parameters of the NGINX Open Source
 | `service.nodePorts.http`        | Kubernetes http node port                        | `""`                                                         |
 | `service.externalTrafficPolicy` | Enable client source IP preservation             | `Cluster`                                                    |
 | `service.loadBalancerIP`        | LoadBalancer service IP address                  | `""`                                                         |
+| `service.annotations`           | Service annotations                              | `{}`                                                         |
 | `ingress.enabled`               | Creates an Ingress resource                      | `false`                                                      |
 | `ingress.annotations`           | Annotations to add to the Ingress, such as class | `{}`                                                         |
 | `ingress.path`                  | Ingress Path                                     | `/`                                                          |
--- a/bitnami/nginx/templates/svc.yaml
+++ b/bitnami/nginx/templates/svc.yaml
@@ -7,6 +7,10 @@ metadata:
    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
    release: "{{ .Release.Name }}"
    heritage: "{{ .Release.Service }}"
+{{- with .Values.service.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
  type: {{ .Values.service.type }}
  {{- if (or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort")) }}
--- a/bitnami/nginx/values.yaml
+++ b/bitnami/nginx/values.yaml
@@ -31,7 +31,11 @@ image:
 ##
 service:
  type: LoadBalancer
-  # HTTP Port
+  ## Provide optional annotations to the service i.e. for external-dns
+  # annotations: 
+  #   external-dns.alpha.kubernetes.io/hostname: yourservicename.k8s.yourcompany.com
+  ##
+  ## HTTP Port
  port: 80
  ##
  ## loadBalancerIP:
--- a/bitnami/node/Chart.yaml
+++ b/bitnami/node/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: node
-version: 8.1.4
+version: 8.1.5
 appVersion: 10.15.3
 description: Event-driven I/O server-side JavaScript environment based on V8
 keywords:
--- a/bitnami/node/templates/deployment.yaml
+++ b/bitnami/node/templates/deployment.yaml
@@ -144,7 +144,7 @@ spec:
      - name: data
      {{- if .Values.persistence.enabled }}
        persistentVolumeClaim:
-          claimName: {{ template "fullname" . }}
+          claimName: {{ template "node.fullname" . }}
      {{- else }}
        emptyDir: {}
      {{- end }}
--- a/upstreamed/mariadb/Chart.yaml
+++ b/upstreamed/mariadb/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: mariadb
-version: 5.11.1
-appVersion: 10.1.38
+version: 5.11.2
+appVersion: 10.1.39
 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:
 - mariadb
--- a/upstreamed/mariadb/values-production.yaml
+++ b/upstreamed/mariadb/values-production.yaml
@@ -13,7 +13,7 @@
 image:
  registry: docker.io
  repository: bitnami/mariadb
-  tag: 10.1.38
+  tag: 10.1.39
  ## 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
--- a/upstreamed/mariadb/values.yaml
+++ b/upstreamed/mariadb/values.yaml
@@ -13,7 +13,7 @@
 image:
  registry: docker.io
  repository: bitnami/mariadb
-  tag: 10.1.38
+  tag: 10.1.39
  ## 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
--- a/upstreamed/mongodb/Chart.yaml
+++ b/upstreamed/mongodb/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mongodb
-version: 5.16.3
+version: 5.17.0
 appVersion: 4.0.9
 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications.
 keywords:
--- a/upstreamed/mongodb/README.md
+++ b/upstreamed/mongodb/README.md
@@ -72,6 +72,7 @@ The following table lists the configurable parameters of the MongoDB chart and t
 | `service.clusterIP`                                | Static clusterIP or None for headless services                                               | `nil`                                                   |
 | `service.nodePort`                                 | Port to bind to for NodePort service type                                                    | `nil`                                                   |
 | `service.loadBalancerIP`                           | Static IP Address to use for LoadBalancer service type                                       | `nil`                                                   |
+| `service.externalIPs`                              | External IP list to use with ClusterIP service type                                          | []                                                      |
 | `port`                                             | MongoDB service port                                                                         | `27017`                                                 |
 | `replicaSet.enabled`                               | Switch to enable/disable replica set configuration                                           | `false`                                                 |
 | `replicaSet.name`                                  | Name of the replica set                                                                      | `rs0`                                                   |
--- a/upstreamed/mongodb/templates/deployment-standalone.yaml
+++ b/upstreamed/mongodb/templates/deployment-standalone.yaml
@@ -71,6 +71,13 @@ spec:
          value: "1"
        {{- end }}
        {{- if .Values.usePassword }}
+        {{- if and .Values.mongodbUsername .Values.mongodbDatabase }}
+        - name: MONGODB_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ if .Values.existingSecret }}{{ .Values.existingSecret }}{{- else }}{{ template "mongodb.fullname" . }}{{- end }}
+              key: mongodb-password
+        {{- end }}
        - name: MONGODB_ROOT_PASSWORD
          valueFrom:
            secretKeyRef:
@@ -81,13 +88,6 @@ spec:
        - name: MONGODB_USERNAME
          value: {{ .Values.mongodbUsername | quote }}
        {{- end }}
-        {{- if and .Values.mongodbUsername .Values.mongodbDatabase }}
-        - name: MONGODB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ if .Values.existingSecret }}{{ .Values.existingSecret }}{{- else }}{{ template "mongodb.fullname" . }}{{- end }}
-              key: mongodb-password
-        {{- end }}
        - name: MONGODB_SYSTEM_LOG_VERBOSITY
          value: {{ .Values.mongodbSystemLogVerbosity | quote }}
        - name: MONGODB_DISABLE_SYSTEM_LOG
--- a/upstreamed/mongodb/templates/secrets.yaml
+++ b/upstreamed/mongodb/templates/secrets.yaml
@@ -10,13 +10,11 @@ metadata:
    heritage: "{{ .Release.Service }}"
 type: Opaque
 data:
-  {{- if .Values.usePassword }}
  {{- if .Values.mongodbRootPassword }}
  mongodb-root-password:  {{ .Values.mongodbRootPassword | b64enc | quote }}
  {{- else }}
  mongodb-root-password: {{ randAlphaNum 10 | b64enc | quote }}
  {{- end }}
-  {{- end }}
  {{- if and .Values.mongodbUsername .Values.mongodbDatabase }}
  {{- if .Values.mongodbPassword }}
  mongodb-password:  {{ .Values.mongodbPassword | b64enc | quote }}
--- a/upstreamed/mongodb/templates/statefulset-primary-rs.yaml
+++ b/upstreamed/mongodb/templates/statefulset-primary-rs.yaml
@@ -111,7 +111,7 @@ spec:
            value: {{ .Values.mongodbDatabase | quote }}
          {{- end }}
            {{- if .Values.usePassword }}
-            {{- if and .Values.mongodbUsername (or .Values.mongodbPassword .Values.existingSecret) }}
+            {{- if and .Values.mongodbUsername .Values.mongodbDatabase }}
          - name: MONGODB_PASSWORD
            valueFrom:
              secretKeyRef:
--- a/upstreamed/mongodb/templates/svc-primary-rs.yaml
+++ b/upstreamed/mongodb/templates/svc-primary-rs.yaml
@@ -20,6 +20,10 @@ spec:
  {{- if and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerIP }}
  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
  {{- end }}
+  {{- if .Values.service.externalIPs }}
+  externalIPs:
+  {{ toYaml .Values.service.externalIPs | indent 4 }}
+  {{- end }}

  ports:
  - name: mongodb
--- a/upstreamed/mongodb/templates/svc-standalone.yaml
+++ b/upstreamed/mongodb/templates/svc-standalone.yaml
@@ -20,6 +20,10 @@ spec:
  {{- if and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerIP }}
  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
  {{- end }}
+  {{- if .Values.service.externalIPs }}
+  externalIPs:
+  {{ toYaml .Values.service.externalIPs | indent 4 }}
+  {{- end }}

  ports:
  - name: mongodb
--- a/upstreamed/mongodb/values-production.yaml
+++ b/upstreamed/mongodb/values-production.yaml
@@ -100,6 +100,10 @@ service:
  ##
  # nodePort:

+  ## Specify the externalIP value ClusterIP service type.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#external-ips
+  # externalIPs: []
+
  ## Specify the loadBalancerIP value for LoadBalancer service types.
  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer
  ##
--- a/upstreamed/mongodb/values.yaml
+++ b/upstreamed/mongodb/values.yaml
@@ -100,6 +100,10 @@ service:
  ##
  # nodePort:

+  ## Specify the externalIP value ClusterIP service type.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#external-ips
+  # externalIPs: []
+
  ## Specify the loadBalancerIP value for LoadBalancer service types.
  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer
  ##
--- a/upstreamed/nats/Chart.yaml
+++ b/upstreamed/nats/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: nats
-version: 2.4.1
+version: 2.4.2
 appVersion: 1.4.1
 description: An open-source, cloud-native messaging system
 keywords:
--- a/upstreamed/nats/templates/statefulset.yaml
+++ b/upstreamed/nats/templates/statefulset.yaml
@@ -92,7 +92,7 @@ spec:
        - gnatsd
        args:
        - -c
-        - /opt/bitnami/nats/gnatsd.conf
+        - /opt/nats/gnatsd.conf
        {{- if .Values.extraArgs }}
 {{ toYaml .Values.extraArgs | indent 8 }}
        {{- end }}
@@ -129,7 +129,7 @@ spec:
 {{ toYaml .Values.resources | indent 10 }}
        volumeMounts:
          - name: config
-            mountPath: /opt/bitnami/nats/gnatsd.conf
+            mountPath: /opt/nats/gnatsd.conf
            subPath: gnatsd.conf
        {{- if .Values.sidecars }}
 {{ toYaml .Values.sidecars | indent 6 }}
--- a/upstreamed/phpbb/Chart.yaml
+++ b/upstreamed/phpbb/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: phpbb
-version: 4.3.1
-appVersion: 3.2.6
+version: 4.3.2
+appVersion: 3.2.7
 description: Community forum that supports the notion of users and groups, file attachments, full-text search, notifications and more.
 keywords:
 - phpbb
--- a/upstreamed/phpbb/values.yaml
+++ b/upstreamed/phpbb/values.yaml
@@ -13,7 +13,7 @@
 image:
  registry: docker.io
  repository: bitnami/phpbb
-  tag: 3.2.6
+  tag: 3.2.7
  ## 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
--- a/upstreamed/postgresql/Chart.yaml
+++ b/upstreamed/postgresql/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: postgresql
-version: 3.18.3
+version: 3.18.4
 appVersion: 10.7.0
 description: Chart for PostgreSQL, an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance.
 keywords:
--- a/upstreamed/postgresql/templates/statefulset-slaves.yaml
+++ b/upstreamed/postgresql/templates/statefulset-slaves.yaml
@@ -94,7 +94,7 @@ spec:
        {{- end }}
        {{- if .Values.persistence.mountPath }}
        - name: PGDATA
-          value: {{ .Values.persistence.mountPath | quote }}
+          value: {{ .Values.postgresqlDataDir | quote }}
        {{- end }}
        - name: POSTGRES_REPLICATION_MODE
          value: "slave"
--- a/upstreamed/prestashop/Chart.yaml
+++ b/upstreamed/prestashop/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: prestashop
-version: 6.5.0
-appVersion: 1.7.5-1
+version: 6.5.1
+appVersion: 1.7.5-2
 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:
 - prestashop
--- a/upstreamed/prestashop/values.yaml
+++ b/upstreamed/prestashop/values.yaml
@@ -13,7 +13,7 @@
 image:
  registry: docker.io
  repository: bitnami/prestashop
-  tag: 1.7.5-1
+  tag: 1.7.5-2
  ## 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
--- a/upstreamed/redis/Chart.yaml
+++ b/upstreamed/redis/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: redis
-version: 7.0.1
+version: 7.0.2
 appVersion: 4.0.14
 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:
--- a/upstreamed/redis/README.md
+++ b/upstreamed/redis/README.md
@@ -133,6 +133,7 @@ The following table lists the configurable parameters of the Redis chart and the
 | `usePasswordFile`                             | Mount passwords as files instead of environment variables                                                                                           | `false`                                                 |                                                    |         |
 | `password`                                    | Redis password (ignored if existingSecret set)                                                                                                      | Randomly generated                                      |                                                    |         |
 | `configmap`                                   | Redis configuration file to be used                                                                                                                 | `nil`                                                   |                                                    |         |
+| `clusterDomain`                         | Kubernetes DNS Domain name to use                                                                                                                   | `cluster.local`                                         |                                                    |         |
 | `networkPolicy.enabled`                       | Enable NetworkPolicy                                                                                                                                | `false`                                                 |                                                    |         |
 | `networkPolicy.allowExternal`                 | Don't require client label for connections                                                                                                          | `true`                                                  |                                                    |         |
 | `securityContext.enabled`                     | Enable security context (both redis master and slave pods)                                                                                          | `true`                                                  |                                                    |         |
--- a/upstreamed/redis/templates/NOTES.txt
+++ b/upstreamed/redis/templates/NOTES.txt
@@ -24,21 +24,21 @@
 {{- if .Values.sentinel.enabled }}
 Redis can be accessed via port {{ .Values.sentinel.service.redisPort }} on the following DNS name from within your cluster:

-{{ template "redis.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local for read only operations
+{{ template "redis.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} for read only operations

 For read/write operations, first access the Redis Sentinel cluster, which is available in port {{ .Values.sentinel.service.sentinelPort }} using the same domain name above.

 {{- else }}
 Redis can be accessed via port {{ .Values.redisPort }} on the following DNS names from within your cluster:

-{{ template "redis.fullname" . }}-master.{{ .Release.Namespace }}.svc.cluster.local for read/write operations
-{{ template "redis.fullname" . }}-slave.{{ .Release.Namespace }}.svc.cluster.local for read-only operations
+{{ template "redis.fullname" . }}-master.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} for read/write operations
+{{ template "redis.fullname" . }}-slave.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} for read-only operations
 {{- end }}

 {{- else }}
 Redis can be accessed via port {{ .Values.redisPort }} on the following DNS name from within your cluster:

-{{ template "redis.fullname" . }}-master.{{ .Release.Namespace }}.svc.cluster.local
+{{ template "redis.fullname" . }}-master.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}

 {{- end }}

--- a/upstreamed/redis/templates/redis-slave-statefulset.yaml
+++ b/upstreamed/redis/templates/redis-slave-statefulset.yaml
@@ -109,7 +109,7 @@ spec:
        - name: REDIS_REPLICATION_MODE
          value: slave
        - name: REDIS_MASTER_HOST
-          value: {{ template "redis.fullname" . }}-master-0.{{ template "redis.fullname" . }}-headless.{{ .Release.Namespace }}.svc.cluster.local
+          value: {{ template "redis.fullname" . }}-master-0.{{ template "redis.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
        - name: REDIS_PORT
          value: {{ .Values.redisPort | quote }}
        - name: REDIS_MASTER_PORT_NUMBER
--- a/upstreamed/redis/values.yaml
+++ b/upstreamed/redis/values.yaml
@@ -109,6 +109,10 @@ sentinel:
    annotations: {}
    loadBalancerIP:

+## Specifies the Kubernetes Cluster's Domain Name.
+##
+clusterDomain: cluster.local
+
 networkPolicy:
  ## Specifies whether a NetworkPolicy should be created
  ##
--- a/upstreamed/wordpress/Chart.yaml
+++ b/upstreamed/wordpress/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: wordpress
-version: 5.9.0
+version: 5.9.1
 appVersion: 5.1.1
 description: Web publishing platform for building blogs and websites.
 icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png
--- a/upstreamed/wordpress/requirements.lock
+++ b/upstreamed/wordpress/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: mariadb
  repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 5.2.5
+  version: 5.11.2
 digest: sha256:5c711356a05ffeaffafba333092229eadc8ba3cc377b56861988517ac77b7609
-generated: 2018-12-20T02:17:40.600689797Z
+generated: 2019-05-06T09:06:30.894764031+02:00