Meshsync config on Meshery Operator CRD #533

KiptoonKipkurui · 2023-10-11T07:53:29Z

Description
This PR adds Meshsync configuration information to Meshsync CRD
This PR fixes #532

Notes for Reviewers

Signed commits

Yes, I signed my commits.

mod tidy Signed-off-by: Daniel Kiptoon <[email protected]>

Signed-off-by: Daniel Kiptoon <[email protected]>

configs Signed-off-by: Daniel Kiptoon <[email protected]>

Signed-off-by: Daniel Kiptoon <[email protected]>

welcome · 2023-10-11T07:53:32Z

Yay, your first pull request! 👍 A contributor will be by to give feedback soon. In the meantime, please review the Layer5 Community Welcome Guide and sure to join the community Slack.
Be sure to double-check that you have signed your commits. Here are instructions for making signing an implicit activity while peforming a commit.

Signed-off-by: Daniel Kiptoon <[email protected]>

codecov · 2023-10-11T08:44:27Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (9828f7c) 49.70% compared to head (a9ca7f1) 53.30%.

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #533      +/-   ##
==========================================
+ Coverage   49.70%   53.30%   +3.59%     
==========================================
  Files           9        9              
  Lines         513      514       +1     
==========================================
+ Hits          255      274      +19     
+ Misses        236      221      -15     
+ Partials       22       19       -3

Flag	Coverage Δ
unittests	`53.30% <100.00%> (+3.59%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

theBeginner86 · 2023-10-11T14:37:56Z

api/v1alpha1/meshsync_types_test.go

@@ -51,6 +51,28 @@ var _ = Describe("The test case for the meshsync CRDs", func() {
 					Name:      "default",
 				},
 			},
+			Config: MeshsyncConfig{


Thanks for updating the tests cases

Aisuko

Thanks for your contributing. However, there are many things need to be more specific. Please join the Dev meeting and talk to our activate maintainer @leecalcote @theBeginner86. Make sure we have a clearly outline for this feature. Thanks

api/v1alpha1/meshsync_types.go

Aisuko · 2023-10-12T00:56:30Z

api/v1alpha1/meshsync_types.go

 // 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"`


If we want to add a new field to track the configuration of Meshsync. It should show in the MeshSyncStatus. We can set the configuration, but we cannot check it by checking the MeshSync status. It is not we what we want to.

config/samples/meshery_v1alpha1_meshsync.yaml

api/v1alpha1/meshsync_types_test.go

MUzairS15

The ability to control resources to watch should be configurable from other than MeshSync CR.
What other ways have you thought of?

ConfigMap
Env
........

What should be the priority order for all of these?
Is configuration for tier discovery also considered?

Alternatively, can we move/augment the existing constructs for defining PipelineConfigs?
i.e. Defining configs per MeshModel constructs (model, comps...)
This will also help in fingerprinting discovered resources into Meshery Models.

Signed-off-by: Daniel Kiptoon <[email protected]>

MUzairS15

Rest looks good.

MUzairS15 · 2023-11-08T12:49:18Z

api/v1alpha1/meshsync_types_test.go

+				Data: map[string]string{
+					"blacklist": "blacklist",
+					"global":    "global-configs",
+					"local":     "global-configs",


Suggested change

"local": "global-configs",

"local": "local-configs",

@KiptoonKipkurui I think this is the reason why tests are failing.

@MUzairS15 i have fixed the failing unit tests,made them more representative of how the configmap should look with blacklist and whitelisted resources

MUzairS15 · 2023-11-08T12:50:53Z

config/samples/meshery_v1alpha1_meshsync.yaml

+    data:
+      blacklist: "[\"namespaces.v1.\",\"configmaps.v1.\"]"
+      whitelist: "[{\"Resource\":\"namespaces.v1.\",\"Events\":[\"ADDED\",\"DELETE\"]},{\"Resource\":\"replicasets.v1.apps\",\"Events\":[\"ADDED\",\"DELETE\"]},{\"Resource\":\"pods.v1.\",\"Events\":[\"MODIFIED\"]}]"


Please follow the same tense for all events. (ADDED, MODIFIED, DELETED OR ADD, MODIFY, DELETE)

Let me supply the whole list of possible resources and events as a template that one can then modify as needed

@MUzairS15 I have added to the sample config the list of default resources, for blacklist and whitelist resources

Add and reduce from the list accordingly Signed-off-by: Daniel Kiptoon <[email protected]>

MUzairS15

LGTM.

test more representative of the final config object Signed-off-by: Daniel Kiptoon <[email protected]>

…rui/crd_config

welcome · 2023-11-20T14:29:13Z

Thank you for contributing to the Layer5 community! 🎉 \ \ Meshery Logo \ \ ⭐ Please leave a star on the project. 😄

KiptoonKipkurui added 11 commits October 10, 2023 20:55

update to go version 1.21 and reaction to go

546a468

mod tidy Signed-off-by: Daniel Kiptoon <[email protected]>

update env test version from kubernetes 1.24.2 to 1.26.0

0de50cf

Signed-off-by: Daniel Kiptoon <[email protected]>

update golang image version to 1.21

80601d3

Signed-off-by: Daniel Kiptoon <[email protected]>

update golang version to 1.21

5fb4c0c

Signed-off-by: Daniel Kiptoon <[email protected]>

add meshsync config files for listeners and pipeline

89d4336

configs Signed-off-by: Daniel Kiptoon <[email protected]>

add unit tests to cover meshsync config files

0d044ed

Signed-off-by: Daniel Kiptoon <[email protected]>

updates due to additional configs to meshsync CRD

23c8bb8

Signed-off-by: Daniel Kiptoon <[email protected]>

update CRD definition due to updated meshync configs

74223bf

Signed-off-by: Daniel Kiptoon <[email protected]>

make subscribe to and publish to optional fields

06b04a4

Signed-off-by: Daniel Kiptoon <[email protected]>

update manifest to allow optional fields

0ee99ea

Signed-off-by: Daniel Kiptoon <[email protected]>

add sample config for listeners

82b973f

Signed-off-by: Daniel Kiptoon <[email protected]>

KiptoonKipkurui added 2 commits October 11, 2023 11:13

Merge branch 'master' into feat/kiptoonkipkurui/crd_config

6c8f7bd

Signed-off-by: Daniel Kiptoon <[email protected]>

use env test version 1.24.2

3127a88

Signed-off-by: Daniel Kiptoon <[email protected]>

leecalcote requested a review from Aisuko October 11, 2023 13:07

leecalcote added kubernetes kind/feature New major feature or request labels Oct 11, 2023

leecalcote requested a review from theBeginner86 October 11, 2023 13:07

KiptoonKipkurui added the pr/do-not-merge PRs not ready to be merged label Oct 11, 2023

theBeginner86 reviewed Oct 11, 2023

View reviewed changes

Aisuko requested changes Oct 12, 2023

View reviewed changes

MUzairS15 reviewed Oct 13, 2023

View reviewed changes

KiptoonKipkurui added 7 commits October 24, 2023 20:25

Merge branch 'master' into feat/kiptoonkipkurui/crd_config

4b42d37

Signed-off-by: Daniel Kiptoon <[email protected]>

tidy dependencies

c22a176

Signed-off-by: Daniel Kiptoon <[email protected]>

update variable names to more readable versions

daf62b0

Signed-off-by: Daniel Kiptoon <[email protected]>

refactor unit tests to include local pipeline configs

ae16176

Signed-off-by: Daniel Kiptoon <[email protected]>

update kubernetes deepcopy object

62887e6

Signed-off-by: Daniel Kiptoon <[email protected]>

correct description spelling

755f03b

Signed-off-by: Daniel Kiptoon <[email protected]>

use config map for watchlist feature

b6ca361

Signed-off-by: Daniel Kiptoon <[email protected]>

KiptoonKipkurui added 5 commits October 29, 2023 08:46

update unit tests to test presence of configmap

9da02fb

Signed-off-by: Daniel Kiptoon <[email protected]>

update CRD to use configmap

71bea27

Signed-off-by: Daniel Kiptoon <[email protected]>

update sample custom resource to include watchlist configmap

51d419a

Signed-off-by: Daniel Kiptoon <[email protected]>

generate required kubernetes code

48e251b

Signed-off-by: Daniel Kiptoon <[email protected]>

update sample CR configuration

388ae67

Signed-off-by: Daniel Kiptoon <[email protected]>

MUzairS15 mentioned this pull request Nov 1, 2023

Meshync Dynamic Configuration from Meshsync meshery/meshsync#258

Merged

1 task

MUzairS15 reviewed Nov 8, 2023

View reviewed changes

added the fulll list of resources for default configuration.

ea4c118

Add and reduce from the list accordingly Signed-off-by: Daniel Kiptoon <[email protected]>

MUzairS15 approved these changes Nov 18, 2023

View reviewed changes

MUzairS15 requested a review from Aisuko November 18, 2023 15:56

KiptoonKipkurui added 2 commits November 18, 2023 19:10

fix failing unit test, also making the unit

3cf9449

test more representative of the final config object Signed-off-by: Daniel Kiptoon <[email protected]>

Merge remote-tracking branch 'upstream/master' into feat/kiptoonkipku…

a9ca7f1

…rui/crd_config

leecalcote merged commit 1cb522d into meshery:master Nov 20, 2023
7 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Meshsync config on Meshery Operator CRD #533

Meshsync config on Meshery Operator CRD #533

KiptoonKipkurui commented Oct 11, 2023

welcome bot commented Oct 11, 2023

codecov bot commented Oct 11, 2023 •

edited

Loading

theBeginner86 Oct 11, 2023

Aisuko left a comment

Aisuko Oct 12, 2023

MUzairS15 left a comment •

edited

Loading

MUzairS15 left a comment

MUzairS15 Nov 8, 2023

MUzairS15 Nov 18, 2023

KiptoonKipkurui Nov 18, 2023

MUzairS15 Nov 8, 2023

KiptoonKipkurui Nov 8, 2023

KiptoonKipkurui Nov 14, 2023

MUzairS15 left a comment

welcome bot commented Nov 20, 2023

Meshsync config on Meshery Operator CRD #533

Meshsync config on Meshery Operator CRD #533

Conversation

KiptoonKipkurui commented Oct 11, 2023

welcome bot commented Oct 11, 2023

codecov bot commented Oct 11, 2023 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Aisuko left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MUzairS15 left a comment • edited Loading

Choose a reason for hiding this comment

MUzairS15 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MUzairS15 left a comment

Choose a reason for hiding this comment

welcome bot commented Nov 20, 2023

codecov bot commented Oct 11, 2023 •

edited

Loading

MUzairS15 left a comment •

edited

Loading