Skip to content

Bug 1986408: NE-310 HSTS Route Admission Plugin #224

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-robot merged 2 commits into from
Jul 28, 2021
Merged

Bug 1986408: NE-310 HSTS Route Admission Plugin #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a5b641
NE-310 HSTS Admission Plugin - vendor files
candita Jul 27, 2021
59dfedf
NE-310 HSTS Admission Plugin - non-vendor
candita Jul 27, 2021
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 @@ -22,9 +22,9 @@ 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.0.2-0.20190823105129-775207bd45b6
github.com/openshift/api v0.0.0-20210624153211-ae79113891b0
github.com/openshift/api v0.0.0-20210720160326-96bb0f993a66
github.com/openshift/apiserver-library-go v0.0.0-20210702112302-ae0a7354dc50
github.com/openshift/build-machinery-go v0.0.0-20210423112049-9415d7ebd33e
github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142
github.com/openshift/library-go v0.0.0-20210521084623-7392ea9b02ca
github.com/spf13/cobra v1.1.1
Expand Down
7 changes: 4 additions & 3 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,12 +522,13 @@ github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo=
github.com/openshift/api v0.0.0-20210521075222-e273a339932a/go.mod h1:izBmoXbUu3z5kUa4FjZhvekTsyzIWiOoaIgJiZBBMQs=
github.com/openshift/api v0.0.0-20210624153211-ae79113891b0 h1:Wbo6MbFHqjoPNV5iSONP3VZV50RR6CS8MYoVHFlKIuQ=
github.com/openshift/api v0.0.0-20210624153211-ae79113891b0/go.mod h1:izBmoXbUu3z5kUa4FjZhvekTsyzIWiOoaIgJiZBBMQs=
github.com/openshift/api v0.0.0-20210720160326-96bb0f993a66 h1:iM8EwYN0B5YkUsLVU/UqkOigwN/01tnRrzGaAtYILuo=
github.com/openshift/api v0.0.0-20210720160326-96bb0f993a66/go.mod h1:6CGz601vxLz2y2Xa51k5bnbAz0yH2oKMDH28yC2MT3w=
github.com/openshift/apiserver-library-go v0.0.0-20210702112302-ae0a7354dc50 h1:ck3kWYdy10YmW4aq33pVdgBAWBf7N+YWaQXRfEOYNGk=
github.com/openshift/apiserver-library-go v0.0.0-20210702112302-ae0a7354dc50/go.mod h1:hmRcqTWiLRXXEnVLhCNoZBfmciZD2N2NrHTEzcRqhK8=
github.com/openshift/build-machinery-go v0.0.0-20210423112049-9415d7ebd33e h1:F7rBobgSjtYL3/zsgDUjlTVx3Z06hdgpoldpDcn7jzc=
github.com/openshift/build-machinery-go v0.0.0-20210423112049-9415d7ebd33e/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3 h1:hYMLjavR8LrcCva788SxDqYjRc1k2w0LNGi7eX9vY5Y=
github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 h1:ZHRIMCFIJN1p9LsJt4HQ+akDrys4PrYnXzOWI5LK03I=
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142/go.mod h1:fjS8r9mqDVsPb5td3NehsNOAWa4uiFkYEfVZioQ2gH0=
github.com/openshift/docker-distribution v0.0.0-20180925154709-d4c35485a70d h1:tupVADlF1SZrGy0Y0kg1FKUi2mVPzRwxVb+8LLMu8ws=
Expand Down
2 changes: 2 additions & 0 deletions hack/openapi-violation.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ API rule violation: list_type_missing,github.com/openshift/api/config/v1,ImageSp
API rule violation: list_type_missing,github.com/openshift/api/config/v1,ImageSpec,ExternalRegistryHostnames
API rule violation: list_type_missing,github.com/openshift/api/config/v1,ImageStatus,ExternalRegistryHostnames
API rule violation: list_type_missing,github.com/openshift/api/config/v1,IngressSpec,ComponentRoutes
API rule violation: list_type_missing,github.com/openshift/api/config/v1,IngressSpec,RequiredHSTSPolicies
API rule violation: list_type_missing,github.com/openshift/api/config/v1,IngressStatus,ComponentRoutes
API rule violation: list_type_missing,github.com/openshift/api/config/v1,LDAPAttributeMapping,Email
API rule violation: list_type_missing,github.com/openshift/api/config/v1,LDAPAttributeMapping,ID
Expand Down Expand Up @@ -127,6 +128,7 @@ API rule violation: list_type_missing,github.com/openshift/api/config/v1,Request
API rule violation: list_type_missing,github.com/openshift/api/config/v1,RequestHeaderIdentityProvider,Headers
API rule violation: list_type_missing,github.com/openshift/api/config/v1,RequestHeaderIdentityProvider,NameHeaders
API rule violation: list_type_missing,github.com/openshift/api/config/v1,RequestHeaderIdentityProvider,PreferredUsernameHeaders
API rule violation: list_type_missing,github.com/openshift/api/config/v1,RequiredHSTSPolicy,DomainPatterns
API rule violation: list_type_missing,github.com/openshift/api/config/v1,ServingInfo,CipherSuites
API rule violation: list_type_missing,github.com/openshift/api/config/v1,ServingInfo,NamedCertificates
API rule violation: list_type_missing,github.com/openshift/api/config/v1,TLSProfileSpec,Ciphers
Expand Down
3 changes: 3 additions & 0 deletions pkg/cmd/openshift-apiserver/openshiftadmission/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
buildstrategyrestrictions "github.com/openshift/openshift-apiserver/pkg/build/apiserver/admission/strategyrestrictions"
imageadmission "github.com/openshift/openshift-apiserver/pkg/image/apiserver/admission/limitrange"
projectrequestlimit "github.com/openshift/openshift-apiserver/pkg/project/apiserver/admission/requestlimit"
requiredrouteannotations "github.com/openshift/openshift-apiserver/pkg/route/apiserver/admission/requiredrouteannotations"
)

// TODO register this per apiserver or at least per process
Expand All @@ -38,6 +39,7 @@ func RegisterOpenshiftAdmissionPlugins(plugins *admission.Plugins) {
imageadmission.Register(plugins)
imagepolicy.Register(plugins)
quotaclusterresourcequota.Register(plugins)
requiredrouteannotations.Register(plugins)
}

var (
Expand All @@ -54,6 +56,7 @@ var (
"image.openshift.io/ImageLimitRange",
"image.openshift.io/ImagePolicy",
"quota.openshift.io/ClusterResourceQuota",
"route.openshift.io/RequiredRouteAnnotations",

// the rest of the kube chain goes here
"MutatingAdmissionWebhook",
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/openshift-apiserver/openshiftapiserver/informers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func NewInformers(kubeInformers kexternalinformers.SharedInformerFactory, kubeCl
if err != nil {
return nil, err
}
configClient, err := configv1client.NewForConfig(loopbackClientConfig)
configClient, err := configv1client.NewForConfig(nonProtobufConfig(kubeClientConfig))
if err != nil {
return nil, err
}
Expand Down
Loading