Skip to content

Commit b141590

Browse files
committed
fix: configure oxia istio defaults
1 parent cea508c commit b141590

4 files changed

Lines changed: 54 additions & 0 deletions

File tree

charts/sn-platform-slim/templates/oxia/oxia-cluster.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
{{- if include "pulsar.metadata.isOxia" . }}
66
{{- $oxia := default dict .Values.oxia }}
77
{{- $dataserver := default dict $oxia.dataserver }}
8+
{{- $oxiaIstio := default dict $oxia.istio }}
9+
{{- $istioRevision := index (default dict .Values.istio.labels) "istio.io/rev" }}
810
apiVersion: k8s.streamnative.io/v1alpha1
911
kind: OxiaCluster
1012
metadata:
@@ -47,12 +49,28 @@ spec:
4749
{{- if .Values.istio.enabled }}
4850
istio:
4951
enabled: true
52+
{{- with $istioRevision }}
53+
revision: {{ . | quote }}
54+
{{- end }}
5055
{{- if .Values.istio.dataplaneMode }}
5156
dataplaneMode: {{ .Values.istio.dataplaneMode }}
5257
{{- end }}
5358
{{- if .Values.istio.migration }}
5459
mtls:
5560
mode: permissive
5661
{{- end }}
62+
{{- if $oxiaIstio.authRules }}
63+
authRules:
64+
{{ toYaml $oxiaIstio.authRules | indent 4 }}
65+
{{- else }}
66+
authRules:
67+
- toOperation:
68+
- ports:
69+
- "6648"
70+
- "6649"
71+
- "8080"
72+
- "6650"
73+
- "8081"
74+
{{- end }}
5775
{{- end }}
5876
{{- end }}

charts/sn-platform-slim/values.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,6 +1159,15 @@ pulsar_metadata:
11591159
# limits:
11601160
# cpu: "1"
11611161
# memory: "1Gi"
1162+
# istio:
1163+
# authRules:
1164+
# - toOperation:
1165+
# - ports:
1166+
# - "6648"
1167+
# - "6649"
1168+
# - "8080"
1169+
# - "6650"
1170+
# - "8081"
11621171

11631172
## deprecated: move to broker.kop
11641173
# kop:

charts/sn-platform/templates/oxia/oxia-cluster.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
{{- if include "pulsar.metadata.isOxia" . }}
66
{{- $oxia := default dict .Values.oxia }}
77
{{- $dataserver := default dict $oxia.dataserver }}
8+
{{- $oxiaIstio := default dict $oxia.istio }}
9+
{{- $istioRevision := index (default dict .Values.istio.labels) "istio.io/rev" }}
810
apiVersion: k8s.streamnative.io/v1alpha1
911
kind: OxiaCluster
1012
metadata:
@@ -47,9 +49,25 @@ spec:
4749
{{- if .Values.istio.enabled }}
4850
istio:
4951
enabled: true
52+
{{- with $istioRevision }}
53+
revision: {{ . | quote }}
54+
{{- end }}
5055
{{- if .Values.istio.migration }}
5156
mtls:
5257
mode: permissive
5358
{{- end }}
59+
{{- if $oxiaIstio.authRules }}
60+
authRules:
61+
{{ toYaml $oxiaIstio.authRules | indent 4 }}
62+
{{- else }}
63+
authRules:
64+
- toOperation:
65+
- ports:
66+
- "6648"
67+
- "6649"
68+
- "8080"
69+
- "6650"
70+
- "8081"
71+
{{- end }}
5472
{{- end }}
5573
{{- end }}

charts/sn-platform/values.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,6 +1234,15 @@ pulsar_metadata:
12341234
# limits:
12351235
# cpu: "1"
12361236
# memory: "1Gi"
1237+
# istio:
1238+
# authRules:
1239+
# - toOperation:
1240+
# - ports:
1241+
# - "6648"
1242+
# - "6649"
1243+
# - "8080"
1244+
# - "6650"
1245+
# - "8081"
12371246

12381247
## deprecated: move to broker.kop
12391248
# kop:

0 commit comments

Comments
 (0)