added acm spoke hub clusters

charts/network-observability-operator/Chart.yaml

@@ -1,13 +1,13 @@
 apiVersion: v2
 name: network-observability-operator
-description: Helm chart for deploying the Network Observability Operator for network traffic flow monitoring
+description: Helm chart for deploying the Network Observability Operator with Loki-backed flow storage
 type: application
-version: 1.0.2
+version: 2.0.0
 appVersion: "1.11"
 dependencies:
   - name: helper-status-checker
     version: 4.4.3
-    repository: https://rosa-hcp-dedicated-vpc.github.io/helm-repository/
+    repository: https://rh-mobb.github.io/validated-pattern-helm-charts/
     condition: helper-status-checker.enabled
 maintainers:
   - name: rh-mobb

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

@@ -10,7 +10,99 @@ spec:
   namespace: {{ .Values.flowCollector.namespace }}
   deploymentModel: {{ .Values.flowCollector.deploymentModel }}
   agent:
-    type: eBPF
+    type: {{ .Values.flowCollector.agent.type }}
     ebpf:
       sampling: {{ .Values.flowCollector.agent.sampling }}
+      cacheActiveTimeout: {{ .Values.flowCollector.agent.cacheActiveTimeout }}
+      cacheMaxFlows: {{ .Values.flowCollector.agent.cacheMaxFlows }}
+      logLevel: {{ .Values.flowCollector.agent.logLevel }}
+      imagePullPolicy: IfNotPresent
+      excludeInterfaces:
+        - lo
+      resources:
+        {{- toYaml .Values.flowCollector.agent.resources | nindent 8 }}
+      metrics:
+        server:
+          port: 9400
+          tls:
+            insecureSkipVerify: false
+            type: Disabled
+  {{- if and .Values.flowCollector.loki.enable .Values.lokiStack.enabled }}
+  loki:
+    enable: true
+    mode: {{ .Values.flowCollector.loki.mode }}
+    {{- if eq .Values.flowCollector.loki.mode "LokiStack" }}
+    lokiStack:
+      name: {{ .Values.lokiStack.name }}
+      namespace: {{ .Values.lokiStack.namespace }}
+    {{- end }}
+    advanced:
+      {{- toYaml .Values.flowCollector.loki.advanced | nindent 6 }}
+    writeBatchSize: {{ .Values.flowCollector.loki.writeBatchSize | int64 }}
+    writeBatchWait: {{ .Values.flowCollector.loki.writeBatchWait }}
+    readTimeout: {{ .Values.flowCollector.loki.readTimeout }}
+    writeTimeout: {{ .Values.flowCollector.loki.writeTimeout }}
+  {{- else }}
+  loki:
+    enable: false
+  {{- end }}
+  consolePlugin:
+    enable: {{ .Values.flowCollector.consolePlugin.enable }}
+    advanced:
+      port: 9001
+      register: {{ .Values.flowCollector.consolePlugin.register }}
+    logLevel: {{ .Values.flowCollector.consolePlugin.logLevel }}
+    imagePullPolicy: IfNotPresent
+    replicas: {{ .Values.flowCollector.consolePlugin.replicas }}
+    resources:
+      {{- toYaml .Values.flowCollector.consolePlugin.resources | nindent 6 }}
+    portNaming:
+      enable: {{ .Values.flowCollector.consolePlugin.portNaming.enable }}
+      portNames:
+        {{- toYaml .Values.flowCollector.consolePlugin.portNaming.portNames | nindent 8 }}
+    quickFilters:
+      {{- toYaml .Values.flowCollector.consolePlugin.quickFilters | nindent 6 }}
+    autoscaler:
+      maxReplicas: 3
+      metrics:
+        - type: Resource
+          resource:
+            name: cpu
+            target:
+              type: Utilization
+              averageUtilization: 50
+      minReplicas: 1
+      status: Disabled
+  processor:
+    logLevel: {{ .Values.flowCollector.processor.logLevel }}
+    logTypes: {{ .Values.flowCollector.processor.logTypes }}
+    imagePullPolicy: IfNotPresent
+    resources:
+      {{- toYaml .Values.flowCollector.processor.resources | nindent 6 }}
+    advanced:
+      conversationEndTimeout: {{ .Values.flowCollector.processor.advanced.conversationEndTimeout }}
+      conversationHeartbeatInterval: {{ .Values.flowCollector.processor.advanced.conversationHeartbeatInterval }}
+      conversationTerminatingTimeout: {{ .Values.flowCollector.processor.advanced.conversationTerminatingTimeout }}
+      dropUnusedFields: {{ .Values.flowCollector.processor.advanced.dropUnusedFields }}
+      enableKubeProbes: true
+      healthPort: 8080
+      port: 2055
+      profilePort: 6060
+    metrics:
+      disableAlerts: []
+      server:
+        port: 9401
+        tls:
+          insecureSkipVerify: false
+          type: Disabled
+    multiClusterDeployment: false
+  prometheus:
+    querier:
+      enable: {{ .Values.flowCollector.prometheus.querier.enable }}
+      mode: {{ .Values.flowCollector.prometheus.querier.mode }}
+      timeout: {{ .Values.flowCollector.prometheus.querier.timeout }}
+  exporters: []
+  networkPolicy:
+    additionalNamespaces: []
+    enable: false
 {{- end }}

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

@@ -0,0 +1,10 @@
+{{- if .Values.lokiStack.enabled }}
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ .Values.lokiStack.namespace }}
+  labels:
+    openshift.io/cluster-monitoring: "true"
+  annotations:
+    argocd.argoproj.io/sync-wave: "-1"
+{{- end }}

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

@@ -0,0 +1,35 @@
+{{- if and .Values.lokiStack.enabled .Values.externalSecret.enabled }}
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: {{ .Values.lokiStack.storage.secretName }}
+  namespace: {{ .Values.lokiStack.namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "4"
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+spec:
+  refreshInterval: 1h
+  secretStoreRef:
+    name: {{ .Values.externalSecret.secretStore }}
+    kind: ClusterSecretStore
+  target:
+    name: {{ .Values.lokiStack.storage.secretName }}
+    creationPolicy: Owner
+  data:
+    - secretKey: audience
+      remoteRef:
+        key: {{ .Values.externalSecret.remoteKey }}
+        property: audience
+    - secretKey: bucketnames
+      remoteRef:
+        key: {{ .Values.externalSecret.remoteKey }}
+        property: bucketnames
+    - secretKey: region
+      remoteRef:
+        key: {{ .Values.externalSecret.remoteKey }}
+        property: region
+    - secretKey: role_arn
+      remoteRef:
+        key: {{ .Values.externalSecret.remoteKey }}
+        property: role_arn
+{{- end }}

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

@@ -0,0 +1,33 @@
+{{- if .Values.lokiStack.enabled }}
+apiVersion: loki.grafana.com/v1
+kind: LokiStack
+metadata:
+  name: {{ .Values.lokiStack.name }}
+  namespace: {{ .Values.lokiStack.namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "5"
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+spec:
+  size: {{ .Values.lokiStack.size }}
+  storage:
+    schemas:
+      - effectiveDate: {{ .Values.lokiStack.storage.schemaEffectiveDate | quote }}
+        version: {{ .Values.lokiStack.storage.schemaVersion }}
+    secret:
+      name: {{ .Values.lokiStack.storage.secretName }}
+      type: {{ .Values.lokiStack.storage.secretType }}
+      credentialMode: {{ .Values.lokiStack.credentialMode }}
+  storageClassName: {{ .Values.lokiStack.storageClassName }}
+  tenants:
+    mode: {{ .Values.lokiStack.tenants.mode }}
+  {{- if .Values.lokiStack.limits }}
+  limits:
+    {{- if .Values.lokiStack.limits.global }}
+    global:
+      {{- if .Values.lokiStack.limits.global.queries }}
+      queries:
+        {{- toYaml .Values.lokiStack.limits.global.queries | nindent 8 }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
+{{- end }}

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

@@ -2,8 +2,8 @@
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
-  name: {{ .Values.operatorGroup.name | default .Values.subscription.name }}
-  namespace: {{ .Values.namespace }}
+  name: {{ .Values.operatorGroup.name }}
+  namespace: {{ .Values.operatorGroup.namespace }}
   annotations:
     argocd.argoproj.io/sync-wave: "0"
 spec:

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

@@ -1,16 +1,27 @@
+{{- range .Values.subscriptions }}
+{{- if .enabled }}
+---
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
-  name: {{ .Values.subscription.name }}
-  namespace: {{ .Values.namespace }}
+  name: {{ .name }}
+  namespace: {{ .namespace }}
   annotations:
     argocd.argoproj.io/sync-wave: "0"
 spec:
-  channel: {{ .Values.subscription.channel }}
-  installPlanApproval: {{ .Values.subscription.installPlanApproval }}
-  name: {{ .Values.subscription.name }}
-  source: {{ .Values.subscription.source }}
-  sourceNamespace: {{ .Values.subscription.sourceNamespace }}
-  {{- if .Values.subscription.startingCSV }}
-  startingCSV: {{ .Values.subscription.startingCSV }}
+  channel: {{ .channel }}
+  installPlanApproval: {{ .installPlanApproval }}
+  name: {{ .name }}
+  source: {{ .source }}
+  sourceNamespace: {{ .sourceNamespace }}
+  {{- if .startingCSV }}
+  startingCSV: {{ .startingCSV }}
   {{- end }}
+  {{- if .roleArn }}
+  config:
+    env:
+      - name: ROLEARN
+        value: {{ .roleArn }}
+  {{- end }}
+{{- end }}
+{{- end }}