From dfcb6fbb531af26ffbc7e581fb14f46f2f2761bb Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Tue, 16 Apr 2019 12:37:30 +0000 Subject: [PATCH] Synchronize upstreamed folder to a86129ae1 --- upstreamed/odoo/Chart.yaml | 4 ++-- upstreamed/odoo/values.yaml | 2 +- upstreamed/postgresql/Chart.yaml | 2 +- upstreamed/postgresql/README.md | 2 +- upstreamed/postgresql/templates/svc.yaml | 6 ++++++ upstreamed/postgresql/values-production.yaml | 6 ++++++ upstreamed/postgresql/values.yaml | 6 ++++++ upstreamed/rabbitmq/Chart.yaml | 2 +- upstreamed/rabbitmq/templates/svc.yaml | 6 ++++++ upstreamed/rabbitmq/values-production.yaml | 6 ++++++ upstreamed/rabbitmq/values.yaml | 5 +++++ 11 files changed, 41 insertions(+), 6 deletions(-) diff --git a/upstreamed/odoo/Chart.yaml b/upstreamed/odoo/Chart.yaml index 90bd949c0..60e190ca5 100644 --- a/upstreamed/odoo/Chart.yaml +++ b/upstreamed/odoo/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: odoo -version: 6.2.1 -appVersion: 11.0.20190315 +version: 6.2.2 +appVersion: 11.0.20190415 description: A suite of web based open source business apps. home: https://www.odoo.com/ icon: https://bitnami.com/assets/stacks/odoo/img/odoo-stack-110x117.png diff --git a/upstreamed/odoo/values.yaml b/upstreamed/odoo/values.yaml index 5b2730035..a2e965b64 100644 --- a/upstreamed/odoo/values.yaml +++ b/upstreamed/odoo/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/odoo - tag: 11.0.20190315 + tag: 11.0.20190415 ## 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/upstreamed/postgresql/Chart.yaml b/upstreamed/postgresql/Chart.yaml index 7f7ab03c5..48b9cb28d 100644 --- a/upstreamed/postgresql/Chart.yaml +++ b/upstreamed/postgresql/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: postgresql -version: 3.17.0 +version: 3.18.0 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: diff --git a/upstreamed/postgresql/README.md b/upstreamed/postgresql/README.md index 0b82797e2..a460967db 100644 --- a/upstreamed/postgresql/README.md +++ b/upstreamed/postgresql/README.md @@ -20,7 +20,6 @@ Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment - PV provisioner support in the underlying infrastructure ## Installing the Chart - To install the chart with the release name `my-release`: ```console @@ -94,6 +93,7 @@ The following tables lists the configurable parameters of the PostgreSQL chart a | `service.nodePort` | Kubernetes Service nodePort | `nil` | | `service.annotations` | Annotations for PostgreSQL service | {} | | `service.loadBalancerIP` | loadBalancerIP if service type is `LoadBalancer` | `nil` | +| `service.loadBalancerSourceRanges` | Address that are allowed when svc is LoadBalancer| {} | | `persistence.enabled` | Enable persistence using PVC | `true` | | `persistence.existingClaim` | Provide an existing `PersistentVolumeClaim`, the value is evaluated as a template. | `nil` | | `persistence.mountPath` | Path to mount the volume at | `/bitnami/postgresql` | diff --git a/upstreamed/postgresql/templates/svc.yaml b/upstreamed/postgresql/templates/svc.yaml index a2e93222e..c8a7887f5 100644 --- a/upstreamed/postgresql/templates/svc.yaml +++ b/upstreamed/postgresql/templates/svc.yaml @@ -15,6 +15,12 @@ spec: type: {{ .Values.service.type }} {{- if and .Values.service.loadBalancerIP (eq .Values.service.type "LoadBalancer") }} loadBalancerIP: {{ .Values.service.loadBalancerIP }} + {{- end }} + {{- if and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges }} + loadBalancerSourceRanges: + {{ with .Values.service.loadBalancerSourceRanges }} +{{ toYaml . | indent 4 }} +{{- end }} {{- end }} {{- if and (eq .Values.service.type "ClusterIP") .Values.service.clusterIP }} clusterIP: {{ .Values.service.clusterIP }} diff --git a/upstreamed/postgresql/values-production.yaml b/upstreamed/postgresql/values-production.yaml index e3fc86456..62ebb83ef 100644 --- a/upstreamed/postgresql/values-production.yaml +++ b/upstreamed/postgresql/values-production.yaml @@ -180,6 +180,12 @@ service: ## # loadBalancerIP: + ## Load Balancer sources + ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service + ## + # loadBalancerSourceRanges: + # - 10.10.10.0/24 + ## PostgreSQL data Persistent Volume Storage Class ## If defined, storageClassName: ## If set to "-", storageClassName: "", which disables dynamic provisioning diff --git a/upstreamed/postgresql/values.yaml b/upstreamed/postgresql/values.yaml index ac7b35bee..fb978f9c7 100644 --- a/upstreamed/postgresql/values.yaml +++ b/upstreamed/postgresql/values.yaml @@ -187,6 +187,12 @@ service: ## # loadBalancerIP: + ## Load Balancer sources + ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service + ## + # loadBalancerSourceRanges: + # - 10.10.10.0/24 + ## PostgreSQL data Persistent Volume Storage Class ## If defined, storageClassName: ## If set to "-", storageClassName: "", which disables dynamic provisioning diff --git a/upstreamed/rabbitmq/Chart.yaml b/upstreamed/rabbitmq/Chart.yaml index 5f860329d..aab5f5a62 100644 --- a/upstreamed/rabbitmq/Chart.yaml +++ b/upstreamed/rabbitmq/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: rabbitmq -version: 5.3.0 +version: 5.4.0 appVersion: 3.7.14 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP) keywords: diff --git a/upstreamed/rabbitmq/templates/svc.yaml b/upstreamed/rabbitmq/templates/svc.yaml index 81200309a..b03e1ec10 100644 --- a/upstreamed/rabbitmq/templates/svc.yaml +++ b/upstreamed/rabbitmq/templates/svc.yaml @@ -18,6 +18,12 @@ metadata: {{- end }} spec: type: {{ .Values.service.type }} +{{- if and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges }} + loadBalancerSourceRanges: + {{ with .Values.service.loadBalancerSourceRanges }} +{{ toYaml . | indent 4 }} +{{- end }} +{{- end }} ports: - name: epmd port: 4369 diff --git a/upstreamed/rabbitmq/values-production.yaml b/upstreamed/rabbitmq/values-production.yaml index f70404790..5b74ae835 100644 --- a/upstreamed/rabbitmq/values-production.yaml +++ b/upstreamed/rabbitmq/values-production.yaml @@ -139,6 +139,12 @@ service: annotations: # service.beta.kubernetes.io/aws-load-balancer-internal: 0.0.0.0/0 + ## Load Balancer sources + ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service + ## + # loadBalancerSourceRanges: + # - 10.10.10.0/24 + # Additional pod labels to apply podLabels: {} diff --git a/upstreamed/rabbitmq/values.yaml b/upstreamed/rabbitmq/values.yaml index 53c186cb9..382d0d860 100644 --- a/upstreamed/rabbitmq/values.yaml +++ b/upstreamed/rabbitmq/values.yaml @@ -139,6 +139,11 @@ service: annotations: # service.beta.kubernetes.io/aws-load-balancer-internal: 0.0.0.0/0 + ## Load Balancer sources + ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service + ## + # loadBalancerSourceRanges: + # - 10.10.10.0/24 # Additional pod labels to apply podLabels: {}