Skip to content

Commit 5d7b236

Browse files
committed
podsecurityreadinesscontroller: change type from cu to unclassified
1 parent 71fc282 commit 5d7b236

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

pkg/operator/podsecurityreadinesscontroller/classification.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func (c *PodSecurityReadinessController) classifyViolatingNamespace(
5353

5454
// Historically, we assume that this is a customer issue, but
5555
// actually it means we don't know what the root cause is.
56-
conditions.addViolatingCustomer(ns)
56+
conditions.addUnclassifiedIssue(ns)
5757

5858
return nil
5959
}

pkg/operator/podsecurityreadinesscontroller/classification_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func TestClassifyViolatingNamespaceWithAPIErrors(t *testing.T) {
5555
}
5656

5757
// Ensure no classifications were made due to the error
58-
if len(conditions.violatingCustomerNamespaces) != 0 ||
58+
if len(conditions.violatingUnclassifiedNamespaces) != 0 ||
5959
len(conditions.violatingUserSCCNamespaces) != 0 ||
6060
len(conditions.violatingOpenShiftNamespaces) != 0 ||
6161
len(conditions.violatingRunLevelZeroNamespaces) != 0 ||
@@ -190,7 +190,7 @@ func TestClassifyViolatingNamespace(t *testing.T) {
190190
},
191191
enforceLevel: psapi.LevelRestricted,
192192
expectedConditions: podSecurityOperatorConditions{
193-
violatingCustomerNamespaces: []string{"customer-ns"},
193+
violatingUnclassifiedNamespaces: []string{"customer-ns"},
194194
},
195195
expectError: false,
196196
},
@@ -224,7 +224,7 @@ func TestClassifyViolatingNamespace(t *testing.T) {
224224
},
225225
enforceLevel: psapi.LevelRestricted,
226226
expectedConditions: podSecurityOperatorConditions{
227-
violatingCustomerNamespaces: []string{"customer-ns"},
227+
violatingUnclassifiedNamespaces: []string{"customer-ns"},
228228
},
229229
expectError: false,
230230
},
@@ -238,7 +238,7 @@ func TestClassifyViolatingNamespace(t *testing.T) {
238238
pods: []corev1.Pod{},
239239
enforceLevel: psapi.LevelRestricted,
240240
expectedConditions: podSecurityOperatorConditions{
241-
violatingCustomerNamespaces: []string{"customer-ns"},
241+
violatingUnclassifiedNamespaces: []string{"customer-ns"},
242242
},
243243
expectError: false,
244244
},
@@ -268,7 +268,7 @@ func TestClassifyViolatingNamespace(t *testing.T) {
268268
},
269269
enforceLevel: psapi.LevelRestricted,
270270
expectedConditions: podSecurityOperatorConditions{
271-
violatingCustomerNamespaces: []string{"customer-ns"},
271+
violatingUnclassifiedNamespaces: []string{"customer-ns"},
272272
},
273273
expectError: false,
274274
},
@@ -284,7 +284,7 @@ func TestClassifyViolatingNamespace(t *testing.T) {
284284
},
285285
enforceLevel: psapi.LevelPrivileged,
286286
expectedConditions: podSecurityOperatorConditions{
287-
violatingCustomerNamespaces: []string{"customer-ns"},
287+
violatingUnclassifiedNamespaces: []string{"customer-ns"},
288288
},
289289
expectError: false,
290290
},
@@ -453,7 +453,7 @@ func deepEqualPodSecurityOperatorConditions(
453453

454454
return slices.Equal(a.violatingOpenShiftNamespaces, b.violatingOpenShiftNamespaces) &&
455455
slices.Equal(a.violatingRunLevelZeroNamespaces, b.violatingRunLevelZeroNamespaces) &&
456-
slices.Equal(a.violatingCustomerNamespaces, b.violatingCustomerNamespaces) &&
456+
slices.Equal(a.violatingUnclassifiedNamespaces, b.violatingUnclassifiedNamespaces) &&
457457
slices.Equal(a.violatingDisabledSyncerNamespaces, b.violatingDisabledSyncerNamespaces) &&
458458
slices.Equal(a.violatingUserSCCNamespaces, b.violatingUserSCCNamespaces) &&
459459
slices.Equal(a.inconclusiveNamespaces, b.inconclusiveNamespaces)

pkg/operator/podsecurityreadinesscontroller/conditions.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ const (
2828
type podSecurityOperatorConditions struct {
2929
violatingOpenShiftNamespaces []string
3030
violatingRunLevelZeroNamespaces []string
31-
violatingCustomerNamespaces []string
3231
violatingDisabledSyncerNamespaces []string
3332
violatingUserSCCNamespaces []string
33+
violatingUnclassifiedNamespaces []string
3434
inconclusiveNamespaces []string
3535
}
3636

@@ -50,8 +50,8 @@ func (c *podSecurityOperatorConditions) addViolatingDisabledSyncer(ns *corev1.Na
5050
c.violatingDisabledSyncerNamespaces = append(c.violatingDisabledSyncerNamespaces, ns.Name)
5151
}
5252

53-
func (c *podSecurityOperatorConditions) addViolatingCustomer(ns *corev1.Namespace) {
54-
c.violatingCustomerNamespaces = append(c.violatingCustomerNamespaces, ns.Name)
53+
func (c *podSecurityOperatorConditions) addUnclassifiedIssue(ns *corev1.Namespace) {
54+
c.violatingUnclassifiedNamespaces = append(c.violatingUnclassifiedNamespaces, ns.Name)
5555
}
5656

5757
func (c *podSecurityOperatorConditions) addViolatingUserSCC(ns *corev1.Namespace) {
@@ -94,7 +94,7 @@ func makeCondition(conditionType, conditionReason string, namespaces []string) o
9494

9595
func (c *podSecurityOperatorConditions) toConditionFuncs() []v1helpers.UpdateStatusFunc {
9696
return []v1helpers.UpdateStatusFunc{
97-
v1helpers.UpdateConditionFn(makeCondition(PodSecurityCustomerType, violationReason, c.violatingCustomerNamespaces)),
97+
v1helpers.UpdateConditionFn(makeCondition(PodSecurityCustomerType, violationReason, c.violatingUnclassifiedNamespaces)),
9898
v1helpers.UpdateConditionFn(makeCondition(PodSecurityOpenshiftType, violationReason, c.violatingOpenShiftNamespaces)),
9999
v1helpers.UpdateConditionFn(makeCondition(PodSecurityRunLevelZeroType, violationReason, c.violatingRunLevelZeroNamespaces)),
100100
v1helpers.UpdateConditionFn(makeCondition(PodSecurityDisabledSyncerType, violationReason, c.violatingDisabledSyncerNamespaces)),

pkg/operator/podsecurityreadinesscontroller/conditions_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ func TestOperatorStatus(t *testing.T) {
298298
cond.addViolatingDisabledSyncer(ns)
299299
} else {
300300
// Default to customer violation for test purposes
301-
cond.addViolatingCustomer(ns)
301+
cond.addUnclassifiedIssue(ns)
302302
}
303303
}
304304
if tt.addInconclusive {

0 commit comments

Comments
 (0)