-
Notifications
You must be signed in to change notification settings - Fork 3.1k
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
feat: Use WorkflowTemplate/ClusterWorkflowTemplate Informers when validating CronWorkflows #11470
Merged
Merged
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
8f1ee54
feat: add informers for wftmpl/cwftmpl to CronWorkflow validation
juliev0 70e75db
feat: workflowtemplate validation using informer
juliev0 521e549
feat: use Informers for CronWorkflow WorkflowTemplate validation
juliev0 68e0983
feat: use informers for CronWorkflow validation of WorkflowTemplates
juliev0 dd11029
fix: remove temporary log line
juliev0 2d75e24
feat: use informers for CronWorkflow validation of WorkflowTemplates
juliev0 aa809c0
chore: cleanup
juliev0 f3a8ee7
fix: merge conflicts
juliev0 70c7c37
chore: reorder imports
juliev0 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
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 |
---|---|---|
|
@@ -8,11 +8,25 @@ import ( | |
"k8s.io/apimachinery/pkg/runtime" | ||
|
||
wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1" | ||
wfextvv1alpha1 "github.com/argoproj/argo-workflows/v3/pkg/client/informers/externalversions/workflow/v1alpha1" | ||
"github.com/argoproj/argo-workflows/v3/workflow/templateresolution" | ||
"github.com/argoproj/argo-workflows/v3/workflow/util" | ||
) | ||
|
||
// this function always tries to return a value, even if it is badly formed | ||
func objectToClusterWorkflowTemplate(object runtime.Object) (*wfv1.ClusterWorkflowTemplate, error) { | ||
return interfaceToClusterWorkflowTemplate(object) | ||
} | ||
|
||
func objectsToClusterWorkflowTemplates(list []runtime.Object) []*wfv1.ClusterWorkflowTemplate { | ||
ret := make([]*wfv1.ClusterWorkflowTemplate, len(list)) | ||
for i, object := range list { | ||
ret[i], _ = objectToClusterWorkflowTemplate(object) | ||
} | ||
return ret | ||
} | ||
|
||
// this function always tries to return a value, even if it is badly formed | ||
func interfaceToClusterWorkflowTemplate(object interface{}) (*wfv1.ClusterWorkflowTemplate, error) { | ||
v := &wfv1.ClusterWorkflowTemplate{} | ||
un, ok := object.(*unstructured.Unstructured) | ||
if !ok { | ||
|
@@ -25,10 +39,25 @@ func objectToClusterWorkflowTemplate(object runtime.Object) (*wfv1.ClusterWorkfl | |
return v, nil | ||
} | ||
|
||
func objectsToClusterWorkflowTemplates(list []runtime.Object) []*wfv1.ClusterWorkflowTemplate { | ||
ret := make([]*wfv1.ClusterWorkflowTemplate, len(list)) | ||
for i, object := range list { | ||
ret[i], _ = objectToClusterWorkflowTemplate(object) | ||
type ClusterWorkflowTemplateFromInformerGetter struct { | ||
cwftmplInformer wfextvv1alpha1.ClusterWorkflowTemplateInformer | ||
} | ||
|
||
func (getter *ClusterWorkflowTemplateFromInformerGetter) Get(name string) (*wfv1.ClusterWorkflowTemplate, error) { | ||
obj, exists, err := getter.cwftmplInformer.Informer().GetStore().GetByKey(name) | ||
if err != nil { | ||
return nil, err | ||
} | ||
return ret | ||
if !exists { | ||
return nil, fmt.Errorf("ClusterWorkflowTemplate Informer cannot find ClusterWorkflowTemplate of name %q", name) | ||
} | ||
cwfTmpl, err := interfaceToClusterWorkflowTemplate(obj) | ||
if err != nil { | ||
return nil, err | ||
} | ||
return cwfTmpl, nil | ||
} | ||
|
||
func NewClusterWorkflowTemplateFromInformerGetter(cwftmplInformer wfextvv1alpha1.ClusterWorkflowTemplateInformer) templateresolution.ClusterWorkflowTemplateGetter { | ||
return &ClusterWorkflowTemplateFromInformerGetter{cwftmplInformer: cwftmplInformer} | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. let me know if there's a better place to put this struct... |
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
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.
not related but this is a typo