[WIP] Add support for chained plugins. #179
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,66 @@ | ||
| package network | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| "github.com/pkg/errors" | ||
|
|
||
| operv1 "github.com/openshift/api/operator/v1" | ||
| ) | ||
|
|
||
| const CNINetworkName = "openshift" | ||
|
|
||
| // Whatever network is the default network should use this as the target CNI | ||
| // configuration file. | ||
| const CNIConfigPath = "/etc/cni/net.d/80-openshift.conflist" | ||
|
|
||
| // validateChainedPlugins ensures that all supplied chained plugins are some | ||
| // kind of reasonable cni configuration | ||
| func validateChainedPlugins(conf *operv1.NetworkSpec) []error { | ||
| out := []error{} | ||
|
|
||
| if len(conf.DefaultNetwork.ChainedPlugins) > 0 && conf.DefaultNetwork.Type != operv1.NetworkTypeOpenShiftSDN { | ||
| out = append(out, errors.Errorf("network type %s does not support chained plugins", conf.DefaultNetwork.Type)) | ||
| } | ||
|
|
||
| for i, entry := range conf.DefaultNetwork.ChainedPlugins { | ||
| if entry.RawCNIConfig == "" { | ||
| out = append(out, errors.Errorf("invalid CNI plugin entry Spec.DefaultNetwork.ChainedPlugin[%d]: rawCNIConfig must be specified", i)) | ||
| continue | ||
| } | ||
| var m map[string]interface{} | ||
| if err := json.Unmarshal([]byte(entry.RawCNIConfig), &m); err != nil { | ||
| out = append(out, errors.Wrapf(err, "invalid json in Spec.DefaultNetwork.ChainedPlugin[%d].RawCNIConfig", i)) | ||
| continue | ||
| } | ||
|
|
||
| if _, ok := m["type"]; !ok { | ||
| out = append(out, errors.Errorf("invalid CNI plugin entry in Spec.DefaultNetwork.ChainedPlugin[%d].RawCNIConfig: must have 'type' key", i)) | ||
| } | ||
| } | ||
|
|
||
| return out | ||
| } | ||
|
|
||
| // makeCNIConfig merges the primary plugin configuration (as JSON) with any chained | ||
| // plugin's configurations. | ||
| func makeCNIConfig(conf *operv1.NetworkSpec, netName, cniVersion, primaryPluginConfig string) string { | ||
| pluginConfigs := []string{primaryPluginConfig} | ||
| for _, entry := range conf.DefaultNetwork.ChainedPlugins { | ||
| pluginConfigs = append(pluginConfigs, entry.RawCNIConfig) | ||
| } | ||
|
|
||
| configFile := fmt.Sprintf(` | ||
| { | ||
| "name": "%s", | ||
| "cniVersion": "%s", | ||
| "plugins": [ | ||
| %s | ||
| ] | ||
| }`, | ||
| netName, cniVersion, strings.Join(pluginConfigs, ",\n\t")) | ||
|
|
||
| return configFile | ||
| } |
This file contains hidden or 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,77 @@ | ||
| package network | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| operv1 "github.com/openshift/api/operator/v1" | ||
|
|
||
| . "github.com/onsi/gomega" | ||
| ) | ||
|
|
||
| func TestMakeCNIConfig(t *testing.T) { | ||
| g := NewGomegaWithT(t) | ||
| conf := operv1.NetworkSpec{} | ||
|
|
||
| out := makeCNIConfig(&conf, "test1", "0.1.2", `{"type": "only"}`) | ||
| g.Expect(out).To(MatchJSON(` | ||
| { | ||
| "cniVersion": "0.1.2", | ||
| "name": "test1", | ||
| "plugins": [{"type": "only"}] | ||
| }`)) | ||
|
|
||
| conf.DefaultNetwork.ChainedPlugins = []operv1.ChainedPluginEntry{ | ||
| {RawCNIConfig: `{"type": "foo"}`}, | ||
| {RawCNIConfig: `{"type": "bar", "a": "b", "c":{"a": "b", "c": "d"}}`}, | ||
| } | ||
|
|
||
| out = makeCNIConfig(&conf, "test2", "1.2.3", `{"type": "primary"}`) | ||
| g.Expect(out).To(MatchJSON(` | ||
| { | ||
| "cniVersion": "1.2.3", | ||
| "name": "test2", | ||
| "plugins": [ | ||
| {"type": "primary"}, | ||
| {"type": "foo"}, | ||
| {"type": "bar", | ||
| "a": "b", | ||
| "c": { | ||
| "a": "b", | ||
| "c": "d" | ||
| } | ||
| }] | ||
| }`)) | ||
|
|
||
| } | ||
|
|
||
| func TestValidateChainedPlugins(t *testing.T) { | ||
| g := NewGomegaWithT(t) | ||
|
|
||
| conf := &operv1.NetworkSpec{} | ||
| g.Expect(validateChainedPlugins(conf)).To(BeEmpty()) | ||
|
|
||
| conf.DefaultNetwork.ChainedPlugins = []operv1.ChainedPluginEntry{ | ||
| {RawCNIConfig: `{"type": "foo"}`}, | ||
| {RawCNIConfig: `{"type": "bar"}`}, | ||
| } | ||
| conf.DefaultNetwork.Type = "unknown" | ||
| g.Expect(validateChainedPlugins(conf)).To(ContainElement(MatchError( | ||
| ContainSubstring("network type unknown does not support chained plugins")))) | ||
|
|
||
| conf.DefaultNetwork.Type = "OpenShiftSDN" | ||
| g.Expect(validateChainedPlugins(conf)).To(BeEmpty()) | ||
|
|
||
| conf.DefaultNetwork.ChainedPlugins = []operv1.ChainedPluginEntry{ | ||
| {RawCNIConfig: `asdfasdf`}, | ||
| } | ||
| g.Expect(validateChainedPlugins(conf)).To(ContainElement(MatchError( | ||
| ContainSubstring("invalid json in Spec.DefaultNetwork.ChainedPlugin[0].RawCNIConfig")))) | ||
|
|
||
| conf.DefaultNetwork.ChainedPlugins = []operv1.ChainedPluginEntry{ | ||
| {RawCNIConfig: `{"type": "foo"}`}, | ||
| {RawCNIConfig: `{"name": "bar"}`}, | ||
| } | ||
| g.Expect(validateChainedPlugins(conf)).To(ContainElement(MatchError( | ||
| ContainSubstring("invalid CNI plugin entry in Spec.DefaultNetwork.ChainedPlugin[1].RawCNIConfig: must have 'type' key")))) | ||
|
|
||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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
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.
Should note that this applies to all containers in the cluster.