diff --git a/bitnami/consul/Chart.yaml b/bitnami/consul/Chart.yaml index f416444a8..c6c5a75a3 100644 --- a/bitnami/consul/Chart.yaml +++ b/bitnami/consul/Chart.yaml @@ -23,4 +23,4 @@ name: consul sources: - https://github.com/bitnami/bitnami-docker-consul - https://www.consul.io/ -version: 10.3.10 +version: 10.4.0 diff --git a/bitnami/consul/README.md b/bitnami/consul/README.md index 77fccb46e..bb9f499b5 100644 --- a/bitnami/consul/README.md +++ b/bitnami/consul/README.md @@ -86,7 +86,7 @@ $ helm delete --purge my-release | --------------------------- | -------------------------------------------------------------------------------------------- | --------------------- | | `image.registry` | HashiCorp Consul image registry | `docker.io` | | `image.repository` | HashiCorp Consul image repository | `bitnami/consul` | -| `image.tag` | HashiCorp Consul image tag (immutable tags are recommended) | `1.11.2-debian-10-r0` | +| `image.tag` | HashiCorp Consul image tag (immutable tags are recommended) | `1.12.0-debian-10-r0` | | `image.pullPolicy` | HashiCorp Consul image pull policy | `IfNotPresent` | | `image.pullSecrets` | HashiCorp Consul image pull secrets | `[]` | | `image.debug` | Enable image debug mode | `false` | @@ -186,6 +186,7 @@ $ helm delete --purge my-release | `ingress.pathType` | Ingress path type | `ImplementationSpecific` | | `ingress.hostname` | Default host for the ingress resource, a host pointing to this will be created | `consul-ui.local` | | `ingress.annotations` | Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations. | `{}` | +| `ingress.ingressClassName` | Set the ingerssClassName on the ingress record for k8s 1.18+ | `""` | | `ingress.tls` | Enable TLS configuration for the hostname defined at ingress.hostname parameter | `false` | | `ingress.extraHosts` | An array with additional hostname(s) to be covered with the ingress record | `[]` | | `ingress.extraPaths` | Any additional arbitrary paths that may need to be added to the ingress under the main host. | `[]` | @@ -213,7 +214,7 @@ $ helm delete --purge my-release | `volumePermissions.enabled` | Enable init container that changes the owner and group of the persistent volume | `false` | | `volumePermissions.image.registry` | Bitnami Shell image registry | `docker.io` | | `volumePermissions.image.repository` | Bitnami Shell image repository | `bitnami/bitnami-shell` | -| `volumePermissions.image.tag` | Bitnami Shell image tag (immutable tags are recommended) | `10-debian-10-r307` | +| `volumePermissions.image.tag` | Bitnami Shell image tag (immutable tags are recommended) | `10-debian-10-r402` | | `volumePermissions.image.pullPolicy` | Bitnami Shell image pull policy | `IfNotPresent` | | `volumePermissions.image.pullSecrets` | Bitnami Shell image pull secrets | `[]` | | `volumePermissions.resources.limits` | The resources limits for the container | `{}` | @@ -227,7 +228,7 @@ $ helm delete --purge my-release | `metrics.enabled` | Start a side-car prometheus exporter | `false` | | `metrics.image.registry` | HashiCorp Consul Prometheus Exporter image registry | `docker.io` | | `metrics.image.repository` | HashiCorp Consul Prometheus Exporter image repository | `bitnami/consul-exporter` | -| `metrics.image.tag` | HashiCorp Consul Prometheus Exporter image tag (immutable tags are recommended) | `0.7.1-debian-10-r508` | +| `metrics.image.tag` | HashiCorp Consul Prometheus Exporter image tag (immutable tags are recommended) | `0.8.0-debian-10-r66` | | `metrics.image.pullPolicy` | HashiCorp Consul Prometheus Exporter image pull policy | `IfNotPresent` | | `metrics.image.pullSecrets` | HashiCorp Consul Prometheus Exporter image pull secrets | `[]` | | `metrics.containerSecurityContext.enabled` | HashiCorp Consul Prometheus Exporter securityContext | `true` | diff --git a/bitnami/consul/templates/ingress.yaml b/bitnami/consul/templates/ingress.yaml index cd7c8dc14..c4b2f59ae 100644 --- a/bitnami/consul/templates/ingress.yaml +++ b/bitnami/consul/templates/ingress.yaml @@ -19,6 +19,9 @@ metadata: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} spec: + {{- if and .Values.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }} + ingressClassName: {{ .Values.ingress.ingressClassName | quote }} + {{- end }} rules: {{- if .Values.ingress.hostname }} - host: {{ .Values.ingress.hostname }} diff --git a/bitnami/consul/values.yaml b/bitnami/consul/values.yaml index 95639631c..45cae6855 100644 --- a/bitnami/consul/values.yaml +++ b/bitnami/consul/values.yaml @@ -72,7 +72,7 @@ diagnosticMode: image: registry: docker.io repository: bitnami/consul - tag: 1.12.0-debian-10-r0 + tag: 1.12.0-debian-10-r1 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -452,6 +452,11 @@ ingress: ## cert-manager.io/cluster-issuer: cluster-issuer-name ## annotations: {} + ## @param ingress.ingressClassName Set the ingerssClassName on the ingress record for k8s 1.18+ + ## This is supported in Kubernetes 1.18+ and required if you have more than one IngressClass marked as the default for your cluster . + ## ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/ + ## + ingressClassName: "" ## @param ingress.tls Enable TLS configuration for the hostname defined at ingress.hostname parameter ## TLS certificates will be retrieved from a TLS secret with name: {{- printf "%s-tls" .Values.ingress.hostname }} ## or a custom one if you use the tls.existingSecret parameter