Meshync Dynamic Configuration from Meshsync #258
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| package config | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
|
|
||
| "github.com/layer5io/meshkit/utils" | ||
| mesherykube "github.com/layer5io/meshkit/utils/kubernetes" | ||
| "golang.org/x/exp/slices" | ||
| corev1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/runtime/schema" | ||
| ) | ||
|
|
||
| var ( | ||
| namespace = "meshery" // Namespace for the Custom Resource | ||
| crName = "meshery-meshsync" // Name of the custom resource | ||
| version = "v1alpha1" // Version of the Custom Resource | ||
| group = "meshery.layer5.io" //Group for the Custom Resource | ||
| resource = "meshsyncs" //Name of the Resource | ||
| ) | ||
|
|
||
| func GetMeshsyncCRDConfigs() (*MeshsyncConfig, error) { | ||
| // Initialize kubeclient | ||
| kubeClient, err := mesherykube.New(nil) | ||
| if err != nil { | ||
| return nil, ErrInitConfig(err) | ||
| } | ||
| // initialize the dynamic kube client | ||
| dyClient := kubeClient.DynamicKubeClient | ||
|
|
||
| // initialize the group version resource to access the custom resource | ||
| gvr := schema.GroupVersionResource{Version: version, Group: group, Resource: resource} | ||
|
|
||
| // make a call to get the custom resource | ||
| crd, err := dyClient.Resource(gvr).Namespace(namespace).Get(context.TODO(), crName, metav1.GetOptions{}) | ||
|
|
||
| if err != nil { | ||
| return nil, ErrInitConfig(err) | ||
| } | ||
|
|
||
KiptoonKipkurui marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if crd == nil { | ||
| return nil, ErrInitConfig(errors.New("Custom Resource is nil")) | ||
| } | ||
|
|
||
| spec := crd.Object["spec"] | ||
| specMap, ok := spec.(map[string]interface{}) | ||
| if !ok { | ||
| return nil, ErrInitConfig(errors.New("Unable to convert spec to map")) | ||
| } | ||
| configObj := specMap["watch-list"] | ||
| if configObj == nil { | ||
| return nil, ErrInitConfig(errors.New("Custom Resource does not have Meshsync Configs")) | ||
| } | ||
| configStr, err := utils.Marshal(configObj) | ||
| if err != nil { | ||
| return nil, ErrInitConfig(err) | ||
| } | ||
| meshsyncConfig := MeshsyncConfig{} | ||
| configMap := corev1.ConfigMap{} | ||
| err = utils.Unmarshal(string(configStr), &configMap) | ||
|
|
||
| if err != nil { | ||
| return nil, ErrInitConfig(err) | ||
| } | ||
|
|
||
| if _, ok := configMap.Data["blacklist"]; ok { | ||
| err = utils.Unmarshal(configMap.Data["blacklist"], &meshsyncConfig.BlackList) | ||
| if err != nil { | ||
| return nil, ErrInitConfig(err) | ||
| } | ||
| } | ||
|
|
||
| if _, ok := configMap.Data["whitelist"]; ok { | ||
| err = utils.Unmarshal(configMap.Data["whitelist"], &meshsyncConfig.WhiteList) | ||
| if err != nil { | ||
| return nil, ErrInitConfig(err) | ||
| } | ||
| } | ||
|
|
||
| // Handle global resources | ||
| globalPipelines := make(PipelineConfigs, 0) | ||
| for _, v := range Pipelines[GlobalResourceKey] { | ||
| if idx := slices.IndexFunc(meshsyncConfig.WhiteList, func(c ResourceConfig) bool { return c.Resource == v.Name }); idx != -1 { | ||
| config := meshsyncConfig.WhiteList[idx] | ||
| v.Events = config.Events | ||
| globalPipelines = append(globalPipelines, v) | ||
| } | ||
| } | ||
| if len(globalPipelines) > 0 { | ||
| meshsyncConfig.Pipelines = map[string]PipelineConfigs{} | ||
| meshsyncConfig.Pipelines[GlobalResourceKey] = globalPipelines | ||
| } | ||
|
|
||
| // Handle local resources | ||
| localPipelines := make(PipelineConfigs, 0) | ||
| for _, v := range Pipelines[LocalResourceKey] { | ||
| if idx := slices.IndexFunc(meshsyncConfig.WhiteList, func(c ResourceConfig) bool { return c.Resource == v.Name }); idx != -1 { | ||
| config := meshsyncConfig.WhiteList[idx] | ||
| v.Events = config.Events | ||
| localPipelines = append(localPipelines, v) | ||
| } | ||
| } | ||
|
|
||
| if len(localPipelines) > 0 { | ||
| if meshsyncConfig.Pipelines == nil { | ||
| meshsyncConfig.Pipelines = make(map[string]PipelineConfigs) | ||
| } | ||
| meshsyncConfig.Pipelines[LocalResourceKey] = localPipelines | ||
| } | ||
|
|
||
| // Handle listeners | ||
| listerners := make(ListenerConfigs, 0) | ||
| for _, v := range Listeners { | ||
| if idx := slices.IndexFunc(meshsyncConfig.WhiteList, func(c ResourceConfig) bool { return c.Resource == v.Name }); idx != -1 { | ||
| config := meshsyncConfig.WhiteList[idx] | ||
| v.Events = config.Events | ||
| listerners = append(listerners, v) | ||
| } | ||
| } | ||
|
|
||
| if len(listerners) > 0 { | ||
| meshsyncConfig.Listeners = make(map[string]ListenerConfig) | ||
| meshsyncConfig.Listeners = Listeners | ||
| } | ||
|
|
||
| return &meshsyncConfig, nil | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,6 +39,25 @@ func main() { | |
| os.Exit(1) | ||
| } | ||
|
|
||
| // get configs from meshsync crd if available | ||
| crdConfigs, err := config.GetMeshsyncCRDConfigs() | ||
|
|
||
| if err != nil { | ||
| // no configs found from meshsync CRD log warning | ||
|
There was a problem hiding this comment. I am not sure the log level should be warning level, please get confirm from @leecalcote @theBeginner86. I assume that if we cannot get configs, it should be the Info level? Because we have the default configuraiton. There was a problem hiding this comment. The choice of using a warning log is because the desired state of configuration for Meshsync from now and in future lies is utilizing the crd as per conversations with @leecalcote and @theBeginner86 so this is an extra speed bump to notify one that the desired approach has not been utilized |
||
| log.Warn(err) | ||
| } | ||
|
|
||
| // pass configs from crd to default configs | ||
| if crdConfigs != nil { | ||
| if len(crdConfigs.Pipelines) > 0 { | ||
| config.Pipelines = crdConfigs.Pipelines | ||
| } | ||
|
|
||
| if len(crdConfigs.Listeners) > 0 { | ||
| config.Listeners = crdConfigs.Listeners | ||
| } | ||
| } | ||
|
|
||
| // Config init and seed | ||
| cfg, err := config.New(provider) | ||
| if err != nil { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe you can import it rather than hard coded it https://github.com/meshery/meshery-operator/blob/master/api/v1alpha1/meshsync_types.go. Same like
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will update meshsync with this change immediately the meshery operator is approved with the CRD changes