upgrade to latest dependencies (#1171)

Signed-off-by: Knative Automation <automation@knative.team>
This commit is contained in:
knative-automation 2020-12-16 06:08:59 -08:00 committed by GitHub
parent 1bb08ff024
commit 5e92aa32ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 45 additions and 14 deletions

6
go.mod
View File

@ -22,11 +22,11 @@ require (
k8s.io/cli-runtime v0.18.8
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
k8s.io/code-generator v0.18.12
knative.dev/eventing v0.19.1-0.20201215192158-c806bcc5dfda
knative.dev/eventing v0.19.1-0.20201216081458-3e06c6b996dd
knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24
knative.dev/networking v0.0.0-20201216015158-026ab669dd1d
knative.dev/networking v0.0.0-20201216043058-02ebf9e9b727
knative.dev/pkg v0.0.0-20201216014558-95b8793bd623
knative.dev/serving v0.19.1-0.20201215225858-caf49804da64
knative.dev/serving v0.19.1-0.20201216120558-a26cbe38ded4
sigs.k8s.io/yaml v1.2.0
)

14
go.sum
View File

@ -1263,8 +1263,8 @@ k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl
k8s.io/utils v0.0.0-20200603063816-c1c6865ac451 h1:v8ud2Up6QK1lNOKFgiIVrZdMg7MpmSnvtrOieolJKoE=
k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
knative.dev/caching v0.0.0-20201215015243-9bd909a64850/go.mod h1:/+gGbjPMtb5Jo5PNmmwGNF/WMwTC8cuPG38GPqUqBS8=
knative.dev/eventing v0.19.1-0.20201215192158-c806bcc5dfda h1:cDV5fxchkBMJdDdEhpWfCAWpdA2Lbdiw+OIRedPwJZk=
knative.dev/eventing v0.19.1-0.20201215192158-c806bcc5dfda/go.mod h1:tdbTzkvKA95IzR62cCQkGEHU8ub1A4hOnpDz4ruWKe0=
knative.dev/eventing v0.19.1-0.20201216081458-3e06c6b996dd h1:5qYvQl79MwwIaFK8FT86CfCgQok3BFBKta8CPbpDaZ0=
knative.dev/eventing v0.19.1-0.20201216081458-3e06c6b996dd/go.mod h1:Zs0qfFfbKDhEM5JHjQtmCXBu9k+GERSfeDwitMtgjQM=
knative.dev/hack v0.0.0-20201112185459-01a34c573bd8 h1:RNbZsAjhswBPtl4C5C5gEFX5/GfWIOZQxfYD9DhkHdY=
knative.dev/hack v0.0.0-20201112185459-01a34c573bd8/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack v0.0.0-20201118155651-b31d3bb6bff9/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
@ -1272,9 +1272,9 @@ knative.dev/hack v0.0.0-20201201234937-fddbf732e450 h1:IyitWF7OzfunCgE4b9ZsJAeIR
knative.dev/hack v0.0.0-20201201234937-fddbf732e450/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24 h1:kIztWfvnIFV8Lhlea02K3YO2mIzcDyQNzrBLn0Oq9sA=
knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/networking v0.0.0-20201215014943-f9843265b98a/go.mod h1:ElAa7XS/4o9eUfLcxvu4vFQBGeZkJO0mwl4r9wr/iPY=
knative.dev/networking v0.0.0-20201216015158-026ab669dd1d h1:dUkgSPsU5lbJfLpIzlHgVswgttxFnq4YWH3F2cLEbxI=
knative.dev/networking v0.0.0-20201216015158-026ab669dd1d/go.mod h1:r2uozAo4RhYquP/yVUP04rVDSs7rBI4fc6ICsonNISg=
knative.dev/networking v0.0.0-20201215172457-b175a8d66f91/go.mod h1:CEC2okV/9UCg2PdXZWZRtEG81/jdbKZ28tfAcc2hAis=
knative.dev/networking v0.0.0-20201216043058-02ebf9e9b727 h1:+cpEP6NL5J7sXY5f5cI29aedUhJ2B9ONxt/al/nkuhs=
knative.dev/networking v0.0.0-20201216043058-02ebf9e9b727/go.mod h1:r2uozAo4RhYquP/yVUP04rVDSs7rBI4fc6ICsonNISg=
knative.dev/pkg v0.0.0-20201117221452-0fccc54273ed h1:4LNEFhvD2Ya4WgCD3SC1WGXz81bjEvQgbcpe5XACI3I=
knative.dev/pkg v0.0.0-20201117221452-0fccc54273ed/go.mod h1:nxlh3CUvx6WBPr1WKD96AHxFZPD2UKRDo9RUp8ILTyQ=
knative.dev/pkg v0.0.0-20201214144644-909c15242675 h1:LoJ/axeH7J8ovl3+uELzmGUZ/hnjHeX7m6tZTrfk/P0=
@ -1284,8 +1284,8 @@ knative.dev/pkg v0.0.0-20201215202458-ef8048c0ba77/go.mod h1:VjrwVhfEZUnn6FruncH
knative.dev/pkg v0.0.0-20201216014558-95b8793bd623 h1:YDt8T3at2oWi33WD3UzbtE9bh+r8iQ0xJijJc7k7nqw=
knative.dev/pkg v0.0.0-20201216014558-95b8793bd623/go.mod h1:VjrwVhfEZUnn6FruncHcBm854FldnRpekpyBbYtBvZM=
knative.dev/reconciler-test v0.0.0-20201124190335-83a44efcdfef/go.mod h1:YSs1y1rgnjs8w39/drLIOQbWvZUQwqApvd+EizO8UsA=
knative.dev/serving v0.19.1-0.20201215225858-caf49804da64 h1:eJexn73DMZtq32aUKD63Dtbcf42HyzPyyo7B/m7h1sU=
knative.dev/serving v0.19.1-0.20201215225858-caf49804da64/go.mod h1:oR1Iag+0eowaOUpYlOqxXUbZgpIAIMVn17LpupAaJfY=
knative.dev/serving v0.19.1-0.20201216120558-a26cbe38ded4 h1:ORUzikuA6lxmYYDMSg63NZJPfEX8VJ4yvbs0TAeMDho=
knative.dev/serving v0.19.1-0.20201216120558-a26cbe38ded4/go.mod h1:7uNUzgy9rq77x1F+raxTG3dYTeumb+gHFbCd40SXxdY=
pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=

View File

@ -35,7 +35,9 @@ func (is *IngressSpec) SetDefaults(ctx context.Context) {
for i := range is.Rules {
is.Rules[i].SetDefaults(ctx)
}
if is.HTTPOption == "" {
is.HTTPOption = HTTPOptionEnabled
}
// Deprecated, do not use.
is.DeprecatedVisibility = ""
}

View File

@ -100,6 +100,11 @@ type IngressSpec struct {
// +optional
Rules []IngressRule `json:"rules,omitempty"`
// HTTPOption is the option of HTTP. It has the following three values:
// `HTTPOptionEnabled`, `HTTPOptionDisabled`, `HTTPOptionRedirected`
// If it's not specified then it defaults to `HTTPOptionEnabled`.
HTTPOption HTTPOption `json:"httpOption,omitempty"`
// DeprecatedVisibility was used for the fallback when spec.rules.visibility
// isn't set.
//
@ -109,6 +114,18 @@ type IngressSpec struct {
DeprecatedVisibility IngressVisibility `json:"visibility,omitempty"`
}
type HTTPOption string
const (
// The knative ingress will be able to serve HTTP connections.
HTTPOptionEnabled HTTPOption = "Enabled"
// The knative ingress will reject HTTP traffic
HTTPOptionDisabled HTTPOption = "Disabled"
// The knative will return redirection HTTP status for the clients,
// asking the clients to redirect their requests to HTTPS.
HTTPOptionRedirected HTTPOption = "Redirected"
)
// IngressVisibility describes whether the Ingress should be exposed to
// public gateways or not.
type IngressVisibility string

View File

@ -50,6 +50,7 @@ func (is *IngressSpec) Validate(ctx context.Context) *apis.FieldError {
for idx, tls := range is.TLS {
all = all.Also(tls.Validate(ctx).ViaFieldIndex("tls", idx))
}
all = all.Also(is.HTTPOption.Validate(ctx))
return all
}
@ -166,3 +167,14 @@ func (t *IngressTLS) Validate(ctx context.Context) *apis.FieldError {
}
return all
}
// Validate inspects and validates HTTPOption object.
func (t HTTPOption) Validate(ctx context.Context) (all *apis.FieldError) {
switch t {
case HTTPOptionEnabled, HTTPOptionDisabled, HTTPOptionRedirected:
break
default:
all = all.Also(apis.ErrInvalidValue(t, "httpOption"))
}
return all
}

6
vendor/modules.txt vendored
View File

@ -849,7 +849,7 @@ k8s.io/kube-openapi/pkg/util/sets
k8s.io/utils/buffer
k8s.io/utils/integer
k8s.io/utils/trace
# knative.dev/eventing v0.19.1-0.20201215192158-c806bcc5dfda
# knative.dev/eventing v0.19.1-0.20201216081458-3e06c6b996dd
## explicit
knative.dev/eventing/pkg/apis/config
knative.dev/eventing/pkg/apis/configs
@ -882,7 +882,7 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1alpha2/fake
# knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24
## explicit
knative.dev/hack
# knative.dev/networking v0.0.0-20201216015158-026ab669dd1d
# knative.dev/networking v0.0.0-20201216043058-02ebf9e9b727
## explicit
knative.dev/networking/pkg
knative.dev/networking/pkg/apis/networking
@ -931,7 +931,7 @@ knative.dev/pkg/tracing/config
knative.dev/pkg/tracing/propagation
knative.dev/pkg/tracing/propagation/tracecontextb3
knative.dev/pkg/tracker
# knative.dev/serving v0.19.1-0.20201215225858-caf49804da64
# knative.dev/serving v0.19.1-0.20201216120558-a26cbe38ded4
## explicit
knative.dev/serving/pkg/apis/autoscaling
knative.dev/serving/pkg/apis/autoscaling/v1alpha1