Skip to content

bump(*) #22364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
adambkaplan wants to merge 3 commits into from
Closed

bump(*) #22364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6654b11
bump(*)
adambkaplan Mar 19, 2019
1fffc47
renames
adambkaplan Mar 19, 2019
bae882e
update api
adambkaplan Mar 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions hack/openapi-violation.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ API rule violation: names_match,github.com/openshift/api/config/v1,AdmissionConf
API rule violation: names_match,github.com/openshift/api/config/v1,AdmissionConfig,EnabledAdmissionPlugins
API rule violation: names_match,github.com/openshift/api/config/v1,AuthenticationSpec,OAuthMetadata
API rule violation: names_match,github.com/openshift/api/config/v1,EtcdConnectionInfo,URLs
API rule violation: names_match,github.com/openshift/api/config/v1,FeatureEnabledDisabled,Disabled
API rule violation: names_match,github.com/openshift/api/config/v1,FeatureEnabledDisabled,Enabled
API rule violation: names_match,github.com/openshift/api/config/v1,FeatureGateEnabledDisabled,Disabled
API rule violation: names_match,github.com/openshift/api/config/v1,FeatureGateEnabledDisabled,Enabled
API rule violation: names_match,github.com/openshift/api/config/v1,GenericAPIServerConfig,AdmissionConfig
API rule violation: names_match,github.com/openshift/api/config/v1,IdentityProvider,UseAsChallenger
API rule violation: names_match,github.com/openshift/api/config/v1,IdentityProvider,UseAsLogin
Expand Down Expand Up @@ -78,6 +78,7 @@ API rule violation: names_match,github.com/openshift/api/network/v1,ClusterNetwo
API rule violation: names_match,github.com/openshift/api/network/v1,NetNamespace,NetID
API rule violation: names_match,github.com/openshift/api/network/v1,NetNamespace,NetName
API rule violation: names_match,github.com/openshift/api/oauth/v1,ScopeRestriction,ExactValues
API rule violation: names_match,github.com/openshift/api/operator/v1,DefaultNetworkDefinition,OpenShiftSDNConfig
API rule violation: names_match,github.com/openshift/api/operator/v1alpha1,OperatorStatus,CurrentAvailability
API rule violation: names_match,github.com/openshift/api/operator/v1alpha1,OperatorStatus,TargetAvailability
API rule violation: names_match,github.com/openshift/api/osin/v1,IdentityProvider,UseAsChallenger
Expand Down Expand Up @@ -261,3 +262,4 @@ API rule violation: names_match,k8s.io/kubernetes/cmd/cloud-controller-manager/a
API rule violation: names_match,k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config/v1alpha1,CloudControllerManagerConfiguration,ServiceController
API rule violation: names_match,k8s.io/metrics/pkg/apis/custom_metrics/v1beta1,MetricValue,WindowSeconds
API rule violation: names_match,k8s.io/metrics/pkg/apis/external_metrics/v1beta1,ExternalMetricValue,WindowSeconds
API rule violation: omitempty_match_case,github.com/openshift/api/operator/v1,StaticPodOperatorStatus,LatestAvailableRevision
24 changes: 12 additions & 12 deletions pkg/admission/customresourcevalidation/features/validate_features.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@ func Register(plugins *admission.Plugins) {
})
}

func toFeatureV1(uncastObj runtime.Object) (*configv1.Features, field.ErrorList) {
func toFeatureGateV1(uncastObj runtime.Object) (*configv1.FeatureGate, field.ErrorList) {
if uncastObj == nil {
return nil, nil
}

allErrs := field.ErrorList{}

obj, ok := uncastObj.(*configv1.Features)
obj, ok := uncastObj.(*configv1.FeatureGate)
if !ok {
return nil, append(allErrs,
field.NotSupported(field.NewPath("kind"), fmt.Sprintf("%T", uncastObj), []string{"Features"}),
field.NotSupported(field.NewPath("kind"), fmt.Sprintf("%T", uncastObj), []string{"FeatureGate"}),
field.NotSupported(field.NewPath("apiVersion"), fmt.Sprintf("%T", uncastObj), []string{"config.openshift.io/v1"}))
}

Expand All @@ -53,7 +53,7 @@ type featuresV1 struct {

var knownFeatureSets = sets.NewString("", string(configv1.TechPreviewNoUpgrade))

func validateFeatureSpecCreate(spec configv1.FeaturesSpec) field.ErrorList {
func validateFeatureGateSpecCreate(spec configv1.FeatureGateSpec) field.ErrorList {
allErrs := field.ErrorList{}

// on create, we only allow values that we are aware of
Expand All @@ -64,7 +64,7 @@ func validateFeatureSpecCreate(spec configv1.FeaturesSpec) field.ErrorList {
return allErrs
}

func validateFeatureSpecUpdate(spec, oldSpec configv1.FeaturesSpec) field.ErrorList {
func validateFeatureGateSpecUpdate(spec, oldSpec configv1.FeatureGateSpec) field.ErrorList {
allErrs := field.ErrorList{}

// on update, we don't fail validation on a field we don't recognize as long as it is not changing
Expand All @@ -81,39 +81,39 @@ func validateFeatureSpecUpdate(spec, oldSpec configv1.FeaturesSpec) field.ErrorL
}

func (featuresV1) ValidateCreate(uncastObj runtime.Object) field.ErrorList {
obj, allErrs := toFeatureV1(uncastObj)
obj, allErrs := toFeatureGateV1(uncastObj)
if len(allErrs) > 0 {
return allErrs
}

allErrs = append(allErrs, validation.ValidateObjectMeta(&obj.ObjectMeta, false, customresourcevalidation.RequireNameCluster, field.NewPath("metadata"))...)
allErrs = append(allErrs, validateFeatureSpecCreate(obj.Spec)...)
allErrs = append(allErrs, validateFeatureGateSpecCreate(obj.Spec)...)

return allErrs
}

func (featuresV1) ValidateUpdate(uncastObj runtime.Object, uncastOldObj runtime.Object) field.ErrorList {
obj, allErrs := toFeatureV1(uncastObj)
obj, allErrs := toFeatureGateV1(uncastObj)
if len(allErrs) > 0 {
return allErrs
}
oldObj, allErrs := toFeatureV1(uncastOldObj)
oldObj, allErrs := toFeatureGateV1(uncastOldObj)
if len(allErrs) > 0 {
return allErrs
}

allErrs = append(allErrs, validation.ValidateObjectMetaUpdate(&obj.ObjectMeta, &oldObj.ObjectMeta, field.NewPath("metadata"))...)
allErrs = append(allErrs, validateFeatureSpecUpdate(obj.Spec, oldObj.Spec)...)
allErrs = append(allErrs, validateFeatureGateSpecUpdate(obj.Spec, oldObj.Spec)...)

return allErrs
}

func (featuresV1) ValidateStatusUpdate(uncastObj runtime.Object, uncastOldObj runtime.Object) field.ErrorList {
obj, errs := toFeatureV1(uncastObj)
obj, errs := toFeatureGateV1(uncastObj)
if len(errs) > 0 {
return errs
}
oldObj, errs := toFeatureV1(uncastOldObj)
oldObj, errs := toFeatureGateV1(uncastOldObj)
if len(errs) > 0 {
return errs
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/admission/customresourcevalidation/features/validate_features_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func TestValidateCreateSpec(t *testing.T) {

for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
actual := validateFeatureSpecCreate(configv1.FeaturesSpec{FeatureSet: configv1.FeatureSet(tc.featureSet)})
actual := validateFeatureGateSpecCreate(configv1.FeatureGateSpec{FeatureSet: configv1.FeatureSet(tc.featureSet)})
switch {
case len(actual) == 0 && len(tc.expectedErr) == 0:
case len(actual) == 0 && len(tc.expectedErr) != 0:
Expand Down Expand Up @@ -95,9 +95,9 @@ func TestValidateUpdateSpec(t *testing.T) {

for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
actual := validateFeatureSpecUpdate(
configv1.FeaturesSpec{FeatureSet: configv1.FeatureSet(tc.featureSet)},
configv1.FeaturesSpec{FeatureSet: configv1.FeatureSet(tc.oldFeatureSet)},
actual := validateFeatureGateSpecUpdate(
configv1.FeatureGateSpec{FeatureSet: configv1.FeatureSet(tc.featureSet)},
configv1.FeatureGateSpec{FeatureSet: configv1.FeatureSet(tc.oldFeatureSet)},
)
switch {
case len(actual) == 0 && len(tc.expectedErr) == 0:
Expand Down
Loading