Fix lint issue and test failed

Signed-off-by: MatthieuFin <matthieu2717@gmail.com>
This commit is contained in:
MatthieuFin
2021-08-31 17:43:09 +02:00
parent 338af4e584
commit 08e4138c16
3 changed files with 27 additions and 26 deletions
+5 -4
View File
@@ -245,6 +245,7 @@ func getResourceLimits(log logrus.FieldLogger, config *corev1.ConfigMap) (string
return config.Data["cpuLimit"], config.Data["memLimit"]
}
// getSecurityContext extracts securityContext runAsUser, runAsGroup, allowPrivilegeEscalation, and securityContext from a ConfigMap.
func getSecurityContext(log logrus.FieldLogger, config *corev1.ConfigMap) (string, string, string, string) {
if config == nil {
@@ -252,10 +253,10 @@ func getSecurityContext(log logrus.FieldLogger, config *corev1.ConfigMap) (strin
return "", "", "", ""
}
return config.Data["secCtxRunAsUser"],
config.Data["secCtxRunAsGroup"],
config.Data["secCtxAllowPrivilegeEscalation"],
config.Data["secCtx"]
return config.Data["secCtxRunAsUser"],
config.Data["secCtxRunAsGroup"],
config.Data["secCtxAllowPrivilegeEscalation"],
config.Data["secCtx"]
}
// TODO eventually this can move to pkg/plugin/framework since it'll be used across multiple
+1 -1
View File
@@ -117,7 +117,7 @@ func TestResticRestoreActionExecute(t *testing.T) {
defaultCPURequestLimit, defaultMemRequestLimit, // limits
)
securityContext, _ := kube.ParseSecurityContext("", "", "")
securityContext, _ := kube.ParseSecurityContext("", "", "", "")
var (
restoreName = "my-restore"
+21 -21
View File
@@ -60,7 +60,7 @@ func TestParseSecurityContext(t *testing.T) {
},
{
"valid securityContext with comments only secCtx key",
args{"", "", "",`
args{"", "", "", `
capabilities:
drop:
- ALL
@@ -81,16 +81,16 @@ readOnlyRootFilesystem: true
allowPrivilegeEscalation: false`},
false,
&corev1.SecurityContext{
RunAsUser: pointInt64(3333),
RunAsGroup: pointInt64(3333),
Capabilities: &corev1.Capabilities{
RunAsUser: pointInt64(3333),
RunAsGroup: pointInt64(3333),
Capabilities: &corev1.Capabilities{
Drop: []corev1.Capability{"ALL"},
Add: []corev1.Capability{"cap1", "cap2"},
Add: []corev1.Capability{"cap1", "cap2"},
},
SELinuxOptions: &corev1.SELinuxOptions{
User: "userLabel",
Role: "roleLabel",
Type: "typeLabel",
SELinuxOptions: &corev1.SELinuxOptions{
User: "userLabel",
Role: "roleLabel",
Type: "typeLabel",
Level: "levelLabel",
},
RunAsNonRoot: boolptr.True(),
@@ -100,7 +100,7 @@ allowPrivilegeEscalation: false`},
},
{
"valid securityContext with secCtx key override runAsUser runAsGroup and allowPrivilegeEscalation",
args{"1001", "999", "true",`
args{"1001", "999", "true", `
capabilities:
drop:
- ALL
@@ -121,16 +121,16 @@ readOnlyRootFilesystem: true
allowPrivilegeEscalation: false`},
false,
&corev1.SecurityContext{
RunAsUser: pointInt64(3333),
RunAsGroup: pointInt64(3333),
Capabilities: &corev1.Capabilities{
RunAsUser: pointInt64(3333),
RunAsGroup: pointInt64(3333),
Capabilities: &corev1.Capabilities{
Drop: []corev1.Capability{"ALL"},
Add: []corev1.Capability{"cap1", "cap2"},
Add: []corev1.Capability{"cap1", "cap2"},
},
SELinuxOptions: &corev1.SELinuxOptions{
User: "userLabel",
Role: "roleLabel",
Type: "typeLabel",
SELinuxOptions: &corev1.SELinuxOptions{
User: "userLabel",
Role: "roleLabel",
Type: "typeLabel",
Level: "levelLabel",
},
RunAsNonRoot: boolptr.True(),
@@ -157,7 +157,7 @@ allowPrivilegeEscalation: false`},
{"empty context without runAsUser", args{"", "", "", ""}, false, &corev1.SecurityContext{}},
{
"invalid securityContext secCtx unknown key",
args{"", "", "",`
args{"", "", "", `
capabilitiesUnknownkey:
drop:
- ALL
@@ -175,7 +175,7 @@ allowPrivilegeEscalation: false`},
},
{
"invalid securityContext secCtx wrong value type string instead of bool",
args{"", "", "",`
args{"", "", "", `
capabilitiesUnknownkey:
drop:
- ALL
@@ -193,7 +193,7 @@ allowPrivilegeEscalation: false`},
},
{
"invalid securityContext secCtx wrong value type string instead of int",
args{"", "", "",`
args{"", "", "", `
capabilitiesUnknownkey:
drop:
- ALL