Skip to content
This repository was archived by the owner on May 24, 2023. It is now read-only.

Fix SCC resource to only affect KIC pods #65

Merged
merged 4 commits into from
Mar 3, 2021
Merged

Fix SCC resource to only affect KIC pods #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3525e60
Fix SCC resource to only affect KIC pods
Dean-Coakley Feb 24, 2021
03ff09a
Remove priority from unit test
Dean-Coakley Feb 24, 2021
4f79581
Improve test to print diff upon mismatch
Dean-Coakley Feb 25, 2021
cc48ac0
Remove SCC group. Fix SCC user reference
Dean-Coakley Mar 2, 2021
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
5 changes: 1 addition & 4 deletions pkg/controller/nginxingresscontroller/scc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
)

func sccForNginxIngressController(name string) *secv1.SecurityContextConstraints {
var priority int32 = 20
var uid int64 = 101

allowPrivilegeEscalation := true
Expand All @@ -19,7 +18,6 @@ func sccForNginxIngressController(name string) *secv1.SecurityContextConstraints
Name: name,
},
AllowHostPorts: false,
Priority: &priority,
AllowPrivilegedContainer: false,
RunAsUser: secv1.RunAsUserStrategyOptions{
Type: "MustRunAs",
Expand All @@ -35,7 +33,6 @@ func sccForNginxIngressController(name string) *secv1.SecurityContextConstraints
FSGroup: secv1.FSGroupStrategyOptions{
Type: "MustRunAs",
},
Groups: []string{"system:authenticated"},
SupplementalGroups: secv1.SupplementalGroupsStrategyOptions{
Type: "MustRunAs",
},
Expand All @@ -50,5 +47,5 @@ func sccForNginxIngressController(name string) *secv1.SecurityContextConstraints
}

func userForSCC(namespace string, name string) string {
return fmt.Sprintf("%v:%v", namespace, name)
return fmt.Sprintf("system:serviceaccount:%v:%v", namespace, name)
}
12 changes: 4 additions & 8 deletions pkg/controller/nginxingresscontroller/scc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,16 @@ package nginxingresscontroller

import (
"fmt"
"reflect"
"testing"

"github.com/google/go-cmp/cmp"
secv1 "github.com/openshift/api/security/v1"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

func TestSccForNginxIngressController(t *testing.T) {
var priority int32 = 20
var uid int64 = 101

name := "my-nginx-ingress"
allowPrivilegeEscalation := true

Expand All @@ -22,7 +20,6 @@ func TestSccForNginxIngressController(t *testing.T) {
Name: name,
},
AllowHostPorts: false,
Priority: &priority,
AllowPrivilegedContainer: false,
RunAsUser: secv1.RunAsUserStrategyOptions{
Type: "MustRunAs",
Expand All @@ -38,7 +35,6 @@ func TestSccForNginxIngressController(t *testing.T) {
FSGroup: secv1.FSGroupStrategyOptions{
Type: "MustRunAs",
},
Groups: []string{"system:authenticated"},
SupplementalGroups: secv1.SupplementalGroupsStrategyOptions{
Type: "MustRunAs",
},
Expand All @@ -52,15 +48,15 @@ func TestSccForNginxIngressController(t *testing.T) {
}

result := sccForNginxIngressController(name)
if !reflect.DeepEqual(result, expected) {
t.Errorf("sccForNginxIngressController(%v) returned %+v but expected %+v", name, result, expected)
if diff := cmp.Diff(expected, result); diff != "" {
t.Errorf("sccForNginxIngressController() mismatch (-want +got):\n%s", diff)
}
}

func TestUserForSCC(t *testing.T) {
namespace := "my-nginx-ingress"
name := "my-nginx-ingress-controller"
expected := fmt.Sprintf("%v:%v", namespace, name)
expected := fmt.Sprintf("system:serviceaccount:%v:%v", namespace, name)

result := userForSCC(namespace, name)
if expected != result {
Expand Down