Skip to content
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

Feature: ENIConfig set by custom annotation or label names #280

Merged
merged 7 commits into from
Jan 11, 2019
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tests for annotations and labels config
  • Loading branch information
Peter Strzyzewski committed Jan 3, 2019
commit 49e7e95c44f6d0d209eef4158b436000db7d4df2
26 changes: 26 additions & 0 deletions pkg/eniconfig/eniconfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ func updateNodeAnnotation(hdlr sdk.Handler, nodeName string, configName string,
Deleted: toDelete,
}
eniAnnotations := make(map[string]string)
eniConfigAnnotationDef := getEniConfigAnnotationDef()

if !toDelete {
eniAnnotations[eniConfigAnnotationDef] = configName
Expand Down Expand Up @@ -87,6 +88,7 @@ func updateNodeLabel(hdlr sdk.Handler, nodeName string, configName string, toDel
Deleted: toDelete,
}
eniLabels := make(map[string]string)
eniConfigLabelDef := getEniConfigLabelDef()

if !toDelete {
eniLabels[eniConfigLabelDef] = configName
Expand Down Expand Up @@ -212,3 +214,27 @@ func TestNodeENIConfigLabel(t *testing.T) {
assert.Equal(t, defaultCfg, *outputCfg)

}

func TestGetEniConfigAnnotationDefDefault(t *testing.T) {
os.Unsetenv(envEniConfigAnnotationDef)
eniConfigAnnotationDef := getEniConfigAnnotationDef()
assert.Equal(t, eniConfigAnnotationDef, defaultEniConfigAnnotationDef)
}

func TestGetEniConfigAnnotationlDefCustom(t *testing.T) {
os.Setenv(envEniConfigAnnotationDef, "k8s.amazonaws.com/eniConfigCustom")
eniConfigAnnotationDef := getEniConfigAnnotationDef()
assert.Equal(t, eniConfigAnnotationDef, "k8s.amazonaws.com/eniConfigCustom")
}

func TestGetEniConfigLabelDefDefault(t *testing.T) {
os.Unsetenv(envEniConfigLabelDef)
eniConfigLabelDef := getEniConfigLabelDef()
assert.Equal(t, eniConfigLabelDef, defaultEniConfigLabelDef)
}

func TestGetEniConfigLabelDefCustom(t *testing.T) {
os.Setenv(envEniConfigLabelDef, "k8s.amazonaws.com/eniConfigCustom")
eniConfigLabelDef := getEniConfigLabelDef()
assert.Equal(t, eniConfigLabelDef, "k8s.amazonaws.com/eniConfigCustom")
}