Skip to content

Commit babc1f9

Browse files
ploxilnploxiln
authored
Merge pull request #9 from wirwolf/patch-1
add nsqadmin ingressClassName config value
2 parents b4a37d2 + 6309754 commit babc1f9

File tree

4 files changed

+32
-23
lines changed

4 files changed

+32
-23
lines changed

‎README.md‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,27 +43,28 @@ The following table lists the configurable parameters of the nsq chart and their
4343

4444
### nsqadmin
4545

46-
| Value | Description | Default |
47-
|------------------------------|--------------------------------------------------------------------------------------|--------------------------|
48-
| nsqadmin.enabled | Enable the nsqadmin | `true` |
49-
| nsqadmin.fullnameOverride | String to partially override nsq.nsqadmin.fullname | `.Release.Name-nsqadmin` |
50-
| nsqadmin.replicaCount | Number of nsqadmin replicas | `1` |
51-
| nsqadmin.priorityClassName | The name of the kube priority class used. Defaults to global default. | `nil` |
52-
| nsqadmin.extraArgs | Extra arguments to provide to the `nsqadmin` command | `[]` |
53-
| nsqadmin.service.type | The nsqadmin service type | `ClusterIP` |
54-
| nsqadmin.service.port | The nsqadmin service port | `4171` |
55-
| nsqadmin.service.nodePort | The nsqadmin service node port | `nil` |
56-
| nsqadmin.ingress.enabled | Enable the nsqadmin ingress | `false` |
57-
| nsqadmin.ingress.host | Host of the nsqadmin ingress | `nil` |
58-
| nsqadmin.ingress.annotations | The annotations to attach to the ingress | `{}` |
59-
| nsqadmin.ingress.tls | TLS configurations for the hostname | `[]` |
60-
| nsqadmin.podAnnotations | The annotations to attach to the nsqadmin pods | `{}` |
61-
| nsqadmin.podSecurityContext | The security context to attach to the nsqadmin pods | `{}` |
62-
| nsqadmin.resources | The resources to allocate to the nsqadmin pods | `{}` |
63-
| nsqadmin.serviceAccountName | The name of the service account used. Defaults to namespace default service account. | `nil` |
64-
| nsqadmin.nodeSelector | The tags that will be used to select the node on which the pods should be scheduled | `{}` |
65-
| nsqadmin.tolerations | Tolerations for pod assignment | `[]` |
66-
| nsqadmin.affinity | Affinity for pod assignment | `[]` |
46+
| Value | Description | Default |
47+
|-----------------------------------|--------------------------------------------------------------------------------------|--------------------------|
48+
| nsqadmin.enabled | Enable the nsqadmin | `true` |
49+
| nsqadmin.fullnameOverride | String to partially override nsq.nsqadmin.fullname | `.Release.Name-nsqadmin` |
50+
| nsqadmin.replicaCount | Number of nsqadmin replicas | `1` |
51+
| nsqadmin.priorityClassName | The name of the kube priority class used. Defaults to global default. | `nil` |
52+
| nsqadmin.extraArgs | Extra arguments to provide to the `nsqadmin` command | `[]` |
53+
| nsqadmin.service.type | The nsqadmin service type | `ClusterIP` |
54+
| nsqadmin.service.port | The nsqadmin service port | `4171` |
55+
| nsqadmin.service.nodePort | The nsqadmin service node port | `nil` |
56+
| nsqadmin.ingress.enabled | Enable the nsqadmin ingress | `false` |
57+
| nsqadmin.ingress.host | Host of the nsqadmin ingress | `nil` |
58+
| nsqadmin.ingress.ingressClassName | Set the ingerssClassName on the ingress record for k8s 1.18+ | `` |
59+
| nsqadmin.ingress.annotations | The annotations to attach to the ingress | `{}` |
60+
| nsqadmin.ingress.tls | TLS configurations for the hostname | `[]` |
61+
| nsqadmin.podAnnotations | The annotations to attach to the nsqadmin pods | `{}` |
62+
| nsqadmin.podSecurityContext | The security context to attach to the nsqadmin pods | `{}` |
63+
| nsqadmin.resources | The resources to allocate to the nsqadmin pods | `{}` |
64+
| nsqadmin.serviceAccountName | The name of the service account used. Defaults to namespace default service account. | `nil` |
65+
| nsqadmin.nodeSelector | The tags that will be used to select the node on which the pods should be scheduled | `{}` |
66+
| nsqadmin.tolerations | Tolerations for pod assignment | `[]` |
67+
| nsqadmin.affinity | Affinity for pod assignment | `[]` |
6768

6869
### nsqd
6970

‎charts/nsq/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: nsq
33
description: A realtime distributed messaging platform
44
type: application
5-
version: 0.0.5
5+
version: 0.0.6
66
appVersion: 1.2.1
77
home: https://github.com/nsqio/helm-chart/tree/master/charts/nsq
88
icon: https://nsq.io/static/img/nsq_blue.png

‎charts/nsq/templates/ingress.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ metadata:
1616
{{- toYaml . | nindent 4 }}
1717
{{- end }}
1818
spec:
19+
{{- if .Values.nsqadmin.ingress.ingressClassName }}
20+
ingressClassName: {{ .Values.nsqadmin.ingress.ingressClassName | quote }}
21+
{{- end }}
1922
{{- if .Values.nsqadmin.ingress.tls }}
2023
tls:
2124
{{- range .Values.nsqadmin.ingress.tls }}

‎charts/nsq/values.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ nsqadmin:
6464

6565
ingress:
6666
enabled: false
67+
## @param nsqadmin.ingress.ingressClassName Set the ingerssClassName on the ingress record for k8s 1.18+
68+
## This is supported in Kubernetes 1.18+ and required if you have more than one IngressClass marked as the default for your cluster .
69+
## ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/
70+
##
71+
ingressClassName: ""
6772
host:
6873
annotations:
6974
{}
@@ -240,4 +245,4 @@ metrics:
240245
honorLabels: false
241246
## @param metrics.serviceMonitor.jobLabel The name of the label on the target service to use as the job name in prometheus.
242247
##
243-
jobLabel: ""
248+
jobLabel: ""

0 commit comments

Comments
 (0)