Skip to content

OCPBUGS-31666: Bump openshift/api for Route API godoc fix #433

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

Merged
openshift-merge-bot merged 1 commit into from
May 8, 2024
Merged

OCPBUGS-31666: Bump openshift/api for Route API godoc fix #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ require (
github.com/jteeuwen/go-bindata v3.0.8-0.20151023091102-a0ff2567cfb7+incompatible
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.0-rc2
github.com/openshift/api v0.0.0-20240417231225-21822c8bdd5c
github.com/openshift/api v0.0.0-20240425081546-8203151f085f
github.com/openshift/apiserver-library-go v0.0.0-20240313131158-facc40cc7688
github.com/openshift/build-machinery-go v0.0.0-20231128094528-1e9b1b0595c8
github.com/openshift/client-go v0.0.0-20240415214935-be70f772f157
github.com/openshift/library-go v0.0.0-20240412173449-eb2f24c36528
github.com/openshift/library-go v0.0.0-20240424194921-cb8aac942b79
github.com/openshift/runtime-utils v0.0.0-20230921210328-7bdb5b9c177b
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,8 @@ github.com/opencontainers/runc v1.1.10 h1:EaL5WeO9lv9wmS6SASjszOeQdSctvpbu0DdBQB
github.com/opencontainers/runc v1.1.10/go.mod h1:+/R6+KmDlh+hOO8NkjmgkG9Qzvypzk0yXxAPYYR65+M=
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 h1:R5M2qXZiK/mWPMT4VldCOiSL9HIAMuxQZWdG0CSM5+4=
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/openshift/api v0.0.0-20240417231225-21822c8bdd5c h1:NSNh/Y7aPvoRNzjvNEdGiTjSS1JYI19fbgyY5GO5SvE=
github.com/openshift/api v0.0.0-20240417231225-21822c8bdd5c/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
github.com/openshift/api v0.0.0-20240425081546-8203151f085f h1:MH6RaWREjGgf1NUcBj0iJIGXd0e6jV8jRhV4Mx/HAf4=
github.com/openshift/api v0.0.0-20240425081546-8203151f085f/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
github.com/openshift/apiserver-library-go v0.0.0-20240313131158-facc40cc7688 h1:E7U+i+BKXjzH1bZsB5a9ueSxF/8QeLxA9ZncCb0vecs=
github.com/openshift/apiserver-library-go v0.0.0-20240313131158-facc40cc7688/go.mod h1:a6meSr6htNKfmmZ8ixLmnim/JL7NkgW7rX7J2vczMp4=
github.com/openshift/build-machinery-go v0.0.0-20231128094528-1e9b1b0595c8 h1:cu3YUMVGsKIyFyJGO3F6BZKGYQZpCKxAv9cBPgQAca8=
Expand All @@ -276,8 +276,8 @@ github.com/openshift/docker-distribution/v3 v3.0.0-20240215131201-6b2f5d2f1f43 h
github.com/openshift/docker-distribution/v3 v3.0.0-20240215131201-6b2f5d2f1f43/go.mod h1:+fqBJ4vPYo4Uu1ZE4d+bUtTLRXfdSL3NvCZIZ9GHv58=
github.com/openshift/kubernetes-apiserver v0.0.0-20240410114447-9e7c11c45dab h1:hVEUWx+0XiMkstOLlQ5BiBZTnA7WWJJf80Dc2L2FLyM=
github.com/openshift/kubernetes-apiserver v0.0.0-20240410114447-9e7c11c45dab/go.mod h1:B0LieKVoyU7ykQvPFm7XSdIHaCHSzCzQWPFa5bqbeMQ=
github.com/openshift/library-go v0.0.0-20240412173449-eb2f24c36528 h1:vnLKZUSW1aPv7Pd6+QYjDUU+/8z2MSBacU38cAlNMPA=
github.com/openshift/library-go v0.0.0-20240412173449-eb2f24c36528/go.mod h1:m/HsttSi90vSixwoy5mPUBHcZid2YRw/QbsLErLxF9s=
github.com/openshift/library-go v0.0.0-20240424194921-cb8aac942b79 h1:4iJrZMloPJlHfwo7NE8lWEXV/Ybg3RpV4LRv/ufd10g=
github.com/openshift/library-go v0.0.0-20240424194921-cb8aac942b79/go.mod h1:lFwyRj0XjUf25Da3Q00y+KuaxCWTJ6YzYPDX1+96nco=
github.com/openshift/moby-moby v0.0.0-20190308215630-da810a85109d h1:fLITXDjxMSvUDjnXs/zljIWktbST9+Om8XbrmmM7T4I=
github.com/openshift/moby-moby v0.0.0-20190308215630-da810a85109d/go.mod h1:LJM49W8fBVSj+rvcopJZu9mgH5Tx6HwLHySIYeGeu4k=
github.com/openshift/runtime-utils v0.0.0-20230921210328-7bdb5b9c177b h1:oXzC1N6E9gw76/WH2gEA8GEHvuq09wuVQ9GoCuR8GF4=
Expand Down
13 changes: 0 additions & 13 deletions hack/openapi-violation.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ API rule violation: list_type_missing,github.com/openshift/api/config/v1,Externa
API rule violation: list_type_missing,github.com/openshift/api/config/v1,ExternalIPPolicy,RejectedCIDRs
API rule violation: list_type_missing,github.com/openshift/api/config/v1,FeatureGateDetails,Disabled
API rule violation: list_type_missing,github.com/openshift/api/config/v1,FeatureGateDetails,Enabled
API rule violation: list_type_missing,github.com/openshift/api/config/v1,FeatureGateEnabledDisabled,Disabled
API rule violation: list_type_missing,github.com/openshift/api/config/v1,FeatureGateEnabledDisabled,Enabled
API rule violation: list_type_missing,github.com/openshift/api/config/v1,FeatureGateTests,Tests
API rule violation: list_type_missing,github.com/openshift/api/config/v1,GenericAPIServerConfig,CORSAllowedOrigins
API rule violation: list_type_missing,github.com/openshift/api/config/v1,GitHubIdentityProvider,Organizations
Expand Down Expand Up @@ -745,12 +743,6 @@ API rule violation: names_match,github.com/openshift/api/config/v1,AdmissionConf
API rule violation: names_match,github.com/openshift/api/config/v1,AuthenticationSpec,OAuthMetadata
API rule violation: names_match,github.com/openshift/api/config/v1,ClusterCondition,PromQL
API rule violation: names_match,github.com/openshift/api/config/v1,EtcdConnectionInfo,URLs
API rule violation: names_match,github.com/openshift/api/config/v1,FeatureGateDescription,FeatureGateAttributes
API rule violation: names_match,github.com/openshift/api/config/v1,FeatureGateDescription,OwningJiraComponent
API rule violation: names_match,github.com/openshift/api/config/v1,FeatureGateDescription,OwningProduct
API rule violation: names_match,github.com/openshift/api/config/v1,FeatureGateDescription,ResponsiblePerson
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,IdentityProviderConfig,GitHub
API rule violation: names_match,github.com/openshift/api/config/v1,IdentityProviderConfig,GitLab
Expand All @@ -773,11 +765,6 @@ API rule violation: names_match,github.com/openshift/api/config/v1,TokenIssuer,U
API rule violation: names_match,github.com/openshift/api/config/v1,VSpherePlatformNodeNetworkingSpec,ExcludeNetworkSubnetCIDR
API rule violation: names_match,github.com/openshift/api/config/v1,VSpherePlatformNodeNetworkingSpec,NetworkSubnetCIDR
API rule violation: names_match,github.com/openshift/api/config/v1,VSpherePlatformSpec,VCenters
API rule violation: names_match,github.com/openshift/api/config/v1,featureGateBuilder,name
API rule violation: names_match,github.com/openshift/api/config/v1,featureGateBuilder,owningJiraComponent
API rule violation: names_match,github.com/openshift/api/config/v1,featureGateBuilder,owningProduct
API rule violation: names_match,github.com/openshift/api/config/v1,featureGateBuilder,responsiblePerson
API rule violation: names_match,github.com/openshift/api/config/v1,featureGateBuilder,statusByClusterProfileByFeatureSet
API rule violation: names_match,github.com/openshift/api/config/v1alpha1,BackupSpec,EtcdBackupSpec
API rule violation: names_match,github.com/openshift/api/config/v1alpha1,PolicyIdentity,PolicyMatchExactRepository
API rule violation: names_match,github.com/openshift/api/config/v1alpha1,PolicyIdentity,PolicyMatchRemapIdentity
Expand Down
3 changes: 2 additions & 1 deletion pkg/cmd/openshift-apiserver/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"path"

configv1 "github.com/openshift/api/config/v1"
openshiftfeatures "github.com/openshift/api/features"
openshiftcontrolplanev1 "github.com/openshift/api/openshiftcontrolplane/v1"
"github.com/openshift/library-go/pkg/config/helpers"
"github.com/openshift/library-go/pkg/features"
Expand Down Expand Up @@ -103,7 +104,7 @@ func (o *OpenShiftAPIServer) Validate() error {

// RunAPIServer takes the options, starts the API server and waits until stopCh is closed or initial listening fails.
func (o *OpenShiftAPIServer) RunAPIServer(stopCh <-chan struct{}) error {
if err := features.InitializeFeatureGates(feature.DefaultMutableFeatureGate, configv1.SelfManaged, configv1.FeatureGateRouteExternalCertificate); err != nil {
if err := features.InitializeFeatureGates(feature.DefaultMutableFeatureGate, openshiftfeatures.SelfManaged, openshiftfeatures.FeatureGateRouteExternalCertificate); err != nil {
return err
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/openshift-apiserver/openshiftapiserver/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"time"

configv1 "github.com/openshift/api/config/v1"
openshiftfeatures "github.com/openshift/api/features"
openshiftcontrolplanev1 "github.com/openshift/api/openshiftcontrolplane/v1"
"github.com/openshift/apiserver-library-go/pkg/configflags"
"github.com/openshift/library-go/pkg/apiserver/admission/admissiontimeout"
Expand Down Expand Up @@ -263,7 +263,7 @@ func NewOpenshiftAPIConfig(config *openshiftcontrolplanev1.OpenShiftAPIServerCon
MaxImagesBulkImportedPerRepository: config.ImagePolicyConfig.MaxImagesBulkImportedPerRepository,
AdditionalTrustedCA: caData,
RouteAllocator: routeAllocator,
AllowRouteExternalCertificates: feature.DefaultFeatureGate.Enabled(featuregate.Feature(configv1.FeatureGateRouteExternalCertificate)),
AllowRouteExternalCertificates: feature.DefaultFeatureGate.Enabled(featuregate.Feature(openshiftfeatures.FeatureGateRouteExternalCertificate)),
ProjectAuthorizationCache: projectAuthorizationCache,
ProjectCache: projectCache,
ProjectRequestTemplate: config.ProjectConfig.ProjectRequestTemplate,
Expand Down
Loading