feat(controller): Use different container runtime executors for each workflow. Close #4254 #4998
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
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,36 @@ | ||
| package config | ||
|
|
||
| import ( | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/labels" | ||
| ) | ||
|
|
||
| type ContainerRuntimeExecutors []ContainerRuntimeExecutor | ||
|
|
||
| // select the correct executor to use | ||
| // this may return an empty string of there is not executor found | ||
| func (e ContainerRuntimeExecutors) Select(labels labels.Labels) (string, error) { | ||
| for _, c := range e { | ||
| ok, err := c.Matches(labels) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| if ok { | ||
| return c.Name, nil | ||
| } | ||
| } | ||
| return "", nil | ||
| } | ||
|
|
||
| type ContainerRuntimeExecutor struct { | ||
| Name string `json:"name"` | ||
|
There was a problem hiding this comment. the There was a problem hiding this comment. I think that "type" and "name" are synonymous. I.e. there is only one executor of type "pns", it is the "pns" executor. I'm not sure about the correct term here, but I'd like to leave this called "name" unless you feel strongly? |
||
| Selector metav1.LabelSelector `json:"selector"` | ||
| } | ||
|
|
||
| func (e ContainerRuntimeExecutor) Matches(labels labels.Labels) (bool, error) { | ||
| x, err := metav1.LabelSelectorAsSelector(&e.Selector) | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
| return x.Matches(labels), 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| package config | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/labels" | ||
| ) | ||
|
|
||
| func TestContainerRuntimeExecutors(t *testing.T) { | ||
| t.Run("Empty", func(t *testing.T) { | ||
| x := ContainerRuntimeExecutors{} | ||
| e, err := x.Select(labels.Set{}) | ||
| assert.NoError(t, err) | ||
| assert.Empty(t, e) | ||
| }) | ||
| t.Run("Select", func(t *testing.T) { | ||
| x := ContainerRuntimeExecutors{ | ||
| { | ||
| Name: "foo", | ||
| Selector: metav1.LabelSelector{ | ||
| MatchLabels: map[string]string{"bar": ""}, | ||
| }, | ||
| }, | ||
| } | ||
| e, err := x.Select(labels.Set(map[string]string{"bar": ""})) | ||
| assert.NoError(t, err) | ||
| assert.Equal(t, "foo", e) | ||
| }) | ||
| t.Run("Error", func(t *testing.T) { | ||
| x := ContainerRuntimeExecutors{ | ||
| { | ||
| Name: "foo", | ||
| Selector: metav1.LabelSelector{ | ||
| MatchLabels: map[string]string{"!": "!"}, | ||
| }, | ||
| }, | ||
| } | ||
| _, err := x.Select(labels.Set(map[string]string{"bar": ""})) | ||
| assert.Error(t, 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
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.
can we log the error if it is not nil?
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'm going to re-write this confusing code to make it clearer and less "clever"