Skip to content

Commit 0280460

Browse files
committed
Remove standard from feature-set names
We were calling our feature sets as StandardCoreFeatures and StandardExtendedFeatures. This was in anticipation of Standard and experimental channels which is not something we have strongly started to use. So having standard and extended as way forward is easier than having standard.core, standard.extended and experimental.core, experimental.extended sets. Signed-off-by: Surya Seetharaman <[email protected]>
1 parent 00b70b7 commit 0280460

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

conformance/utils/suite/features.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import "k8s.io/apimachinery/pkg/util/sets"
2727
type SupportedFeature string
2828

2929
// -----------------------------------------------------------------------------
30-
// Features - Standard (Core)
30+
// Features - Core
3131
// -----------------------------------------------------------------------------
3232

3333
const (
@@ -37,15 +37,15 @@ const (
3737
SupportBaselineAdminNetworkPolicy SupportedFeature = "BaselineAdminNetworkPolicy"
3838
)
3939

40-
// StandardCoreFeatures are the features that are required to be conformant with
40+
// CoreFeatures are the features that are required to be conformant with
4141
// the Core API features (e.g. all fields in the API except for NamedPorts, SameLabels, NotSameLabels).
42-
var StandardCoreFeatures = sets.New(
42+
var CoreFeatures = sets.New(
4343
SupportAdminNetworkPolicy,
4444
SupportBaselineAdminNetworkPolicy,
4545
)
4646

4747
// -----------------------------------------------------------------------------
48-
// Features - Standard (Extended)
48+
// Features - Extended
4949
// -----------------------------------------------------------------------------
5050

5151
const (
@@ -59,16 +59,16 @@ const (
5959
SupportBaselineAdminNetworkPolicyNotSameLabels SupportedFeature = "BaselineAdminNetworkPolicyNotSameLabels"
6060
)
6161

62-
// StandardExtendedFeatures are extra generic features that implementations may
62+
// ExtendedFeatures are extra generic features that implementations may
6363
// choose to support as an opt-in.
64-
var StandardExtendedFeatures = sets.New(
64+
var ExtendedFeatures = sets.New(
6565
SupportAdminNetworkPolicyNamedPorts,
6666
SupportAdminNetworkPolicySameLabels,
6767
SupportAdminNetworkPolicyNotSameLabels,
6868
SupportBaselineAdminNetworkPolicyNamedPorts,
6969
SupportBaselineAdminNetworkPolicySameLabels,
7070
SupportBaselineAdminNetworkPolicyNotSameLabels,
71-
).Insert(StandardCoreFeatures.UnsortedList()...)
71+
).Insert(CoreFeatures.UnsortedList()...)
7272

7373
// -----------------------------------------------------------------------------
7474
// Features - Compilations
@@ -79,4 +79,4 @@ var StandardExtendedFeatures = sets.New(
7979
//
8080
// NOTE: as new feature sets are added they should be inserted into this set.
8181
var AllFeatures = sets.New[SupportedFeature]().
82-
Insert(StandardExtendedFeatures.UnsortedList()...)
82+
Insert(ExtendedFeatures.UnsortedList()...)

conformance/utils/suite/suite.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ func New(s Options) *ConformanceTestSuite {
7676
if s.EnableAllSupportedFeatures {
7777
s.SupportedFeatures = AllFeatures
7878
} else if s.SupportedFeatures == nil {
79-
s.SupportedFeatures = StandardCoreFeatures
79+
s.SupportedFeatures = CoreFeatures
8080
} else {
81-
for feature := range StandardCoreFeatures {
81+
for feature := range CoreFeatures {
8282
s.SupportedFeatures.Insert(feature)
8383
}
8484
}

0 commit comments

Comments
 (0)