@@ -201,35 +201,7 @@ func TestAdmitSuccess(t *testing.T) {
201
201
// service accounts to test that even though this has matching priorities (0) and a
202
202
// lower point value score (which will cause it to be sorted in front of scc-sa) it should not
203
203
// validate the requests so we should try scc-sa.
204
- var exactUID int64 = 999
205
- saExactSCC := & securityapi.SecurityContextConstraints {
206
- ObjectMeta : metav1.ObjectMeta {
207
- Name : "scc-sa-exact" ,
208
- },
209
- RunAsUser : securityapi.RunAsUserStrategyOptions {
210
- Type : securityapi .RunAsUserStrategyMustRunAs ,
211
- UID : & exactUID ,
212
- },
213
- SELinuxContext : securityapi.SELinuxContextStrategyOptions {
214
- Type : securityapi .SELinuxStrategyMustRunAs ,
215
- SELinuxOptions : & kapi.SELinuxOptions {
216
- Level : "s9:z0,z1" ,
217
- },
218
- },
219
- FSGroup : securityapi.FSGroupStrategyOptions {
220
- Type : securityapi .FSGroupStrategyMustRunAs ,
221
- Ranges : []securityapi.IDRange {
222
- {Min : 999 , Max : 999 },
223
- },
224
- },
225
- SupplementalGroups : securityapi.SupplementalGroupsStrategyOptions {
226
- Type : securityapi .SupplementalGroupsStrategyMustRunAs ,
227
- Ranges : []securityapi.IDRange {
228
- {Min : 999 , Max : 999 },
229
- },
230
- },
231
- Groups : []string {"system:serviceaccounts" },
232
- }
204
+ saExactSCC := saExactSCC ()
233
205
234
206
lister := createSCCLister (t , []* securityapi.SecurityContextConstraints {
235
207
saExactSCC ,
@@ -387,35 +359,7 @@ func TestAdmitFailure(t *testing.T) {
387
359
// service accounts to test that even though this has matching priorities (0) and a
388
360
// lower point value score (which will cause it to be sorted in front of scc-sa) it should not
389
361
// validate the requests so we should try scc-sa.
390
- var exactUID int64 = 999
391
- saExactSCC := & securityapi.SecurityContextConstraints {
392
- ObjectMeta : metav1.ObjectMeta {
393
- Name : "scc-sa-exact" ,
394
- },
395
- RunAsUser : securityapi.RunAsUserStrategyOptions {
396
- Type : securityapi .RunAsUserStrategyMustRunAs ,
397
- UID : & exactUID ,
398
- },
399
- SELinuxContext : securityapi.SELinuxContextStrategyOptions {
400
- Type : securityapi .SELinuxStrategyMustRunAs ,
401
- SELinuxOptions : & kapi.SELinuxOptions {
402
- Level : "s9:z0,z1" ,
403
- },
404
- },
405
- FSGroup : securityapi.FSGroupStrategyOptions {
406
- Type : securityapi .FSGroupStrategyMustRunAs ,
407
- Ranges : []securityapi.IDRange {
408
- {Min : 999 , Max : 999 },
409
- },
410
- },
411
- SupplementalGroups : securityapi.SupplementalGroupsStrategyOptions {
412
- Type : securityapi .SupplementalGroupsStrategyMustRunAs ,
413
- Ranges : []securityapi.IDRange {
414
- {Min : 999 , Max : 999 },
415
- },
416
- },
417
- Groups : []string {"system:serviceaccounts" },
418
- }
362
+ saExactSCC := saExactSCC ()
419
363
420
364
lister , indexer := createSCCListerAndIndexer (t , []* securityapi.SecurityContextConstraints {
421
365
saExactSCC ,
@@ -1139,6 +1083,38 @@ func restrictiveSCC() *securityapi.SecurityContextConstraints {
1139
1083
}
1140
1084
}
1141
1085
1086
+ func saExactSCC () * securityapi.SecurityContextConstraints {
1087
+ var exactUID int64 = 999
1088
+ return & securityapi.SecurityContextConstraints {
1089
+ ObjectMeta : metav1.ObjectMeta {
1090
+ Name : "scc-sa-exact" ,
1091
+ },
1092
+ RunAsUser : securityapi.RunAsUserStrategyOptions {
1093
+ Type : securityapi .RunAsUserStrategyMustRunAs ,
1094
+ UID : & exactUID ,
1095
+ },
1096
+ SELinuxContext : securityapi.SELinuxContextStrategyOptions {
1097
+ Type : securityapi .SELinuxStrategyMustRunAs ,
1098
+ SELinuxOptions : & kapi.SELinuxOptions {
1099
+ Level : "s9:z0,z1" ,
1100
+ },
1101
+ },
1102
+ FSGroup : securityapi.FSGroupStrategyOptions {
1103
+ Type : securityapi .FSGroupStrategyMustRunAs ,
1104
+ Ranges : []securityapi.IDRange {
1105
+ {Min : 999 , Max : 999 },
1106
+ },
1107
+ },
1108
+ SupplementalGroups : securityapi.SupplementalGroupsStrategyOptions {
1109
+ Type : securityapi .SupplementalGroupsStrategyMustRunAs ,
1110
+ Ranges : []securityapi.IDRange {
1111
+ {Min : 999 , Max : 999 },
1112
+ },
1113
+ },
1114
+ Groups : []string {"system:serviceaccounts" },
1115
+ }
1116
+ }
1117
+
1142
1118
// goodPod is empty and should not be used directly for testing since we're providing
1143
1119
// two different SCCs. Since no values are specified it would be allowed to match any
1144
1120
// SCC when defaults are filled in.
0 commit comments