-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #42 from banzaicloud/taints
Added support to set taints at Node registration
- Loading branch information
Showing
15 changed files
with
186 additions
and
0 deletions.
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
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,80 @@ | ||
| // Copyright © 2019 Banzai Cloud | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package kubernetes | ||
|
|
||
| import ( | ||
| "strings" | ||
|
|
||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| type Taint struct { | ||
| Key string | ||
| Value string | ||
| Effect string | ||
| } | ||
|
|
||
| func isTaint(s string) bool { | ||
| return strings.Contains(s, "=") || strings.Contains(s, ":") || strings.HasSuffix(s, "-") | ||
| } | ||
|
|
||
| func ParseTaints(taints []string) ([]Taint, error) { | ||
| t := make([]Taint, 0) | ||
| for _, taint := range taints { | ||
| // Remove leading and trailing spaces | ||
| taint = strings.Trim(taint, " ") | ||
| // Skip empty | ||
| if taint == "" { | ||
| continue | ||
| } | ||
| // Validate taint | ||
| if !isTaint(taint) { | ||
| return nil, errors.New("invalid taint spec: " + taint) | ||
| } | ||
|
|
||
| var ( | ||
| key string | ||
| value string | ||
| effect string | ||
| ) | ||
|
|
||
| // key=value | ||
| eq := strings.Index(taint, "=") | ||
| if eq > -1 { | ||
| key = taint[:eq] | ||
| } | ||
|
|
||
| // effect | ||
| colon := strings.Index(taint, ":") | ||
| if colon > -1 { | ||
| effect = taint[colon+1:] | ||
| if eq > -1 { | ||
| value = taint[eq+1 : colon] | ||
| } else { | ||
| key = taint[eq+1 : colon] | ||
| } | ||
| } else { | ||
| effect = taint | ||
| } | ||
|
|
||
| t = append(t, Taint{ | ||
| Key: key, | ||
| Value: value, | ||
| Effect: effect, | ||
| }) | ||
| } | ||
|
|
||
| return t, 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,49 @@ | ||
| // Copyright © 2019 Banzai Cloud | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package kubernetes | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestParseTaints(t *testing.T) { | ||
| testCases := []struct { | ||
| taint string | ||
| expected *Taint | ||
| err bool | ||
| }{ | ||
| {"foo=bar:NoSchedule", &Taint{Key: "foo", Value: "bar", Effect: "NoSchedule"}, false}, | ||
| {"foo:PreferNoSchedule", &Taint{Key: "foo", Value: "", Effect: "PreferNoSchedule"}, false}, | ||
| {"dedicated:NoSchedule-", &Taint{Key: "dedicated", Effect: "NoSchedule-"}, false}, | ||
| {"dedicated-", &Taint{Effect: "dedicated-"}, false}, | ||
| {"", nil, false}, | ||
| {"xxx", nil, true}, | ||
| } | ||
| for _, tc := range testCases { | ||
| taint, err := ParseTaints([]string{tc.taint}) | ||
| if tc.err { | ||
| require.Error(t, err) | ||
| continue | ||
| } | ||
| require.NoError(t, err) | ||
| if tc.expected == nil { | ||
| require.Empty(t, taint) | ||
| } else { | ||
| require.Equal(t, tc.expected, &taint[0]) | ||
| } | ||
| } | ||
| } |
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
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