merge vp and cvp reconcile funcs

CHANGELOG.md

@@ -1,4 +1,7 @@
 ### Added
+- [[65]](https://github.com/kaasops/vector-operator/pull/65) **Refactor**: merge vp and cvp reconcile funcs
+- [[64]](https://github.com/kaasops/vector-operator/pull/64) **Fix** Do not reconсile vector if vp check fail
+- [[63]](https://github.com/kaasops/vector-operator/pull/63) **Fix** Fix configcheck gc
 
 ### v0.0.7
 - [[61]](https://github.com/kaasops/vector-operator/pull/61) **Feature** Filter cache and disable time reconcile

api/v1alpha1/clustervectorpipeline.go

@@ -42,6 +42,10 @@ func (vp *ClusterVectorPipeline) SetConfigCheck(value bool) {
 	vp.Status.ConfigCheckResult = &value
 }
 
+func (vp *ClusterVectorPipeline) GetConfigCheckResult() *bool {
+	return vp.Status.ConfigCheckResult
+}
+
 func (vp *ClusterVectorPipeline) SetReason(reason *string) {
 	vp.Status.Reason = reason
 }

api/v1alpha1/clustervectorpipeline_types.go

@@ -25,7 +25,7 @@ import (
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-//+kubebuilder:resource:shortName=cvp
+//+kubebuilder:resource:scope=Cluster,shortName=cvp
 //+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 //+kubebuilder:printcolumn:name="Valid",type="boolean",JSONPath=".status.configCheckResult"
 

api/v1alpha1/vectorpipeline.go

@@ -42,6 +42,10 @@ func (vp *VectorPipeline) SetConfigCheck(value bool) {
 	vp.Status.ConfigCheckResult = &value
 }
 
+func (vp *VectorPipeline) GetConfigCheckResult() *bool {
+	return vp.Status.ConfigCheckResult
+}
+
 func (vp *VectorPipeline) SetReason(reason *string) {
 	vp.Status.Reason = reason
 }

config/crd/bases/observability.kaasops.io_clustervectorpipelines.yaml

@@ -15,7 +15,7 @@ spec:
     shortNames:
     - cvp
     singular: clustervectorpipeline
-  scope: Namespaced
+  scope: Cluster
   versions:
   - additionalPrinterColumns:
     - jsonPath: .metadata.creationTimestamp

config/rbac/role.yaml

@@ -5,58 +5,6 @@ metadata:
   creationTimestamp: null
   name: manager-role
 rules:
-- apiGroups:
-  - observability.kaasops.io
-  resources:
-  - clustervectorpipelines
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - observability.kaasops.io
-  resources:
-  - clustervectorpipelines/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - observability.kaasops.io
-  resources:
-  - clustervectorpipelines/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - observability.kaasops.io
-  resources:
-  - vectorpipelines
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - observability.kaasops.io
-  resources:
-  - vectorpipelines/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - observability.kaasops.io
-  resources:
-  - vectorpipelines/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - observability.kaasops.io
   resources:

config/samples/observability_v1alpha1_clustervectorpipeline.yaml

@@ -3,4 +3,14 @@ kind: ClusterVectorPipeline
 metadata:
   name: clustervectorpipeline-sample
 spec:
-  # TODO(user): Add fields here
+  sources:
+    test1:
+      type: "kubernetes_logs"
+      extra_label_selector: "app!=testdeployment3"
+  sinks:
+    test2:
+      type: "console"
+      encoding:
+        codec: "json"
+      inputs:
+        - test1

controllers/factory/config/utils.go

@@ -24,5 +24,8 @@ func addPrefix(Namespace, Name, componentName string) string {
 }
 
 func generateName(Namespace, Name string) string {
-	return Namespace + "-" + Name
+	if Namespace != "" {
+		return Namespace + "-" + Name
+	}
+	return Name
 }

controllers/factory/pipeline/pipeline.go

@@ -32,6 +32,7 @@ type Pipeline interface {
 	SetReason(*string)
 	GetLastAppliedPipeline() *uint32
 	SetLastAppliedPipeline(*uint32)
+	GetConfigCheckResult() *bool
 	IsValid() bool
 	IsDeleted() bool
 	UpdateStatus(context.Context, client.Client) error