Skip to content

Commit

Permalink
Merge pull request #155 from tssurya/rename-feature-sets
Browse files Browse the repository at this point in the history
Remove standard from feature-set names
  • Loading branch information
k8s-ci-robot authored Oct 17, 2023
2 parents bb2cafa + 0280460 commit 262dc04
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions conformance/utils/suite/features.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import "k8s.io/apimachinery/pkg/util/sets"
type SupportedFeature string

// -----------------------------------------------------------------------------
// Features - Standard (Core)
// Features - Core
// -----------------------------------------------------------------------------

const (
Expand All @@ -37,15 +37,15 @@ const (
SupportBaselineAdminNetworkPolicy SupportedFeature = "BaselineAdminNetworkPolicy"
)

// StandardCoreFeatures are the features that are required to be conformant with
// CoreFeatures are the features that are required to be conformant with
// the Core API features (e.g. all fields in the API except for NamedPorts, SameLabels, NotSameLabels).
var StandardCoreFeatures = sets.New(
var CoreFeatures = sets.New(
SupportAdminNetworkPolicy,
SupportBaselineAdminNetworkPolicy,
)

// -----------------------------------------------------------------------------
// Features - Standard (Extended)
// Features - Extended
// -----------------------------------------------------------------------------

const (
Expand All @@ -59,16 +59,16 @@ const (
SupportBaselineAdminNetworkPolicyNotSameLabels SupportedFeature = "BaselineAdminNetworkPolicyNotSameLabels"
)

// StandardExtendedFeatures are extra generic features that implementations may
// ExtendedFeatures are extra generic features that implementations may
// choose to support as an opt-in.
var StandardExtendedFeatures = sets.New(
var ExtendedFeatures = sets.New(
SupportAdminNetworkPolicyNamedPorts,
SupportAdminNetworkPolicySameLabels,
SupportAdminNetworkPolicyNotSameLabels,
SupportBaselineAdminNetworkPolicyNamedPorts,
SupportBaselineAdminNetworkPolicySameLabels,
SupportBaselineAdminNetworkPolicyNotSameLabels,
).Insert(StandardCoreFeatures.UnsortedList()...)
).Insert(CoreFeatures.UnsortedList()...)

// -----------------------------------------------------------------------------
// Features - Compilations
Expand All @@ -79,4 +79,4 @@ var StandardExtendedFeatures = sets.New(
//
// NOTE: as new feature sets are added they should be inserted into this set.
var AllFeatures = sets.New[SupportedFeature]().
Insert(StandardExtendedFeatures.UnsortedList()...)
Insert(ExtendedFeatures.UnsortedList()...)
4 changes: 2 additions & 2 deletions conformance/utils/suite/suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ func New(s Options) *ConformanceTestSuite {
if s.EnableAllSupportedFeatures {
s.SupportedFeatures = AllFeatures
} else if s.SupportedFeatures == nil {
s.SupportedFeatures = StandardCoreFeatures
s.SupportedFeatures = CoreFeatures
} else {
for feature := range StandardCoreFeatures {
for feature := range CoreFeatures {
s.SupportedFeatures.Insert(feature)
}
}
Expand Down

0 comments on commit 262dc04

Please sign in to comment.