kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52466 from charrywanganthony/audit-2 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>..

Update the test under audit/policy

Small change to cope with [previous review](https://github.com/kubernetes/kubernetes/pull/51782#pullrequestreview-61526174)
@crassirostris

Kubernetes-commit: 2d7192c54afe7d946bdaa9534958cfd06adbc0cf
This commit is contained in:
Kubernetes Publisher 2017-09-19 22:36:11 -07:00
parent e82569769e d7e7a0ab18
commit 69cfac46ed
2 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Godeps/Godeps.json generated
View File

@ -760,99 +760,99 @@
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "0b011bb8613011ab0909c6a759d9d811dc21a156"
"Rev": "6afd1ec979d7a9cddc75c858384640eb224c80bf"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",

9
pkg/audit/policy/reader_test.go
View File

@ -91,7 +91,7 @@ var expectedPolicy = &audit.Policy{
}
func TestParserV1alpha1(t *testing.T) {
f, err := writePolicy(policyDefV1alpha1, t)
f, err := writePolicy(t, policyDefV1alpha1)
require.NoError(t, err)
defer os.Remove(f)
@ -105,7 +105,7 @@ func TestParserV1alpha1(t *testing.T) {
}
func TestParserV1beta1(t *testing.T) {
f, err := writePolicy(policyDefV1beta1, t)
f, err := writePolicy(t, policyDefV1beta1)
require.NoError(t, err)
defer os.Remove(f)
@ -119,7 +119,6 @@ func TestParserV1beta1(t *testing.T) {
}
func TestPolicyCntCheck(t *testing.T) {
//a set of testCases
var testCases = []struct {
caseName, policy string
}{
@ -132,7 +131,7 @@ kind: Policy`,
}
for _, tc := range testCases {
f, err := writePolicy(tc.policy, t)
f, err := writePolicy(t, tc.policy)
require.NoError(t, err)
defer os.Remove(f)
@ -141,7 +140,7 @@ kind: Policy`,
}
}
func writePolicy(policy string, t *testing.T) (string, error) {
func writePolicy(t *testing.T, policy string) (string, error) {
f, err := ioutil.TempFile("", "policy.yaml")
require.NoError(t, err)