Meshsync config on Meshery Operator CRD

.github/workflows/approve-to-run-ci.yml

@@ -11,7 +11,7 @@ jobs:
         strategy:
           matrix:
             platform: [ubuntu-22.04]
-            go-version: [1.19.x]
+            go-version: [1.21]
         runs-on: ${{ matrix.platform }}
         steps:
           - uses: actions/setup-go@v4
@@ -36,7 +36,7 @@ jobs:
           - name: Set up Go
             uses: actions/setup-go@v4
             with:
-              go-version: 1.19.x
+              go-version: 1.21
           - name: Set up test-env
             run: make test-env
           - name: Run unit tests
@@ -60,6 +60,6 @@ jobs:
           - name: Set up Go
             uses: actions/setup-go@v4
             with:
-              go-version: 1.19.x
+              go-version: 1.21
           - name: Build
             run: make build

.github/workflows/error-ref-publisher.yaml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@master
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: Run utility
         run: |

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.19 as builder 
+FROM golang:1.21 as builder 
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

api/v1alpha1/meshsync_types.go

@@ -34,10 +34,39 @@ type MeshsyncBroker struct {
 	Native NativeMeshsyncBroker `json:"native,omitempty" yaml:"native,omitempty"`
 }
 
+// an array of resources that meshsync listes to and publishes their events
+type PipelineConfigs []PipelineConfig
+
+// resources that meshsync observes and publishes to a given subscriber via the broker
+type PipelineConfig struct {
+	Name      string `json:"name" yaml:"name"`
+	PublishTo string `json:"publish-to" yaml:"publish-to"`
+}
+
+// an array of resources that meshsync listens to
+type ListenerConfigs []ListenerConfig
+
+// configures resources the meshsync subsribes to
+type ListenerConfig struct {
+	Name           string `json:"name" yaml:"name"`
+	ConnectionName string `json:"connection-name" yaml:"connection-name"`
+	//+optional
+	PublishTo string `json:"publish-to" yaml:"publish-to"`
+	//+optional
+	SubscribeTo string `json:"subscribe-to" yaml:"subscribe-to"`
+}
+
+// Meshsync configuration controls the resources meshsync produces and consumes
+type MeshsyncConfig struct {
+	PipelineConfigs map[string]PipelineConfigs `json:"pipeline-configs,omitempty" yaml:"pipeline-configs,omitempty"`
+	ListenerConfigs map[string]ListenerConfig  `json:"listener-config,omitempty" yaml:"listener-config,omitempty"`
+}
+
 // MeshSyncSpec defines the desired state of MeshSync
 type MeshSyncSpec struct {
 	Size   int32          `json:"size,omitempty" yaml:"size,omitempty"`
 	Broker MeshsyncBroker `json:"broker,omitempty" yaml:"broker,omitempty"`
+	Config MeshsyncConfig `json:"config,omitempty" yaml:"config,omitempty"`
 }
 
 // MeshSyncStatus defines the observed state of MeshSync

api/v1alpha1/meshsync_types_test.go

@@ -51,6 +51,28 @@ var _ = Describe("The test case for the meshsync CRDs", func() {
 					Name:      "default",
 				},
 			},
+			Config: MeshsyncConfig{
+				ListenerConfigs: map[string]ListenerConfig{
+					"global": {
+						Name:           "meshsync-logstream",
+						PublishTo:      "meshery.meshsync.logs",
+						SubscribeTo:    "meshery.meshsync.logs",
+						ConnectionName: "log-stream",
+					},
+				},
+				PipelineConfigs: map[string]PipelineConfigs{
+					"global": []PipelineConfig{
+						{
+							Name:      "namespaces.v1.",
+							PublishTo: "meshery.meshsync.core",
+						},
+						{
+							Name:      "configmaps.v1.",
+							PublishTo: "meshery.meshsync.core",
+						},
+					},
+				},
+			},
 		},
 	}
 
@@ -77,6 +99,31 @@ var _ = Describe("The test case for the meshsync CRDs", func() {
 			url := mesheSyncGet.Spec.Broker.Custom.URL
 			Expect(url == URL).Should(BeTrue())
 
+			By("Confirm the config matches the expected listener and pipeline configs")
+			config := mesheSyncGet.Spec.Config
+			Expect(len(config.ListenerConfigs) == 1).Should(BeTrue())
+			expectedListenerConfig := ListenerConfig{
+
+				Name:           "meshsync-logstream",
+				PublishTo:      "meshery.meshsync.logs",
+				SubscribeTo:    "meshery.meshsync.logs",
+				ConnectionName: "log-stream",
+			}
+			Expect(config.ListenerConfigs["global"] == expectedListenerConfig).Should(BeTrue())
+
+			expectedPipelineConfigs := []PipelineConfig{
+				{
+					Name:      "namespaces.v1.",
+					PublishTo: "meshery.meshsync.core",
+				},
+				{
+					Name:      "configmaps.v1.",
+					PublishTo: "meshery.meshsync.core",
+				},
+			}
+			Expect(config.PipelineConfigs["global"][0] == expectedPipelineConfigs[0]).Should(BeTrue())
+			Expect(config.PipelineConfigs["global"][1] == expectedPipelineConfigs[1]).Should(BeTrue())
+
 		})
 
 		It("The meshsync CRDs update the spec of the resources", func() {

config/crd/bases/meshery.layer5.io_meshsyncs.yaml

@@ -50,6 +50,46 @@ spec:
                         type: string
                     type: object
                 type: object
+              config:
+                description: Meshsync configuration controls the resources meshsync
+                  produces and consumes
+                properties:
+                  listener-config:
+                    additionalProperties:
+                      description: configures resources the meshsync subsribes to
+                      properties:
+                        connection-name:
+                          type: string
+                        name:
+                          type: string
+                        publish-to:
+                          type: string
+                        subscribe-to:
+                          type: string
+                      required:
+                      - connection-name
+                      - name
+                      type: object
+                    type: object
+                  pipeline-configs:
+                    additionalProperties:
+                      description: an array of resources that meshsync listes to and
+                        publishes their events
+                      items:
+                        description: resources that meshsync observes and publishes
+                          to a given subscriber via the broker
+                        properties:
+                          name:
+                            type: string
+                          publish-to:
+                            type: string
+                        required:
+                        - name
+                        - publish-to
+                        type: object
+                      type: array
+                    type: object
+                type: object
               size:
                 format: int32
                 type: integer

config/samples/meshery_v1alpha1_meshsync.yaml

@@ -14,4 +14,38 @@ spec:
   broker:
     native:
       name: meshery-broker
-      namespace: meshery
+      namespace: meshery
+  config:
+    listener-config: 
+      log-stream:
+        connection-name: meshsync-logstream  
+        name: log-stream
+        publish-to: "meshery.meshsync.logs"
+      exec-shell:
+        connection-name: meshsync-exec  
+        name: exec-shell
+        publish-to: meshery.meshsync.exec  
+      request-stream:
+        connection-name: meshsync-request-stream  
+        name: request-stream
+        subscribe-to: meshery.meshsync.request  
+
+    pipeline-configs:
+      local:
+        - name: "replicasets.v1.apps"
+          publish-to: "meshery.meshsync.core"
+        -  name: "pods.v1."
+           publish-to: "meshery.meshsync.core"	
+        -  name: "services.v1."
+           publish-to: "meshery.meshsync.core"						
+        -  name: "deployments.v1.apps"
+           publish-to: "meshery.meshsync.core"
+        -  name: "statefulsets.v1.apps"
+           publish-to: "meshery.meshsync.core"
+      global: 
+        - name:      "namespaces.v1."
+          publish-to: "meshery.meshsync.core"
+        - name:      "configmaps.v1."
+          publish-to: "meshery.meshsync.core"						
+        - name:      "nodes.v1."
+          publish-to: "meshery.meshsync.core"