Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions charts/servicemesh-operator-ambient/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: servicemesh-operator-ambient
description: Helm chart for deploying Red Hat OpenShift Service Mesh 3 Operator
type: application
version: 1.0.0
version: 1.0.1
appVersion: "3.0"
dependencies:
- name: helper-status-checker
Expand All @@ -11,4 +11,3 @@ dependencies:
condition: helper-status-checker.enabled
maintainers:
- name: rh-mobb

4 changes: 1 addition & 3 deletions charts/servicemesh-operator-ambient/templates/istio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ metadata:
spec:
namespace: {{ .Values.ambient.istio.namespace }}
profile: ambient
{{- if .Values.ambient.istio.version }}
version: {{ .Values.ambient.istio.version }}
{{- end }}
version: {{ .Values.ambient.istio.version | default .Values.ambient.version }}
values:
pilot:
trustedZtunnelNamespace: {{ .Values.ambient.ztunnel.namespace }}
Expand Down
4 changes: 1 addition & 3 deletions charts/servicemesh-operator-ambient/templates/istiocni.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ metadata:
spec:
namespace: {{ .Values.ambient.cni.namespace }}
profile: ambient
{{- if .Values.ambient.cni.version }}
version: {{ .Values.ambient.cni.version }}
{{- end }}
version: {{ .Values.ambient.cni.version | default .Values.ambient.version }}
values:
cni:
ambient:
Expand Down
7 changes: 2 additions & 5 deletions charts/servicemesh-operator-ambient/templates/ztunnel.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- if .Values.ambient.enabled }}
apiVersion: sailoperator.io/v1alpha1
apiVersion: sailoperator.io/v1
kind: ZTunnel
metadata:
name: {{ .Values.ambient.ztunnel.name }}
Expand All @@ -8,8 +8,5 @@ metadata:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
spec:
namespace: {{ .Values.ambient.ztunnel.namespace }}
profile: ambient
{{- if .Values.ambient.ztunnel.version }}
version: {{ .Values.ambient.ztunnel.version }}
{{- end }}
version: {{ .Values.ambient.ztunnel.version | default .Values.ambient.version }}
{{- end }}
1 change: 1 addition & 0 deletions charts/servicemesh-operator-ambient/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ operatorGroup:

ambient:
enabled: true
version: v1.27-latest
istio:
name: default
namespace: istio-system
Expand Down
Loading