Skip to content

OCPBUGS-74511: remove RouteExternalCertificate feature gate #604

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

Open
jcmoraisjr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-74511: remove RouteExternalCertificate feature gate #604

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
2 changes: 1 addition & 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 @@ -104,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, openshiftfeatures.SelfManaged, openshiftfeatures.FeatureGateRouteExternalCertificate); err != nil {
if err := features.InitializeFeatureGates(feature.DefaultMutableFeatureGate, openshiftfeatures.SelfManaged); err != nil {
return err
}

Expand Down
3 changes: 0 additions & 3 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,6 @@ import (
"net/http"
"time"

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 @@ -35,7 +34,6 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/restmapper"
"k8s.io/component-base/compatibility"
"k8s.io/component-base/featuregate"
"k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/api/legacyscheme"
)
Expand Down Expand Up @@ -266,7 +264,6 @@ func NewOpenshiftAPIConfig(config *openshiftcontrolplanev1.OpenShiftAPIServerCon
AdditionalTrustedCA: caData,
ImageStreamImportMode: apisimage.ImportModeType(config.ImagePolicyConfig.ImageStreamImportMode),
RouteAllocator: routeAllocator,
AllowRouteExternalCertificates: feature.DefaultFeatureGate.Enabled(featuregate.Feature(openshiftfeatures.FeatureGateRouteExternalCertificate)),
ProjectAuthorizationCache: projectAuthorizationCache,
ProjectCache: projectCache,
ProjectRequestTemplate: config.ProjectConfig.ProjectRequestTemplate,
Expand Down
5 changes: 2 additions & 3 deletions pkg/cmd/openshift-apiserver/openshiftapiserver/openshift_apiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ type OpenshiftAPIExtraConfig struct {
AdditionalTrustedCA []byte
ImageStreamImportMode apisimage.ImportModeType

RouteAllocator *routehostassignment.SimpleAllocationPlugin
AllowRouteExternalCertificates bool
RouteAllocator *routehostassignment.SimpleAllocationPlugin

ProjectAuthorizationCache *projectauth.AuthorizationCache
ProjectCache *projectcache.ProjectCache
Expand Down Expand Up @@ -328,7 +327,7 @@ func (c *completedConfig) withRouteAPIServer(delegateAPIServer genericapiserver.
ExtraConfig: routeapiserver.ExtraConfig{
KubeAPIServerClientConfig: c.ExtraConfig.KubeAPIServerClientConfig,
RouteAllocator: c.ExtraConfig.RouteAllocator,
AllowExternalCertificates: c.ExtraConfig.AllowRouteExternalCertificates,
AllowExternalCertificates: true,
Codecs: legacyscheme.Codecs,
Scheme: legacyscheme.Scheme,
},
Expand Down