-
Notifications
You must be signed in to change notification settings - Fork 168
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
gm: decouple all features into independent package #134
Merged
Merged
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
48135b2
gm: refactor all features into independent dir
55f835b
gm: refactor upstream controller
c0886df
gm: share client/Informer with all controllers
704d947
gm: add dataset controller
e52ac06
gm: split all upstream logic into separate file
5c1c167
gm: split all downstream logic into separate file
e962aab
gm: more code clean after initial refactor done
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
package dataset | ||
|
||
import ( | ||
"context" | ||
"encoding/json" | ||
|
||
sednav1 "github.com/kubeedge/sedna/pkg/apis/sedna/v1alpha1" | ||
"github.com/kubeedge/sedna/pkg/globalmanager/config" | ||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
"k8s.io/client-go/tools/cache" | ||
|
||
sednaclientset "github.com/kubeedge/sedna/pkg/client/clientset/versioned/typed/sedna/v1alpha1" | ||
sednav1listers "github.com/kubeedge/sedna/pkg/client/listers/sedna/v1alpha1" | ||
"github.com/kubeedge/sedna/pkg/globalmanager/runtime" | ||
) | ||
|
||
// Controller handles all dataset objects including: syncing to edge and update from edge. | ||
type Controller struct { | ||
client sednaclientset.SednaV1alpha1Interface | ||
|
||
storeSynced cache.InformerSynced | ||
|
||
// A store of dataset | ||
lister sednav1listers.DatasetLister | ||
|
||
cfg *config.ControllerConfig | ||
} | ||
|
||
// updateDatasetFromEdge syncs update from edge | ||
func (c *Controller) updateDatasetFromEdge(name, namespace, operation string, content []byte) error { | ||
status := sednav1.DatasetStatus{} | ||
err := json.Unmarshal(content, &status) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
return c.updateDatasetStatus(name, namespace, status) | ||
} | ||
|
||
// updateDatasetStatus updates the dataset status | ||
func (c *Controller) updateDatasetStatus(name, namespace string, status sednav1.DatasetStatus) error { | ||
client := c.client.Datasets(namespace) | ||
|
||
if status.UpdateTime == nil { | ||
now := metav1.Now() | ||
status.UpdateTime = &now | ||
} | ||
|
||
return runtime.RetryUpdateStatus(name, namespace, func() error { | ||
dataset, err := client.Get(context.TODO(), name, metav1.GetOptions{}) | ||
if err != nil { | ||
return err | ||
} | ||
dataset.Status = status | ||
_, err = client.UpdateStatus(context.TODO(), dataset, metav1.UpdateOptions{}) | ||
return err | ||
}) | ||
} |
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
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.
it's better to extract function
appendStatusCondition
as a common funtion? please check other function , which seem like have same issue.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.
Agreed, but it's not trival since different CRs have different object clients which is hard to merge as one client, and it is not problem of this pr. So leave it alone.