Skip to content

Commit 8218c6b

Browse files
foster-rhfoster-rh
authored
Merge pull request #12 from rh-mobb/foster/acm-stuff
added acm spoke hub clusters
2 parents 2a470dc + b7f9e73 commit 8218c6b

11 files changed

Lines changed: 154 additions & 43 deletions

File tree

‎archive/servicemesh-operator/values.yaml‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

archive/servicemesh-operator/.gitignore renamed to charts/servicemesh-operator-ambient/.gitignore

File renamed without changes.

archive/servicemesh-operator/Chart.yaml renamed to charts/servicemesh-operator-ambient/Chart.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apiVersion: v2
2-
name: servicemesh-operator
3-
description: Helm chart for deploying Red Hat OpenShift Service Mesh Operator
2+
name: servicemesh-operator-ambient
3+
description: Helm chart for deploying Red Hat OpenShift Service Mesh 3 Operator
44
type: application
5-
version: 0.5.2
6-
appVersion: "2.5"
5+
version: 1.0.0
6+
appVersion: "3.0"
77
dependencies:
8-
- name: helper-operator
9-
version: ~1.1.0
10-
repository: https://rosa-hcp-dedicated-vpc.github.io/helm-repository/
118
- name: helper-status-checker
129
version: 4.4.3
1310
repository: https://rosa-hcp-dedicated-vpc.github.io/helm-repository/
1411
condition: helper-status-checker.enabled
12+
maintainers:
13+
- name: rh-mobb
14+

archive/servicemesh-operator/README.md renamed to charts/servicemesh-operator-ambient/README.md

File renamed without changes.

‎charts/servicemesh-operator-ambient/templates/istio.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{{- if .Values.ambient.enabled }}
2+
apiVersion: sailoperator.io/v1
3+
kind: Istio
4+
metadata:
5+
name: {{ .Values.ambient.istio.name }}
6+
annotations:
7+
argocd.argoproj.io/sync-wave: "2"
8+
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
9+
spec:
10+
namespace: {{ .Values.ambient.istio.namespace }}
11+
profile: ambient
12+
{{- if .Values.ambient.istio.version }}
13+
version: {{ .Values.ambient.istio.version }}
14+
{{- end }}
15+
values:
16+
pilot:
17+
trustedZtunnelNamespace: {{ .Values.ambient.ztunnel.namespace }}
18+
{{- end }}

‎charts/servicemesh-operator-ambient/templates/istiocni.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{{- if .Values.ambient.enabled }}
2+
apiVersion: sailoperator.io/v1
3+
kind: IstioCNI
4+
metadata:
5+
name: {{ .Values.ambient.cni.name }}
6+
annotations:
7+
argocd.argoproj.io/sync-wave: "2"
8+
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
9+
spec:
10+
namespace: {{ .Values.ambient.cni.namespace }}
11+
profile: ambient
12+
{{- if .Values.ambient.cni.version }}
13+
version: {{ .Values.ambient.cni.version }}
14+
{{- end }}
15+
values:
16+
cni:
17+
ambient:
18+
reconcileIptablesOnStartup: true
19+
{{- end }}

‎charts/servicemesh-operator-ambient/templates/namespaces.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{{- if .Values.ambient.enabled }}
2+
apiVersion: v1
3+
kind: Namespace
4+
metadata:
5+
name: {{ .Values.ambient.istio.namespace }}
6+
annotations:
7+
argocd.argoproj.io/sync-wave: "1"
8+
---
9+
apiVersion: v1
10+
kind: Namespace
11+
metadata:
12+
name: {{ .Values.ambient.cni.namespace }}
13+
annotations:
14+
argocd.argoproj.io/sync-wave: "1"
15+
---
16+
apiVersion: v1
17+
kind: Namespace
18+
metadata:
19+
name: {{ .Values.ambient.ztunnel.namespace }}
20+
annotations:
21+
argocd.argoproj.io/sync-wave: "1"
22+
{{- end }}

‎charts/servicemesh-operator-ambient/templates/operatorgroup.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{{- if .Values.operatorGroup.create }}
2+
apiVersion: operators.coreos.com/v1
3+
kind: OperatorGroup
4+
metadata:
5+
name: {{ .Values.operatorGroup.name | default .Values.subscription.name }}
6+
namespace: {{ .Values.namespace }}
7+
annotations:
8+
helm.sh/hook: pre-install
9+
helm.sh/hook-weight: "-1"
10+
spec:
11+
{{- if .Values.operatorGroup.targetNamespaces }}
12+
targetNamespaces:
13+
{{- range .Values.operatorGroup.targetNamespaces }}
14+
- {{ . }}
15+
{{- end }}
16+
{{- end }}
17+
upgradeStrategy: Default
18+
{{- end }}

‎charts/servicemesh-operator-ambient/templates/subscription.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
apiVersion: operators.coreos.com/v1alpha1
2+
kind: Subscription
3+
metadata:
4+
name: {{ .Values.subscription.name }}
5+
namespace: {{ .Values.namespace }}
6+
annotations:
7+
helm.sh/hook: pre-install
8+
helm.sh/hook-weight: "0"
9+
spec:
10+
channel: {{ .Values.subscription.channel }}
11+
installPlanApproval: {{ .Values.subscription.installPlanApproval }}
12+
name: {{ .Values.subscription.name }}
13+
source: {{ .Values.subscription.source }}
14+
sourceNamespace: {{ .Values.subscription.sourceNamespace }}
15+
{{- if .Values.subscription.startingCSV }}
16+
startingCSV: {{ .Values.subscription.startingCSV }}
17+
{{- end }}

‎charts/servicemesh-operator-ambient/templates/ztunnel.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{{- if .Values.ambient.enabled }}
2+
apiVersion: sailoperator.io/v1alpha1
3+
kind: ZTunnel
4+
metadata:
5+
name: {{ .Values.ambient.ztunnel.name }}
6+
annotations:
7+
argocd.argoproj.io/sync-wave: "2"
8+
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
9+
spec:
10+
namespace: {{ .Values.ambient.ztunnel.namespace }}
11+
profile: ambient
12+
{{- if .Values.ambient.ztunnel.version }}
13+
version: {{ .Values.ambient.ztunnel.version }}
14+
{{- end }}
15+
{{- end }}

0 commit comments

Comments
 (0)