Skip to content

Commit ae4a5c7

Browse files
foster-rhfoster-rh
authored
Merge pull request #45 from rh-mobb/foster/acm-stuff
added acm spoke hub clusters
2 parents 08051c0 + 54e48a8 commit ae4a5c7

8 files changed

Lines changed: 331 additions & 23 deletions

File tree

‎charts/network-observability-operator/Chart.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apiVersion: v2
22
name: network-observability-operator
3-
description: Helm chart for deploying the Network Observability Operator for network traffic flow monitoring
3+
description: Helm chart for deploying the Network Observability Operator with Loki-backed flow storage
44
type: application
5-
version: 1.0.2
5+
version: 2.0.0
66
appVersion: "1.11"
77
dependencies:
88
- name: helper-status-checker
99
version: 4.4.3
10-
repository: https://rosa-hcp-dedicated-vpc.github.io/helm-repository/
10+
repository: https://rh-mobb.github.io/validated-pattern-helm-charts/
1111
condition: helper-status-checker.enabled
1212
maintainers:
1313
- name: rh-mobb

‎charts/network-observability-operator/templates/flowcollector.yaml‎

Lines changed: 93 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,99 @@ spec:
1010
namespace: {{ .Values.flowCollector.namespace }}
1111
deploymentModel: {{ .Values.flowCollector.deploymentModel }}
1212
agent:
13-
type: eBPF
13+
type: {{ .Values.flowCollector.agent.type }}
1414
ebpf:
1515
sampling: {{ .Values.flowCollector.agent.sampling }}
16+
cacheActiveTimeout: {{ .Values.flowCollector.agent.cacheActiveTimeout }}
17+
cacheMaxFlows: {{ .Values.flowCollector.agent.cacheMaxFlows }}
18+
logLevel: {{ .Values.flowCollector.agent.logLevel }}
19+
imagePullPolicy: IfNotPresent
20+
excludeInterfaces:
21+
- lo
22+
resources:
23+
{{- toYaml .Values.flowCollector.agent.resources | nindent 8 }}
24+
metrics:
25+
server:
26+
port: 9400
27+
tls:
28+
insecureSkipVerify: false
29+
type: Disabled
30+
{{- if and .Values.flowCollector.loki.enable .Values.lokiStack.enabled }}
31+
loki:
32+
enable: true
33+
mode: {{ .Values.flowCollector.loki.mode }}
34+
{{- if eq .Values.flowCollector.loki.mode "LokiStack" }}
35+
lokiStack:
36+
name: {{ .Values.lokiStack.name }}
37+
namespace: {{ .Values.lokiStack.namespace }}
38+
{{- end }}
39+
advanced:
40+
{{- toYaml .Values.flowCollector.loki.advanced | nindent 6 }}
41+
writeBatchSize: {{ .Values.flowCollector.loki.writeBatchSize | int64 }}
42+
writeBatchWait: {{ .Values.flowCollector.loki.writeBatchWait }}
43+
readTimeout: {{ .Values.flowCollector.loki.readTimeout }}
44+
writeTimeout: {{ .Values.flowCollector.loki.writeTimeout }}
45+
{{- else }}
46+
loki:
47+
enable: false
48+
{{- end }}
49+
consolePlugin:
50+
enable: {{ .Values.flowCollector.consolePlugin.enable }}
51+
advanced:
52+
port: 9001
53+
register: {{ .Values.flowCollector.consolePlugin.register }}
54+
logLevel: {{ .Values.flowCollector.consolePlugin.logLevel }}
55+
imagePullPolicy: IfNotPresent
56+
replicas: {{ .Values.flowCollector.consolePlugin.replicas }}
57+
resources:
58+
{{- toYaml .Values.flowCollector.consolePlugin.resources | nindent 6 }}
59+
portNaming:
60+
enable: {{ .Values.flowCollector.consolePlugin.portNaming.enable }}
61+
portNames:
62+
{{- toYaml .Values.flowCollector.consolePlugin.portNaming.portNames | nindent 8 }}
63+
quickFilters:
64+
{{- toYaml .Values.flowCollector.consolePlugin.quickFilters | nindent 6 }}
65+
autoscaler:
66+
maxReplicas: 3
67+
metrics:
68+
- type: Resource
69+
resource:
70+
name: cpu
71+
target:
72+
type: Utilization
73+
averageUtilization: 50
74+
minReplicas: 1
75+
status: Disabled
76+
processor:
77+
logLevel: {{ .Values.flowCollector.processor.logLevel }}
78+
logTypes: {{ .Values.flowCollector.processor.logTypes }}
79+
imagePullPolicy: IfNotPresent
80+
resources:
81+
{{- toYaml .Values.flowCollector.processor.resources | nindent 6 }}
82+
advanced:
83+
conversationEndTimeout: {{ .Values.flowCollector.processor.advanced.conversationEndTimeout }}
84+
conversationHeartbeatInterval: {{ .Values.flowCollector.processor.advanced.conversationHeartbeatInterval }}
85+
conversationTerminatingTimeout: {{ .Values.flowCollector.processor.advanced.conversationTerminatingTimeout }}
86+
dropUnusedFields: {{ .Values.flowCollector.processor.advanced.dropUnusedFields }}
87+
enableKubeProbes: true
88+
healthPort: 8080
89+
port: 2055
90+
profilePort: 6060
91+
metrics:
92+
disableAlerts: []
93+
server:
94+
port: 9401
95+
tls:
96+
insecureSkipVerify: false
97+
type: Disabled
98+
multiClusterDeployment: false
99+
prometheus:
100+
querier:
101+
enable: {{ .Values.flowCollector.prometheus.querier.enable }}
102+
mode: {{ .Values.flowCollector.prometheus.querier.mode }}
103+
timeout: {{ .Values.flowCollector.prometheus.querier.timeout }}
104+
exporters: []
105+
networkPolicy:
106+
additionalNamespaces: []
107+
enable: false
16108
{{- end }}

‎charts/network-observability-operator/templates/loki-namespace.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{{- if .Values.lokiStack.enabled }}
2+
apiVersion: v1
3+
kind: Namespace
4+
metadata:
5+
name: {{ .Values.lokiStack.namespace }}
6+
labels:
7+
openshift.io/cluster-monitoring: "true"
8+
annotations:
9+
argocd.argoproj.io/sync-wave: "-1"
10+
{{- end }}

‎charts/network-observability-operator/templates/loki-s3-externalsecret.yaml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{{- if and .Values.lokiStack.enabled .Values.externalSecret.enabled }}
2+
apiVersion: external-secrets.io/v1beta1
3+
kind: ExternalSecret
4+
metadata:
5+
name: {{ .Values.lokiStack.storage.secretName }}
6+
namespace: {{ .Values.lokiStack.namespace }}
7+
annotations:
8+
argocd.argoproj.io/sync-wave: "4"
9+
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
10+
spec:
11+
refreshInterval: 1h
12+
secretStoreRef:
13+
name: {{ .Values.externalSecret.secretStore }}
14+
kind: ClusterSecretStore
15+
target:
16+
name: {{ .Values.lokiStack.storage.secretName }}
17+
creationPolicy: Owner
18+
data:
19+
- secretKey: audience
20+
remoteRef:
21+
key: {{ .Values.externalSecret.remoteKey }}
22+
property: audience
23+
- secretKey: bucketnames
24+
remoteRef:
25+
key: {{ .Values.externalSecret.remoteKey }}
26+
property: bucketnames
27+
- secretKey: region
28+
remoteRef:
29+
key: {{ .Values.externalSecret.remoteKey }}
30+
property: region
31+
- secretKey: role_arn
32+
remoteRef:
33+
key: {{ .Values.externalSecret.remoteKey }}
34+
property: role_arn
35+
{{- end }}

‎charts/network-observability-operator/templates/lokistack.yaml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{{- if .Values.lokiStack.enabled }}
2+
apiVersion: loki.grafana.com/v1
3+
kind: LokiStack
4+
metadata:
5+
name: {{ .Values.lokiStack.name }}
6+
namespace: {{ .Values.lokiStack.namespace }}
7+
annotations:
8+
argocd.argoproj.io/sync-wave: "5"
9+
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
10+
spec:
11+
size: {{ .Values.lokiStack.size }}
12+
storage:
13+
schemas:
14+
- effectiveDate: {{ .Values.lokiStack.storage.schemaEffectiveDate | quote }}
15+
version: {{ .Values.lokiStack.storage.schemaVersion }}
16+
secret:
17+
name: {{ .Values.lokiStack.storage.secretName }}
18+
type: {{ .Values.lokiStack.storage.secretType }}
19+
credentialMode: {{ .Values.lokiStack.credentialMode }}
20+
storageClassName: {{ .Values.lokiStack.storageClassName }}
21+
tenants:
22+
mode: {{ .Values.lokiStack.tenants.mode }}
23+
{{- if .Values.lokiStack.limits }}
24+
limits:
25+
{{- if .Values.lokiStack.limits.global }}
26+
global:
27+
{{- if .Values.lokiStack.limits.global.queries }}
28+
queries:
29+
{{- toYaml .Values.lokiStack.limits.global.queries | nindent 8 }}
30+
{{- end }}
31+
{{- end }}
32+
{{- end }}
33+
{{- end }}

‎charts/network-observability-operator/templates/operatorgroup.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
apiVersion: operators.coreos.com/v1
33
kind: OperatorGroup
44
metadata:
5-
name: {{ .Values.operatorGroup.name | default .Values.subscription.name }}
6-
namespace: {{ .Values.namespace }}
5+
name: {{ .Values.operatorGroup.name }}
6+
namespace: {{ .Values.operatorGroup.namespace }}
77
annotations:
88
argocd.argoproj.io/sync-wave: "0"
99
spec:

‎charts/network-observability-operator/templates/subscription.yaml‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,27 @@
1+
{{- range .Values.subscriptions }}
2+
{{- if .enabled }}
3+
---
14
apiVersion: operators.coreos.com/v1alpha1
25
kind: Subscription
36
metadata:
4-
name: {{ .Values.subscription.name }}
5-
namespace: {{ .Values.namespace }}
7+
name: {{ .name }}
8+
namespace: {{ .namespace }}
69
annotations:
710
argocd.argoproj.io/sync-wave: "0"
811
spec:
9-
channel: {{ .Values.subscription.channel }}
10-
installPlanApproval: {{ .Values.subscription.installPlanApproval }}
11-
name: {{ .Values.subscription.name }}
12-
source: {{ .Values.subscription.source }}
13-
sourceNamespace: {{ .Values.subscription.sourceNamespace }}
14-
{{- if .Values.subscription.startingCSV }}
15-
startingCSV: {{ .Values.subscription.startingCSV }}
12+
channel: {{ .channel }}
13+
installPlanApproval: {{ .installPlanApproval }}
14+
name: {{ .name }}
15+
source: {{ .source }}
16+
sourceNamespace: {{ .sourceNamespace }}
17+
{{- if .startingCSV }}
18+
startingCSV: {{ .startingCSV }}
1619
{{- end }}
20+
{{- if .roleArn }}
21+
config:
22+
env:
23+
- name: ROLEARN
24+
value: {{ .roleArn }}
25+
{{- end }}
26+
{{- end }}
27+
{{- end }}

0 commit comments

Comments
 (0)