diff --git a/README.md b/README.md index c5d1a87..369482c 100644 --- a/README.md +++ b/README.md @@ -43,27 +43,28 @@ The following table lists the configurable parameters of the nsq chart and their ### nsqadmin -| Value | Description | Default | -|------------------------------|--------------------------------------------------------------------------------------|--------------------------| -| nsqadmin.enabled | Enable the nsqadmin | `true` | -| nsqadmin.fullnameOverride | String to partially override nsq.nsqadmin.fullname | `.Release.Name-nsqadmin` | -| nsqadmin.replicaCount | Number of nsqadmin replicas | `1` | -| nsqadmin.priorityClassName | The name of the kube priority class used. Defaults to global default. | `nil` | -| nsqadmin.extraArgs | Extra arguments to provide to the `nsqadmin` command | `[]` | -| nsqadmin.service.type | The nsqadmin service type | `ClusterIP` | -| nsqadmin.service.port | The nsqadmin service port | `4171` | -| nsqadmin.service.nodePort | The nsqadmin service node port | `nil` | -| nsqadmin.ingress.enabled | Enable the nsqadmin ingress | `false` | -| nsqadmin.ingress.host | Host of the nsqadmin ingress | `nil` | -| nsqadmin.ingress.annotations | The annotations to attach to the ingress | `{}` | -| nsqadmin.ingress.tls | TLS configurations for the hostname | `[]` | -| nsqadmin.podAnnotations | The annotations to attach to the nsqadmin pods | `{}` | -| nsqadmin.podSecurityContext | The security context to attach to the nsqadmin pods | `{}` | -| nsqadmin.resources | The resources to allocate to the nsqadmin pods | `{}` | -| nsqadmin.serviceAccountName | The name of the service account used. Defaults to namespace default service account. | `nil` | -| nsqadmin.nodeSelector | The tags that will be used to select the node on which the pods should be scheduled | `{}` | -| nsqadmin.tolerations | Tolerations for pod assignment | `[]` | -| nsqadmin.affinity | Affinity for pod assignment | `[]` | +| Value | Description | Default | +|-----------------------------------|--------------------------------------------------------------------------------------|--------------------------| +| nsqadmin.enabled | Enable the nsqadmin | `true` | +| nsqadmin.fullnameOverride | String to partially override nsq.nsqadmin.fullname | `.Release.Name-nsqadmin` | +| nsqadmin.replicaCount | Number of nsqadmin replicas | `1` | +| nsqadmin.priorityClassName | The name of the kube priority class used. Defaults to global default. | `nil` | +| nsqadmin.extraArgs | Extra arguments to provide to the `nsqadmin` command | `[]` | +| nsqadmin.service.type | The nsqadmin service type | `ClusterIP` | +| nsqadmin.service.port | The nsqadmin service port | `4171` | +| nsqadmin.service.nodePort | The nsqadmin service node port | `nil` | +| nsqadmin.ingress.enabled | Enable the nsqadmin ingress | `false` | +| nsqadmin.ingress.host | Host of the nsqadmin ingress | `nil` | +| nsqadmin.ingress.ingressClassName | Set the ingerssClassName on the ingress record for k8s 1.18+ | `` | +| nsqadmin.ingress.annotations | The annotations to attach to the ingress | `{}` | +| nsqadmin.ingress.tls | TLS configurations for the hostname | `[]` | +| nsqadmin.podAnnotations | The annotations to attach to the nsqadmin pods | `{}` | +| nsqadmin.podSecurityContext | The security context to attach to the nsqadmin pods | `{}` | +| nsqadmin.resources | The resources to allocate to the nsqadmin pods | `{}` | +| nsqadmin.serviceAccountName | The name of the service account used. Defaults to namespace default service account. | `nil` | +| nsqadmin.nodeSelector | The tags that will be used to select the node on which the pods should be scheduled | `{}` | +| nsqadmin.tolerations | Tolerations for pod assignment | `[]` | +| nsqadmin.affinity | Affinity for pod assignment | `[]` | ### nsqd diff --git a/charts/nsq/Chart.yaml b/charts/nsq/Chart.yaml index f6a096a..cb347f1 100644 --- a/charts/nsq/Chart.yaml +++ b/charts/nsq/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: nsq description: A realtime distributed messaging platform type: application -version: 0.0.5 +version: 0.0.6 appVersion: 1.2.1 home: https://github.com/nsqio/helm-chart/tree/master/charts/nsq icon: https://nsq.io/static/img/nsq_blue.png diff --git a/charts/nsq/templates/ingress.yaml b/charts/nsq/templates/ingress.yaml index 250631e..8d05430 100644 --- a/charts/nsq/templates/ingress.yaml +++ b/charts/nsq/templates/ingress.yaml @@ -16,6 +16,9 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: + {{- if .Values.nsqadmin.ingress.ingressClassName }} + ingressClassName: {{ .Values.nsqadmin.ingress.ingressClassName | quote }} + {{- end }} {{- if .Values.nsqadmin.ingress.tls }} tls: {{- range .Values.nsqadmin.ingress.tls }} diff --git a/charts/nsq/values.yaml b/charts/nsq/values.yaml index aca25e9..6e2704b 100644 --- a/charts/nsq/values.yaml +++ b/charts/nsq/values.yaml @@ -64,6 +64,11 @@ nsqadmin: ingress: enabled: false + ## @param nsqadmin.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: "" host: annotations: {} @@ -240,4 +245,4 @@ metrics: honorLabels: false ## @param metrics.serviceMonitor.jobLabel The name of the label on the target service to use as the job name in prometheus. ## - jobLabel: "" \ No newline at end of file + jobLabel: ""