Update rabbitmq ingress

bitnami · Jan 13, 2021 · c228cac · c228cac
1 parent 1db59ce
commit c228cac
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 7 deletions.
diff --git a/bitnami/rabbitmq/Chart.yaml b/bitnami/rabbitmq/Chart.yaml
@@ -23,4 +23,4 @@ name: rabbitmq
 sources:
  - https://github.com/bitnami/bitnami-docker-rabbitmq
  - https://www.rabbitmq.com
-version: 8.6.4
+version: 8.7.0
diff --git a/bitnami/rabbitmq/README.md b/bitnami/rabbitmq/README.md
@@ -60,6 +60,7 @@ The following table lists the configurable parameters of the RabbitMQ chart and
 | `nameOverride` | String to partially override rabbitmq.fullname | `nil` |
 | `fullnameOverride` | String to fully override rabbitmq.fullname | `nil` |
 | `clusterDomain` | Default Kubernetes cluster domain | `cluster.local` |
+| `kubeVersion` | Force target Kubernetes version (using Helm capabilities if not set) | `nil` |
 
 ### RabbitMQ parameters
 
@@ -183,6 +184,9 @@ The following table lists the configurable parameters of the RabbitMQ chart and
 | `service.labels` | Service labels | `{}` (evaluated as a template) |
 | `service.annotations` | Service annotations | `{}` (evaluated as a template) |
 | `ingress.enabled` | Enable ingress resource for Management console | `false` |
+| `ingress.apiVersion` | Force Ingress API version (automatically detected if not set) | `` |
+| `ingress.path` | Ingress path | `/` |
+| `ingress.pathType` | Ingress path type | `ImplementationSpecific` |
 | `ingress.path` | Path for the default host | `/` |
 | `ingress.certManager` | Add annotations for cert-manager | `false` |
 | `ingress.hostname` | Default host for the ingress resource | `rabbitmq.local` |

diff --git a/bitnami/rabbitmq/templates/ingress.yaml b/bitnami/rabbitmq/templates/ingress.yaml
@@ -19,18 +19,20 @@ spec:
  http:
  paths:
  - path: {{ .Values.ingress.path }}
- backend:
- serviceName: {{ template "rabbitmq.fullname" . }}
- servicePort: http-stats
+ {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
+ pathType: {{ .Values.ingress.pathType }}
+ {{- end }}
+ backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" "http-stats" "context" $) | nindent 14 }}
  {{- end }}
  {{- range .Values.ingress.extraHosts }}
  - host: {{ .name }}
  http:
  paths:
  - path: {{ default "/" .path }}
- backend:
- serviceName: {{ template "rabbitmq.fullname" $ }}
- servicePort: http-stats
+ {{- if eq "true" (include "common.ingress.supportsPathType" $) }}
+ pathType: {{ default "ImplementationSpecific" .pathType }}
+ {{- end }}
+ backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http-stats" "context" $) | nindent 14 }}
  {{- end }}
  {{- if or .Values.ingress.tls .Values.ingress.extraTls }}
  tls:

diff --git a/bitnami/rabbitmq/values-production.yaml b/bitnami/rabbitmq/values-production.yaml
@@ -8,6 +8,10 @@
 # - myRegistryKeySecretName
 # storageClass: myStorageClass
 
+## Force target Kubernetes version (using Helm capabilites if not set)
+##
+kubeVersion:
+
 ## Bitnami RabbitMQ image version
 ## ref: https://hub.docker.com/r/bitnami/rabbitmq/tags/
 ##
@@ -723,6 +727,7 @@ ingress:
  ## extraHosts:
  ## - name: rabbitmq.local
  ## path: /
+ ## pathType: ImplementationSpecific
  ##
 
  ## The tls configuration for additional hostnames to be covered with this ingress record.
@@ -749,6 +754,18 @@ ingress:
  ## certificate:
  ##
 
+ ## Override API Version (automatically detected if not set)
+ ##
+ apiVersion:
+
+ ## Ingress Path
+ ##
+ path: /
+
+ ## Ingress Path type
+ ##
+ pathType: ImplementationSpecific
+
 ## Prometheus Metrics
 ##
 metrics:

diff --git a/bitnami/rabbitmq/values.yaml b/bitnami/rabbitmq/values.yaml
@@ -8,6 +8,10 @@
 # - myRegistryKeySecretName
 # storageClass: myStorageClass
 
+## Force target Kubernetes version (using Helm capabilites if not set)
+##
+kubeVersion:
+
 ## Bitnami RabbitMQ image version
 ## ref: https://hub.docker.com/r/bitnami/rabbitmq/tags/
 ##
@@ -735,6 +739,7 @@ ingress:
  ## extraHosts:
  ## - name: rabbitmq.local
  ## path: /
+ ## pathType: ImplementationSpecific
  ##
 
  ## The tls configuration for additional hostnames to be covered with this ingress record.
@@ -761,6 +766,18 @@ ingress:
  ## certificate:
  ##
 
+ ## Override API Version (automatically detected if not set)
+ ##
+ apiVersion:
+
+ ## Ingress Path
+ ##
+ path: /
+
+ ## Ingress Path type
+ ##
+ pathType: ImplementationSpecific
+
 ## Prometheus Metrics
 ##
 metrics: