github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

cleanup: remove insecure flag

Browse Source 
Signed-off-by: haoyun <yun.hao@daocloud.io>
This commit is contained in:
haoyun 2021-12-08 11:18:16 +08:00 committed by Jian Zeng
parent 9573b4a6b9
commit cd3bafc2ed
2 changed files with 14 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
cmd/kubeadm/app/util/arguments_test.go
View File

@ -32,9 +32,8 @@ func TestBuildArgumentListFromMap(t *testing.T) {
{ {
name: "override an argument from the base", name: "override an argument from the base",
base: map[string]string{ base: map[string]string{
"admission-control": "NamespaceLifecycle", "admission-control": "NamespaceLifecycle",
"insecure-bind-address": "127.0.0.1", "allow-privileged": "true",
"allow-privileged": "true",
}, },
overrides: map[string]string{ overrides: map[string]string{
"admission-control": "NamespaceLifecycle,LimitRanger", "admission-control": "NamespaceLifecycle,LimitRanger",
@ -42,14 +41,12 @@ func TestBuildArgumentListFromMap(t *testing.T) {
expected: []string{ expected: []string{
"--admission-control=NamespaceLifecycle,LimitRanger", "--admission-control=NamespaceLifecycle,LimitRanger",
"--allow-privileged=true", "--allow-privileged=true",
"--insecure-bind-address=127.0.0.1",
}, },
}, },
{ {
name: "add an argument that is not in base", name: "add an argument that is not in base",
base: map[string]string{ base: map[string]string{
"insecure-bind-address": "127.0.0.1", "allow-privileged": "true",
"allow-privileged": "true",
}, },
overrides: map[string]string{ overrides: map[string]string{
"admission-control": "NamespaceLifecycle,LimitRanger", "admission-control": "NamespaceLifecycle,LimitRanger",
@ -57,13 +54,11 @@ func TestBuildArgumentListFromMap(t *testing.T) {
expected: []string{ expected: []string{
"--admission-control=NamespaceLifecycle,LimitRanger", "--admission-control=NamespaceLifecycle,LimitRanger",
"--allow-privileged=true", "--allow-privileged=true",
"--insecure-bind-address=127.0.0.1",
}, },
}, },
{ {
name: "allow empty strings in base", name: "allow empty strings in base",
base: map[string]string{ base: map[string]string{
"insecure-bind-address": "127.0.0.1",
"allow-privileged": "true", "allow-privileged": "true",
"something-that-allows-empty-string": "", "something-that-allows-empty-string": "",
}, },
@ -73,14 +68,12 @@ func TestBuildArgumentListFromMap(t *testing.T) {
expected: []string{ expected: []string{
"--admission-control=NamespaceLifecycle,LimitRanger", "--admission-control=NamespaceLifecycle,LimitRanger",
"--allow-privileged=true", "--allow-privileged=true",
"--insecure-bind-address=127.0.0.1",
"--something-that-allows-empty-string=", "--something-that-allows-empty-string=",
}, },
}, },
{ {
name: "allow empty strings in overrides", name: "allow empty strings in overrides",
base: map[string]string{ base: map[string]string{
"insecure-bind-address": "127.0.0.1",
"allow-privileged": "true", "allow-privileged": "true",
"something-that-allows-empty-string": "foo", "something-that-allows-empty-string": "foo",
}, },
@ -91,7 +84,6 @@ func TestBuildArgumentListFromMap(t *testing.T) {
expected: []string{ expected: []string{
"--admission-control=NamespaceLifecycle,LimitRanger", "--admission-control=NamespaceLifecycle,LimitRanger",
"--allow-privileged=true", "--allow-privileged=true",
"--insecure-bind-address=127.0.0.1",
"--something-that-allows-empty-string=", "--something-that-allows-empty-string=",
}, },
}, },
@ -117,28 +109,24 @@ func TestParseArgumentListToMap(t *testing.T) {
name: "normal case", name: "normal case",
args: []string{ args: []string{
"--admission-control=NamespaceLifecycle,LimitRanger", "--admission-control=NamespaceLifecycle,LimitRanger",
"--insecure-bind-address=127.0.0.1",
"--allow-privileged=true", "--allow-privileged=true",
}, },
expectedMap: map[string]string{ expectedMap: map[string]string{
"admission-control": "NamespaceLifecycle,LimitRanger", "admission-control": "NamespaceLifecycle,LimitRanger",
"insecure-bind-address": "127.0.0.1", "allow-privileged": "true",
"allow-privileged": "true",
}, },
}, },
{ {
name: "test that feature-gates is working", name: "test that feature-gates is working",
args: []string{ args: []string{
"--admission-control=NamespaceLifecycle,LimitRanger", "--admission-control=NamespaceLifecycle,LimitRanger",
"--insecure-bind-address=127.0.0.1",
"--allow-privileged=true", "--allow-privileged=true",
"--feature-gates=EnableFoo=true,EnableBar=false", "--feature-gates=EnableFoo=true,EnableBar=false",
}, },
expectedMap: map[string]string{ expectedMap: map[string]string{
"admission-control": "NamespaceLifecycle,LimitRanger", "admission-control": "NamespaceLifecycle,LimitRanger",
"insecure-bind-address": "127.0.0.1", "allow-privileged": "true",
"allow-privileged": "true", "feature-gates": "EnableFoo=true,EnableBar=false",
"feature-gates": "EnableFoo=true,EnableBar=false",
}, },
}, },
{ {
@ -146,15 +134,13 @@ func TestParseArgumentListToMap(t *testing.T) {
args: []string{ args: []string{
"kube-apiserver", "kube-apiserver",
"--admission-control=NamespaceLifecycle,LimitRanger", "--admission-control=NamespaceLifecycle,LimitRanger",
"--insecure-bind-address=127.0.0.1",
"--allow-privileged=true", "--allow-privileged=true",
"--feature-gates=EnableFoo=true,EnableBar=false", "--feature-gates=EnableFoo=true,EnableBar=false",
}, },
expectedMap: map[string]string{ expectedMap: map[string]string{
"admission-control": "NamespaceLifecycle,LimitRanger", "admission-control": "NamespaceLifecycle,LimitRanger",
"insecure-bind-address": "127.0.0.1", "allow-privileged": "true",
"allow-privileged": "true", "feature-gates": "EnableFoo=true,EnableBar=false",
"feature-gates": "EnableFoo=true,EnableBar=false",
}, },
}, },
} }
@ -181,7 +167,6 @@ func TestReplaceArgument(t *testing.T) {
args: []string{ args: []string{
"kube-apiserver", "kube-apiserver",
"--admission-control=NamespaceLifecycle,LimitRanger", "--admission-control=NamespaceLifecycle,LimitRanger",
"--insecure-bind-address=127.0.0.1",
"--allow-privileged=true", "--allow-privileged=true",
}, },
mutateFunc: func(argMap map[string]string) map[string]string { mutateFunc: func(argMap map[string]string) map[string]string {
@ -191,7 +176,6 @@ func TestReplaceArgument(t *testing.T) {
expectedArgs: []string{ expectedArgs: []string{
"kube-apiserver", "kube-apiserver",
"--admission-control=NamespaceLifecycle,LimitRanger,ResourceQuota", "--admission-control=NamespaceLifecycle,LimitRanger,ResourceQuota",
"--insecure-bind-address=127.0.0.1",
"--allow-privileged=true", "--allow-privileged=true",
}, },
}, },
@ -200,7 +184,6 @@ func TestReplaceArgument(t *testing.T) {
args: []string{ args: []string{
"kube-apiserver", "kube-apiserver",
"--admission-control=NamespaceLifecycle,LimitRanger", "--admission-control=NamespaceLifecycle,LimitRanger",
"--insecure-bind-address=127.0.0.1",
"--allow-privileged=true", "--allow-privileged=true",
}, },
mutateFunc: func(argMap map[string]string) map[string]string { mutateFunc: func(argMap map[string]string) map[string]string {
@ -210,7 +193,6 @@ func TestReplaceArgument(t *testing.T) {
expectedArgs: []string{ expectedArgs: []string{
"kube-apiserver", "kube-apiserver",
"--admission-control=NamespaceLifecycle,LimitRanger", "--admission-control=NamespaceLifecycle,LimitRanger",
"--insecure-bind-address=127.0.0.1",
"--allow-privileged=true", "--allow-privileged=true",
"--new-arg-here=foo", "--new-arg-here=foo",
}, },
@ -238,7 +220,6 @@ func TestRoundtrip(t *testing.T) {
name: "normal case", name: "normal case",
args: []string{ args: []string{
"--admission-control=NamespaceLifecycle,LimitRanger", "--admission-control=NamespaceLifecycle,LimitRanger",
"--insecure-bind-address=127.0.0.1",
"--allow-privileged=true", "--allow-privileged=true",
}, },
}, },
@ -246,7 +227,6 @@ func TestRoundtrip(t *testing.T) {
name: "test that feature-gates is working", name: "test that feature-gates is working",
args: []string{ args: []string{
"--admission-control=NamespaceLifecycle,LimitRanger", "--admission-control=NamespaceLifecycle,LimitRanger",
"--insecure-bind-address=127.0.0.1",
"--allow-privileged=true", "--allow-privileged=true",
"--feature-gates=EnableFoo=true,EnableBar=false", "--feature-gates=EnableFoo=true,EnableBar=false",
}, },

10
cmd/kubeadm/app/util/staticpod/utils_test.go
View File

@ -577,13 +577,11 @@ func TestGetExtraParameters(t *testing.T) {
"admission-control": "NamespaceLifecycle,LimitRanger", "admission-control": "NamespaceLifecycle,LimitRanger",
}, },
defaults: map[string]string{ defaults: map[string]string{
"admission-control": "NamespaceLifecycle", "admission-control": "NamespaceLifecycle",
"insecure-bind-address": "127.0.0.1", "allow-privileged": "true",
"allow-privileged": "true",
}, },
expected: []string{ expected: []string{
"--admission-control=NamespaceLifecycle,LimitRanger", "--admission-control=NamespaceLifecycle,LimitRanger",
"--insecure-bind-address=127.0.0.1",
"--allow-privileged=true", "--allow-privileged=true",
}, },
}, },
@ -593,12 +591,10 @@ func TestGetExtraParameters(t *testing.T) {
"admission-control": "NamespaceLifecycle,LimitRanger", "admission-control": "NamespaceLifecycle,LimitRanger",
}, },
defaults: map[string]string{ defaults: map[string]string{
"insecure-bind-address": "127.0.0.1", "allow-privileged": "true",
"allow-privileged": "true",
}, },
expected: []string{ expected: []string{
"--admission-control=NamespaceLifecycle,LimitRanger", "--admission-control=NamespaceLifecycle,LimitRanger",
"--insecure-bind-address=127.0.0.1",
"--allow-privileged=true", "--allow-privileged=true",
}, },
}, },