From 8d5f1b73e70a6b8d5d90e69384e5d658b91fd4c8 Mon Sep 17 00:00:00 2001 From: Olivier Cazade Date: Thu, 25 Jan 2024 17:34:00 +0000 Subject: [PATCH] Bundle update --- ...observ-operator.clusterserviceversion.yaml | 130 ++++-------------- hack/crd2csvSpecDesc.sh | 2 +- 2 files changed, 27 insertions(+), 105 deletions(-) diff --git a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml index bc3ecbccc..5ef0c5b71 100644 --- a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml +++ b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml @@ -446,7 +446,6 @@ spec: name: flowcollectors.flows.netobserv.io specDescriptors: - description: defines the desired type of deployment for flow processing. - displayName: Deployment model path: deploymentModel - description: for flows extraction. displayName: Agent configuration @@ -466,25 +465,20 @@ spec: path: agent.ebpf.privileged x-descriptors: - urn:alm:descriptor:com.tectonic.ui:booleanSwitch - - displayName: Cache active timeout - path: agent.ebpf.cacheActiveTimeout + - path: agent.ebpf.cacheActiveTimeout x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - - displayName: Cache max flows - path: agent.ebpf.cacheMaxFlows + - path: agent.ebpf.cacheMaxFlows x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - - displayName: Kafka batch size - path: agent.ebpf.kafkaBatchSize + - path: agent.ebpf.kafkaBatchSize x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:deploymentModel:Kafka - urn:alm:descriptor:com.tectonic.ui:advanced - - displayName: Log level - path: agent.ebpf.logLevel + - path: agent.ebpf.logLevel x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - - displayName: Image pull policy - path: agent.ebpf.imagePullPolicy + - path: agent.ebpf.imagePullPolicy x-descriptors: - urn:alm:descriptor:com.tectonic.ui:imagePullPolicy - urn:alm:descriptor:com.tectonic.ui:advanced @@ -531,8 +525,7 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:booleanSwitch - - displayName: Cluster name - path: processor.clusterName + - path: processor.clusterName x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:fieldDependency:processor.multiClusterDeployment:true @@ -557,8 +550,7 @@ spec: path: processor.metrics.server.tls.providedCaFile x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:processor.metrics.server.tls.type:Provided - - displayName: Kafka consumer replicas - path: processor.kafkaConsumerReplicas + - path: processor.kafkaConsumerReplicas x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:deploymentModel:Kafka - urn:alm:descriptor:com.tectonic.ui:advanced @@ -567,22 +559,18 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:deploymentModel:Kafka - urn:alm:descriptor:com.tectonic.ui:advanced - - displayName: Kafka consumer queue capacity - path: processor.kafkaConsumerQueueCapacity + - path: processor.kafkaConsumerQueueCapacity x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:deploymentModel:Kafka - urn:alm:descriptor:com.tectonic.ui:advanced - - displayName: Kafka consumer batch size - path: processor.kafkaConsumerBatchSize + - path: processor.kafkaConsumerBatchSize x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:deploymentModel:Kafka - urn:alm:descriptor:com.tectonic.ui:advanced - - displayName: Log level - path: processor.logLevel + - path: processor.logLevel x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - - displayName: Image pull policy - path: processor.imagePullPolicy + - path: processor.imagePullPolicy x-descriptors: - urn:alm:descriptor:com.tectonic.ui:imagePullPolicy - urn:alm:descriptor:com.tectonic.ui:advanced @@ -593,42 +581,33 @@ spec: - description: for the flow store. displayName: Loki client settings path: loki - - displayName: Enable - path: loki.enable + - path: loki.enable x-descriptors: - urn:alm:descriptor:com.tectonic.ui:booleanSwitch - - displayName: Mode - path: loki.mode + - path: loki.mode x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:loki.enable:true - - displayName: Loki stack - path: loki.lokiStack + - path: loki.lokiStack x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:loki.mode:LokiStack - - displayName: Monolithic - path: loki.monolithic + - path: loki.monolithic x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:loki.mode:Monolithic - - displayName: Microservices - path: loki.microservices + - path: loki.microservices x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:loki.mode:Microservices - - displayName: Manual - path: loki.manual + - path: loki.manual x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:loki.mode:Manual - - displayName: Write batch wait - path: loki.writeBatchWait + - path: loki.writeBatchWait x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:loki.enable:true - urn:alm:descriptor:com.tectonic.ui:advanced - - displayName: Write batch size - path: loki.writeBatchSize + - path: loki.writeBatchSize x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:loki.enable:true - urn:alm:descriptor:com.tectonic.ui:advanced - - displayName: Write timeout - path: loki.writeTimeout + - path: loki.writeTimeout x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:loki.enable:true - urn:alm:descriptor:com.tectonic.ui:advanced @@ -640,20 +619,16 @@ spec: path: consolePlugin x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:loki.enable:true - - displayName: Enable - path: consolePlugin.enable + - path: consolePlugin.enable x-descriptors: - urn:alm:descriptor:com.tectonic.ui:booleanSwitch - - displayName: Port naming - path: consolePlugin.portNaming + - path: consolePlugin.portNaming x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:consolePlugin.enable:true - - displayName: Quick filters - path: consolePlugin.quickFilters + - path: consolePlugin.quickFilters x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:consolePlugin.enable:true - - displayName: Replicas - path: consolePlugin.replicas + - path: consolePlugin.replicas x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:consolePlugin.enable:true - urn:alm:descriptor:com.tectonic.ui:advanced @@ -662,13 +637,11 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:consolePlugin.enable:true - urn:alm:descriptor:com.tectonic.ui:advanced - - displayName: Log level - path: consolePlugin.logLevel + - path: consolePlugin.logLevel x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:consolePlugin.enable:true - urn:alm:descriptor:com.tectonic.ui:advanced - - displayName: Image pull policy - path: consolePlugin.imagePullPolicy + - path: consolePlugin.imagePullPolicy x-descriptors: - urn:alm:descriptor:com.tectonic.ui:imagePullPolicy" - urn:alm:descriptor:com.tectonic.ui:fieldDependency:consolePlugin.enable:true @@ -682,7 +655,6 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:hidden - description: additional optional exporters for custom consumption or storage. - displayName: Exporters path: exporters x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced @@ -696,56 +668,6 @@ spec: path: exporters[0].kafka x-descriptors: - urn:alm:descriptor:com.tectonic.ui:fieldDependency:exporters.type:Kafka - - displayName: Exclude interfaces - path: agent.ebpf.excludeInterfaces - - displayName: Features - path: agent.ebpf.features - - displayName: Interfaces - path: agent.ebpf.interfaces - - displayName: Sampling - path: agent.ebpf.sampling - - displayName: Enable - path: consolePlugin.portNaming.enable - - displayName: Port names - path: consolePlugin.portNaming.portNames - - displayName: Address - path: kafka.address - - displayName: Topic - path: kafka.topic - - displayName: Name - path: loki.lokiStack.name - - displayName: Namespace - path: loki.lokiStack.namespace - - displayName: Auth token - path: loki.manual.authToken - - displayName: Ingester url - path: loki.manual.ingesterUrl - - displayName: Querier url - path: loki.manual.querierUrl - - displayName: Status url - path: loki.manual.statusUrl - - displayName: TenantID - path: loki.manual.tenantID - - displayName: Ingester url - path: loki.microservices.ingesterUrl - - displayName: Querier url - path: loki.microservices.querierUrl - - displayName: TenantID - path: loki.microservices.tenantID - - displayName: TenantID - path: loki.monolithic.tenantID - - displayName: Url - path: loki.monolithic.url - - displayName: Namespace - path: namespace - - displayName: Log types - path: processor.logTypes - - displayName: Disable alerts - path: processor.metrics.disableAlerts - - displayName: Include list - path: processor.metrics.includeList - - displayName: Port - path: processor.metrics.server.port statusDescriptors: - description: Namespace where console plugin and flowlogs-pipeline have been deployed. diff --git a/hack/crd2csvSpecDesc.sh b/hack/crd2csvSpecDesc.sh index c2a983436..dae94bf6e 100755 --- a/hack/crd2csvSpecDesc.sh +++ b/hack/crd2csvSpecDesc.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash version="$1"