Skip to content

Commit

Permalink
Merge pull request #9 from wirwolf/patch-1
Browse files Browse the repository at this point in the history 
add nsqadmin ingressClassName config value
  • Loading branch information
@ploxiln
ploxiln authored Aug 19, 2022
2 parents b4a37d2 + 6309754 commit babc1f9
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 23 deletions.
43 changes: 22 additions & 21 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion charts/nsq/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions charts/nsq/templates/ingress.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
7 changes: 6 additions & 1 deletion charts/nsq/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
{}
Expand Down Expand Up @@ -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: ""
jobLabel: ""

0 comments on commit babc1f9

Please sign in to comment.