upgrade to latest dependencies (#1711)

bumping knative.dev/eventing c8435ed...15dd7ca:
  > 15dd7ca 🧹 Remove dead variables & config for presubmit markdown checking (# 6452)
  > e5405de Update community files (# 6462)
bumping knative.dev/serving 63523f9...8fc6d87:
  > 8fc6d87 Update net-istio nightly (# 13167)
  > 0b694b0 Update net-certmanager nightly (# 13165)
  > b3fb541 Update net-gateway-api nightly (# 13164)
  > 1f849ab Update net-kourier nightly (# 13166)
  > d0887e7 Update community files (# 13163)
  > bb043fa updating name of activation-scale (# 13161)
  > addd55a Add active-min-scale annotation (# 13136)
  > c82be27 Update net-istio nightly (# 13156)
  > f428628 Update net-gateway-api nightly (# 13155)
bumping knative.dev/networking cddb0ff...19a4157:
  > 19a4157 remove defunct markdown linting variable (# 696)
  > 8baa0ac upgrade to latest dependencies (# 692)
  > d6a574e Update community files (# 697)
bumping knative.dev/pkg ed7ab1d...449f7e6:
  > 449f7e6 Update community files (# 2564)
bumping knative.dev/hack 782bbaa...9dabf7c:
  > 9dabf7c Update community files (# 206)

Signed-off-by: Knative Automation <automation@knative.team>
This commit is contained in:
knative-automation 2022-07-29 07:21:38 -04:00 committed by GitHub
parent 05ccf8e035
commit 559a4bd056
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 58 additions and 18 deletions

10
go.mod
View File

@ -21,11 +21,11 @@ require (
k8s.io/cli-runtime v0.23.4 k8s.io/cli-runtime v0.23.4
k8s.io/client-go v0.23.8 k8s.io/client-go v0.23.8
k8s.io/code-generator v0.23.8 k8s.io/code-generator v0.23.8
knative.dev/eventing v0.33.1-0.20220722122720-c8435ed74ba8 knative.dev/eventing v0.33.1-0.20220728144837-15dd7ca8c811
knative.dev/hack v0.0.0-20220725145124-782bbaabb8a1 knative.dev/hack v0.0.0-20220728013938-9dabf7cf62e3
knative.dev/networking v0.0.0-20220723000421-cddb0ff95789 knative.dev/networking v0.0.0-20220728142238-19a4157a1fcf
knative.dev/pkg v0.0.0-20220725182823-ed7ab1d18a8b knative.dev/pkg v0.0.0-20220728013737-449f7e6dab63
knative.dev/serving v0.33.1-0.20220725225524-63523f9d0e97 knative.dev/serving v0.33.1-0.20220728203237-8fc6d878ebd6
sigs.k8s.io/yaml v1.3.0 sigs.k8s.io/yaml v1.3.0
) )

18
go.sum
View File

@ -2275,24 +2275,26 @@ k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19V
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
knative.dev/caching v0.0.0-20220725105524-783e3361b29b/go.mod h1:Mlgy6XAtPHXR7nkmltDfA24GVeTPG8o6mL3aUHCICss= knative.dev/caching v0.0.0-20220725105524-783e3361b29b/go.mod h1:Mlgy6XAtPHXR7nkmltDfA24GVeTPG8o6mL3aUHCICss=
knative.dev/control-protocol v0.0.0-20220711013913-b5a214695a24/go.mod h1:yKqKLbEEsVfwE7eEladw/1bqk8+Ai+6sghLGpWtjK90= knative.dev/control-protocol v0.0.0-20220711013913-b5a214695a24/go.mod h1:yKqKLbEEsVfwE7eEladw/1bqk8+Ai+6sghLGpWtjK90=
knative.dev/eventing v0.33.1-0.20220722122720-c8435ed74ba8 h1:W5BodVsUcgWK5DJ1YWXyyGH3bxUDLvbEcBjwpPcBfI8= knative.dev/eventing v0.33.1-0.20220728144837-15dd7ca8c811 h1:JO83M4YKP44eApBDQeEU8+DGuLwJjHbi8+9ZRnUQx+s=
knative.dev/eventing v0.33.1-0.20220722122720-c8435ed74ba8/go.mod h1:rxOHyuk8ssl+ymaSpeA1ZsRJcG6gSlgje2+di6LoFmg= knative.dev/eventing v0.33.1-0.20220728144837-15dd7ca8c811/go.mod h1:rxOHyuk8ssl+ymaSpeA1ZsRJcG6gSlgje2+di6LoFmg=
knative.dev/hack v0.0.0-20220701014203-65c463ac8c98/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/hack v0.0.0-20220701014203-65c463ac8c98/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack v0.0.0-20220721014222-a6450400b5f1/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/hack v0.0.0-20220721014222-a6450400b5f1/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack v0.0.0-20220722185521-123a2783c4d8/go.mod h1:t/azP8I/Cygaw+87O7rkAPrNRjCelmtfSzWzu/9TM7I= knative.dev/hack v0.0.0-20220722185521-123a2783c4d8/go.mod h1:t/azP8I/Cygaw+87O7rkAPrNRjCelmtfSzWzu/9TM7I=
knative.dev/hack v0.0.0-20220725145124-782bbaabb8a1 h1:90z6q68YSEUuPR5P5j8W6viTO8Pi/MhNnHEIhX3Uvnk=
knative.dev/hack v0.0.0-20220725145124-782bbaabb8a1/go.mod h1:t/azP8I/Cygaw+87O7rkAPrNRjCelmtfSzWzu/9TM7I= knative.dev/hack v0.0.0-20220725145124-782bbaabb8a1/go.mod h1:t/azP8I/Cygaw+87O7rkAPrNRjCelmtfSzWzu/9TM7I=
knative.dev/hack v0.0.0-20220728013938-9dabf7cf62e3 h1:1JsQ8ylMK+9yQfuxXvGBux+NOzvNLQyoyTXlupBrfHE=
knative.dev/hack v0.0.0-20220728013938-9dabf7cf62e3/go.mod h1:t/azP8I/Cygaw+87O7rkAPrNRjCelmtfSzWzu/9TM7I=
knative.dev/hack/schema v0.0.0-20220701014203-65c463ac8c98/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0= knative.dev/hack/schema v0.0.0-20220701014203-65c463ac8c98/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0=
knative.dev/networking v0.0.0-20220723000421-cddb0ff95789 h1:utP79FgVXwef+5j9EL2YKD6HcvKvB1pbR19T6hG4+a0=
knative.dev/networking v0.0.0-20220723000421-cddb0ff95789/go.mod h1:YvQyPygj2RYH2WpY+2wbCmE75bOwElPIkr773zEkh4Y= knative.dev/networking v0.0.0-20220723000421-cddb0ff95789/go.mod h1:YvQyPygj2RYH2WpY+2wbCmE75bOwElPIkr773zEkh4Y=
knative.dev/networking v0.0.0-20220728142238-19a4157a1fcf h1:oS0WxAEwNamjVCvCaVQ/8iNsy2dC0wQiaAIKVSWtUuA=
knative.dev/networking v0.0.0-20220728142238-19a4157a1fcf/go.mod h1:UoYvt++kHd2McD5iz6B89jsxG1+uVutBUSBqqOCohJg=
knative.dev/pkg v0.0.0-20220705130606-e60d250dc637/go.mod h1:MxsV3ZGdrH87zv4O9HtxzbNwmiKcGwEP7UdriLINSn0= knative.dev/pkg v0.0.0-20220705130606-e60d250dc637/go.mod h1:MxsV3ZGdrH87zv4O9HtxzbNwmiKcGwEP7UdriLINSn0=
knative.dev/pkg v0.0.0-20220722175921-6c9c1c6098d5/go.mod h1:zaGmg6so9RiTx8Fu6vCSUClfVtOBtCrsD/j3c2y+no8= knative.dev/pkg v0.0.0-20220722175921-6c9c1c6098d5/go.mod h1:zaGmg6so9RiTx8Fu6vCSUClfVtOBtCrsD/j3c2y+no8=
knative.dev/pkg v0.0.0-20220725182823-ed7ab1d18a8b h1:oIDOArTxLcA6WgcFv7OHpUdK3iALnWKkSoGwE9r3/eQ= knative.dev/pkg v0.0.0-20220728013737-449f7e6dab63 h1:xi3R/hhkqp7iLvlj1bNsOj+3dDRLvpDJ4Iszq+9iPX8=
knative.dev/pkg v0.0.0-20220725182823-ed7ab1d18a8b/go.mod h1:KBzRmnxrSjsJ17ktIYzfdbCs0HrqmY0MYpAOM2b8XNE= knative.dev/pkg v0.0.0-20220728013737-449f7e6dab63/go.mod h1:KBzRmnxrSjsJ17ktIYzfdbCs0HrqmY0MYpAOM2b8XNE=
knative.dev/reconciler-test v0.0.0-20220705155206-f05db88effbe/go.mod h1:ujEp+LOo2TJUM/RXBqlirvyesuLAJg3rr3iuCOBINGQ= knative.dev/reconciler-test v0.0.0-20220705155206-f05db88effbe/go.mod h1:ujEp+LOo2TJUM/RXBqlirvyesuLAJg3rr3iuCOBINGQ=
knative.dev/reconciler-test v0.0.0-20220722111920-0cfde63b455a/go.mod h1:Awq+u0SA8Cr6JAqef7JxGH1AQk73bllmugV83a60r+E= knative.dev/reconciler-test v0.0.0-20220722111920-0cfde63b455a/go.mod h1:Awq+u0SA8Cr6JAqef7JxGH1AQk73bllmugV83a60r+E=
knative.dev/serving v0.33.1-0.20220725225524-63523f9d0e97 h1:6Y1QezV+YiaH3qgprvLzl03mw78dNXCX0rEpP3Y6zFA= knative.dev/serving v0.33.1-0.20220728203237-8fc6d878ebd6 h1:1gRBB68wfo4k00zAxWbiasWZvAgxDa0lE/eFrJIFJR0=
knative.dev/serving v0.33.1-0.20220725225524-63523f9d0e97/go.mod h1:rtzEWdTuUMD8ZnAv5daZ2q896ogb9KTMdu+m7JgTNlQ= knative.dev/serving v0.33.1-0.20220728203237-8fc6d878ebd6/go.mod h1:rtzEWdTuUMD8ZnAv5daZ2q896ogb9KTMdu+m7JgTNlQ=
mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48=
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=

View File

@ -191,6 +191,27 @@ func validateMinMaxScale(config *autoscalerconfig.Config, m map[string]string) *
errs = errs.Also(validateMaxScaleWithinLimit(k, max, config.MaxScaleLimit)) errs = errs.Also(validateMaxScaleWithinLimit(k, max, config.MaxScaleLimit))
} }
// if ActivationScale is also set, validate that min <= nz min <= max
if k, v, ok := ActivationScale.Get(m); ok {
if nzMin, err := strconv.ParseInt(v, 10, 32); err != nil {
errs = errs.Also(apis.ErrInvalidValue(v, k))
} else if min > int32(nzMin) {
errs = errs.Also(&apis.FieldError{
Message: fmt.Sprintf("min-scale=%d is greater than activation-scale=%d", min, nzMin),
Paths: []string{k},
})
} else if max < int32(nzMin) && max != 0 {
errs = errs.Also(&apis.FieldError{
Message: fmt.Sprintf("max-scale=%d is less than activation-scale=%d", max, nzMin),
Paths: []string{k},
})
} else if nzMin < 2 {
errs = errs.Also(&apis.FieldError{
Message: fmt.Sprintf("activation-scale=%d must be greater than 1", nzMin),
Paths: []string{k},
})
}
}
return errs return errs
} }

View File

@ -216,6 +216,13 @@ const (
// PanicThresholdPercentageMax is the counterpart to the PanicThresholdPercentageMin // PanicThresholdPercentageMax is the counterpart to the PanicThresholdPercentageMin
// but bounding from above. // but bounding from above.
PanicThresholdPercentageMax = 1000.0 PanicThresholdPercentageMax = 1000.0
// ActivationScale is the minimum, non-zero value that a service should scale to.
// For example, if ActivationScale = 2, when a service scaled from zero it would
// scale up two replicas in this case. In essence, this allows one to set both a
// min-scale value while also preserving the ability to scale to zero.
// ActivationScale must be >= 2.
ActivationScaleKey = GroupName + "/activation-scale"
) )
var ( var (
@ -226,6 +233,7 @@ var (
InitialScaleAnnotationKey, InitialScaleAnnotationKey,
GroupName + "/initialScale", GroupName + "/initialScale",
} }
MaxScaleAnnotation = kmap.KeyPriority{ MaxScaleAnnotation = kmap.KeyPriority{
MaxScaleAnnotationKey, MaxScaleAnnotationKey,
GroupName + "/maxScale", GroupName + "/maxScale",
@ -237,6 +245,9 @@ var (
MetricAggregationAlgorithmKey, MetricAggregationAlgorithmKey,
GroupName + "/metricAggregationAlgorithm", GroupName + "/metricAggregationAlgorithm",
} }
ActivationScale = kmap.KeyPriority{
ActivationScaleKey,
}
MinScaleAnnotation = kmap.KeyPriority{ MinScaleAnnotation = kmap.KeyPriority{
MinScaleAnnotationKey, MinScaleAnnotationKey,
GroupName + "/minScale", GroupName + "/minScale",

View File

@ -102,6 +102,12 @@ func (pa *PodAutoscaler) ScaleBounds(asConfig *autoscalerconfig.Config) (int32,
return min, max return min, max
} }
// ActivationScale returns the min-non-zero-replicas annotation value or falise
// if not present or invalid.
func (pa *PodAutoscaler) ActivationScale() (int32, bool) {
return pa.annotationInt32(autoscaling.ActivationScale)
}
// Target returns the target annotation value or false if not present, or invalid. // Target returns the target annotation value or false if not present, or invalid.
func (pa *PodAutoscaler) Target() (float64, bool) { func (pa *PodAutoscaler) Target() (float64, bool) {
return pa.annotationFloat64(autoscaling.TargetAnnotation) return pa.annotationFloat64(autoscaling.TargetAnnotation)

10
vendor/modules.txt vendored
View File

@ -900,7 +900,7 @@ k8s.io/utils/lru
k8s.io/utils/net k8s.io/utils/net
k8s.io/utils/pointer k8s.io/utils/pointer
k8s.io/utils/trace k8s.io/utils/trace
# knative.dev/eventing v0.33.1-0.20220722122720-c8435ed74ba8 # knative.dev/eventing v0.33.1-0.20220728144837-15dd7ca8c811
## explicit; go 1.17 ## explicit; go 1.17
knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/config
knative.dev/eventing/pkg/apis/duck knative.dev/eventing/pkg/apis/duck
@ -928,10 +928,10 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1
knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake
knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2 knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2
knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake
# knative.dev/hack v0.0.0-20220725145124-782bbaabb8a1 # knative.dev/hack v0.0.0-20220728013938-9dabf7cf62e3
## explicit; go 1.17 ## explicit; go 1.17
knative.dev/hack knative.dev/hack
# knative.dev/networking v0.0.0-20220723000421-cddb0ff95789 # knative.dev/networking v0.0.0-20220728142238-19a4157a1fcf
## explicit; go 1.17 ## explicit; go 1.17
knative.dev/networking/pkg knative.dev/networking/pkg
knative.dev/networking/pkg/apis/networking knative.dev/networking/pkg/apis/networking
@ -946,7 +946,7 @@ knative.dev/networking/pkg/http/probe
knative.dev/networking/pkg/http/proxy knative.dev/networking/pkg/http/proxy
knative.dev/networking/pkg/http/stats knative.dev/networking/pkg/http/stats
knative.dev/networking/pkg/k8s knative.dev/networking/pkg/k8s
# knative.dev/pkg v0.0.0-20220725182823-ed7ab1d18a8b # knative.dev/pkg v0.0.0-20220728013737-449f7e6dab63
## explicit; go 1.18 ## explicit; go 1.18
knative.dev/pkg/apis knative.dev/pkg/apis
knative.dev/pkg/apis/duck knative.dev/pkg/apis/duck
@ -996,7 +996,7 @@ knative.dev/pkg/tracing/config
knative.dev/pkg/tracing/propagation knative.dev/pkg/tracing/propagation
knative.dev/pkg/tracing/propagation/tracecontextb3 knative.dev/pkg/tracing/propagation/tracecontextb3
knative.dev/pkg/tracker knative.dev/pkg/tracker
# knative.dev/serving v0.33.1-0.20220725225524-63523f9d0e97 # knative.dev/serving v0.33.1-0.20220728203237-8fc6d878ebd6
## explicit; go 1.17 ## explicit; go 1.17
knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling
knative.dev/serving/pkg/apis/autoscaling/v1alpha1 knative.dev/serving/pkg/apis/autoscaling/v1alpha1