Skip to content

Commit

Permalink
add jestream condition check for stan component (#2090)
Browse files Browse the repository at this point in the history
  • Loading branch information
pgvishnuram committed Jan 24, 2024
1 parent 1159b5b commit e7e9278
Show file tree
Hide file tree
Showing 8 changed files with 59 additions and 1 deletion.
6 changes: 5 additions & 1 deletion charts/stan/templates/configmap.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
##############################
## STAN ConfigMap Template ##
##############################
{{- if not .Values.global.nats.jetStream.enabled }}
apiVersion: v1
kind: ConfigMap
metadata:
Expand Down Expand Up @@ -62,3 +65,4 @@ data:
store_limits: {{ toPrettyJson . | indent 6 }}
{{- end }}
}
{{- end }}
2 changes: 2 additions & 0 deletions charts/stan/templates/initdb.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
{{- if not .Values.global.nats.jetStream.enabled }}
{{- if eq .Values.store.type "sql" }}
{{- if .Values.store.sql.initdb.enabled }}
apiVersion: batch/v1
Expand Down Expand Up @@ -46,3 +47,4 @@ spec:
{{- end }}
{{- end }}
{{- end }}
{{- end }}
2 changes: 2 additions & 0 deletions charts/stan/templates/natsservicerole.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
{{- if not .Values.global.nats.jetStream.enabled }}
{{- if .Values.stan.nats.serviceRoleAuth.enabled }}
apiVersion: nats.io/v1alpha2
kind: NatsServiceRole
Expand All @@ -20,3 +21,4 @@ kind: ServiceAccount
metadata:
name: nats-streaming
{{- end }}
{{- end }}
2 changes: 2 additions & 0 deletions charts/stan/templates/pod-disruption-budget.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
##############################
## STAN Pod Disruption Budget
##############################
{{- if not .Values.global.nats.jetStream.enabled }}
{{- if .Values.global.podDisruptionBudgetsEnabled }}
apiVersion: {{ include "apiVersion.PodDisruptionBudget" . }}
kind: PodDisruptionBudget
Expand All @@ -14,3 +15,4 @@ spec:
app: {{ template "stan.name" . }}
release: {{ .Release.Name }}
{{- end }}
{{- end }}
5 changes: 5 additions & 0 deletions charts/stan/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
---
##############################
## STAN Service Template ##
##############################
{{- if not .Values.global.nats.jetStream.enabled }}
apiVersion: v1
kind: Service
metadata:
Expand All @@ -25,3 +29,4 @@ spec:
- name: metrics
port: 7777
appProtocol: http
{{- end }}
2 changes: 2 additions & 0 deletions charts/stan/templates/stan-networkpolicy.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
################################
## Houston NetworkPolicy
################################
{{- if not .Values.global.nats.jetStream.enabled }}
{{- if .Values.global.networkPolicy.enabled }}
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
Expand Down Expand Up @@ -43,3 +44,4 @@ spec:
- protocol: TCP
port: 8222
{{- end }}
{{- end }}
5 changes: 5 additions & 0 deletions charts/stan/templates/statefulset.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
---
###############################
## STAN Statefulset Template ##
###############################
{{- if not .Values.global.nats.jetStream.enabled }}
apiVersion: apps/v1
kind: StatefulSet
metadata:
Expand Down Expand Up @@ -185,3 +189,4 @@ spec:
{{ include "stan.storageClass" . }}
{{- end }}
{{- end }}
{{- end }}
36 changes: 36 additions & 0 deletions tests/chart_tests/test_nats_jetstream.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,39 @@ def test_nats_statefulset_with_jetstream_and_tls(self, kube_version):
"name": "nats-jetstream-client-tls-volume",
"secret": {"secretName": "release-name-jetstream-tls-certificate-client"},
} in docs[10]["spec"]["template"]["spec"]["volumes"]

def test_stan_with_jetstream_enabled(self, kube_version):
"""Test that stan statefulset is disabled when jetstream is enabled."""
values = {
"global": {"nats": {"jetStream": {"enabled": True}}},
}
docs = render_chart(
kube_version=kube_version,
values=values,
show_only=[
"charts/stan/templates/configmap.yaml",
"charts/stan/templates/service.yaml",
"charts/stan/templates/statefulset.yaml",
"charts/stan/templates/stan-networkpolicy.yaml",
],
)

assert len(docs) == 0

def test_stan_with_jetstream_disabled(self, kube_version):
"""Test that stan statefulset is disabled when jetstream is enabled."""
values = {
"global": {"nats": {"jetStream": {"enabled": False}}},
}
docs = render_chart(
kube_version=kube_version,
values=values,
show_only=[
"charts/stan/templates/configmap.yaml",
"charts/stan/templates/service.yaml",
"charts/stan/templates/statefulset.yaml",
"charts/stan/templates/stan-networkpolicy.yaml",
],
)

assert len(docs) == 4

0 comments on commit e7e9278

Please sign in to comment.