Skip to content

Commit

Permalink
[RELEASE] Pin serving to 0.15.
Browse files Browse the repository at this point in the history
  • Loading branch information
markusthoemmes committed May 26, 2020
1 parent dc16e1e commit f77c3fc
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 20 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require (
k8s.io/apimachinery v0.17.4
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
knative.dev/pkg v0.0.0-20200519155757-14eb3ae3a5a7
knative.dev/serving v0.14.1-0.20200521151457-24ed5a5c7ca2
knative.dev/serving v0.15.0
knative.dev/test-infra v0.0.0-20200519161858-554a95a37986
)

Expand Down
11 changes: 3 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1366,26 +1366,21 @@ k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl
k8s.io/utils v0.0.0-20200124190032-861946025e34 h1:HjlUD6M0K3P8nRXmr2B9o4F9dUy9TCj/aEpReeyi6+k=
k8s.io/utils v0.0.0-20200124190032-861946025e34/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
knative.dev/caching v0.0.0-20190719140829-2032732871ff/go.mod h1:dHXFU6CGlLlbzaWc32g80cR92iuBSpsslDNBWI8C7eg=
knative.dev/caching v0.0.0-20200519161457-43a93f35737e/go.mod h1:MX8oysHHDn6GTy+WWIgR80p78RIHV5p14xsXvrqvkbw=
knative.dev/caching v0.0.0-20200521155757-e78d17bc250e/go.mod h1:bsKPIG2XZFYL8uw5BAxg7EMBLp0vNpu9jZIGus8HUPU=
knative.dev/eventing-contrib v0.6.1-0.20190723221543-5ce18048c08b/go.mod h1:SnXZgSGgMSMLNFTwTnpaOH7hXDzTFtw0J8OmHflNx3g=
knative.dev/pkg v0.0.0-20191101194912-56c2594e4f11/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
knative.dev/pkg v0.0.0-20191111150521-6d806b998379/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
knative.dev/pkg v0.0.0-20200428194351-90fc61bae7f7/go.mod h1:o+e8OVEJKIuvXPsGVPIautjXgs05xbos7G+QMRjuUps=
knative.dev/pkg v0.0.0-20200505191044-3da93ebb24c2/go.mod h1:Q6sL35DdGs8hIQZKdaCXJGgY8f90BmNBKSb8z6d/BTM=
knative.dev/pkg v0.0.0-20200514052058-c75d324f8b8b/go.mod h1:tMOHGbxtRz8zYFGEGpV/bpoTEM1o89MwYFC4YJXl3GY=
knative.dev/pkg v0.0.0-20200515002500-16d7b963416f h1:kcpAMvYUqftHMA69wZ7g83zEW4y8cdnqfdJsSPOlrJQ=
knative.dev/pkg v0.0.0-20200515002500-16d7b963416f/go.mod h1:tMOHGbxtRz8zYFGEGpV/bpoTEM1o89MwYFC4YJXl3GY=
knative.dev/pkg v0.0.0-20200518174206-60f4ae1dbe6f h1:f2eK5+z0/l2S431UCezMG9W4FzktuNbD0OB1gezSoMs=
knative.dev/pkg v0.0.0-20200518174206-60f4ae1dbe6f/go.mod h1:GinFtW8LEi9rzCkzCMHAIlAnZjP1RzauxwhRAI3rimI=
knative.dev/pkg v0.0.0-20200519155757-14eb3ae3a5a7 h1:9S2r59HZJF9nKvoRLg5zJzx6XpVlVyvVRqz/C/h6h2s=
knative.dev/pkg v0.0.0-20200519155757-14eb3ae3a5a7/go.mod h1:QgNZTxnwpB/oSpNcfnLVlw+WpEwwyKAvJlvR3hgeltA=
knative.dev/serving v0.14.1-0.20200521151457-24ed5a5c7ca2 h1:CrgEcGrUpOiXHX7cClzvQGyyYmwfaNvJW6H13Iue9Q4=
knative.dev/serving v0.14.1-0.20200521151457-24ed5a5c7ca2/go.mod h1:jGOPiYDiIwQQJ8XqMe70iFdCf3kfJ4NTD8jUBBWw4xo=
knative.dev/serving v0.15.0 h1:sOzAJ5VGg8458wHsCT3bG5KqtpBVgOY7g2Vt/rHwf2A=
knative.dev/serving v0.15.0/go.mod h1:cc+LozTiaDvg3802drxoRta8qovnJbxxbtw5l5mqV3o=
knative.dev/test-infra v0.0.0-20200407185800-1b88cb3b45a5/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ=
knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55/go.mod h1:WqF1Azka+FxPZ20keR2zCNtiQA1MP9ZB4BH4HuI+SIU=
knative.dev/test-infra v0.0.0-20200513011557-d03429a76034/go.mod h1:aMif0KXL4g19YCYwsy4Ocjjz5xgPlseYV+B95Oo4JGE=
knative.dev/test-infra v0.0.0-20200514223200-ef4fd3ad398f h1:2j9xK15xMRz5h+yXIHt19iBAhWoEzRlZjSNurXzp4Nc=
knative.dev/test-infra v0.0.0-20200514223200-ef4fd3ad398f/go.mod h1:+uml4upluwrnWHRSezi4WVcKJ0OJHynF16Ot7fu0ky4=
knative.dev/test-infra v0.0.0-20200519015156-82551620b0a9 h1:kKfV3QWsxugwXsqgjFd72MjZeAHJ381dWqAxH2KMknc=
knative.dev/test-infra v0.0.0-20200519015156-82551620b0a9/go.mod h1:A5b2OAXTOeHT3hHhVQm3dmtbuWvIDP7qzgtqxA3/2pE=
knative.dev/test-infra v0.0.0-20200519161858-554a95a37986 h1:ZDy43jkWPQ75d4l4DGy+ENQIXlNcnHIh4tB6XxgovNc=
Expand Down
6 changes: 3 additions & 3 deletions hack/update-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ cd ${ROOT_DIR}
export GO111MODULE=on

# This controls the release branch we track.
VERSION="master"
VERSION="release-0.15"

# The list of dependencies that we track at HEAD and periodically
# float forward in this repository.
FLOATING_DEPS=(
"knative.dev/test-infra@release-0.15"
"knative.dev/pkg@release-0.15"
"knative.dev/test-infra@${VERSION}"
"knative.dev/pkg@${VERSION}"
"knative.dev/serving@${VERSION}"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,16 @@ func getIntGE0(m map[string]string, k string) (int64, *apis.FieldError) {
return 0, nil
}
i, err := strconv.ParseInt(v, 10, 32)
if err != nil || i < 0 {
return 0, apis.ErrOutOfBoundsValue(v, 1, math.MaxInt32, k)
if err == nil && i < 0 {
return 0, apis.ErrOutOfBoundsValue(v, 0, math.MaxInt32, k)
}
if err != nil {
if nerr, ok := err.(*strconv.NumError); ok && nerr.Err == strconv.ErrRange {
return 0, apis.ErrOutOfBoundsValue(v, 0, math.MaxInt32, k)
}
return 0, apis.ErrInvalidValue(v, k)
}

return i, nil
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ type RevisionStatus struct {
// may be empty if the image comes from a registry listed to skip resolution.
// If multiple containers specified then DeprecatedImageDigest holds the digest
// for serving container.
// DEPRECATED Use ContainerStatuses instead.
// DEPRECATED: Use ContainerStatuses instead.
// TODO(savitaashture) Remove deprecatedImageDigest.
// ref https://kubernetes.io/docs/reference/using-api/deprecation-policy for deprecation.
// +optional
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ type RevisionStatus struct {
// may be empty if the image comes from a registry listed to skip resolution.
// If multiple containers specified then DeprecatedImageDigest holds the digest
// for serving container.
// DEPRECATED Use ImageDigests instead.
// DEPRECATED: Use ContainerStatuses instead.
// TODO(savitaashture) Remove deprecatedImageDigest.
// ref https://kubernetes.io/docs/reference/using-api/deprecation-policy for deprecation.
// +optional
Expand Down
7 changes: 5 additions & 2 deletions vendor/knative.dev/serving/pkg/autoscaler/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,12 @@ func validate(lc *Config) (*Config, error) {
}

// We can't permit stable window be less than our aggregation window for correctness.
if lc.StableWindow < autoscaling.WindowMin {
return nil, fmt.Errorf("stable-window = %v, must be at least %v", lc.StableWindow, autoscaling.WindowMin)
// Or too big, so that our desisions are too imprecise.
if lc.StableWindow < autoscaling.WindowMin || lc.StableWindow > autoscaling.WindowMax {
return nil, fmt.Errorf("stable-window = %v, must be in [%v; %v] range", lc.StableWindow,
autoscaling.WindowMin, autoscaling.WindowMax)
}

if lc.StableWindow.Round(time.Second) != lc.StableWindow {
return nil, fmt.Errorf("stable-window = %v, must be specified with at most second precision", lc.StableWindow)
}
Expand Down
8 changes: 7 additions & 1 deletion vendor/knative.dev/serving/test/e2e-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,17 @@ add_trap "kubectl -n ${SYSTEM_NAMESPACE} patch configmap/config-autoscaler --typ
# Run conformance and e2e tests.

go_test_e2e -timeout=30m \
$(go list ./test/conformance/... | grep -v certificate) \
$(go list ./test/conformance/... | grep -v 'certificate\|ingress' ) \
./test/e2e ./test/e2e/hpa \
${parallelism} \
"--resolvabledomain=$(use_resolvable_domain)" "${use_https}" "$(ingress_class)" || failed=1

# We run KIngress conformance ingress separately, to make it easier to skip some tests.
go_test_e2e -timeout=20m ./test/conformance/ingress ${parallelism} \
`# Skip TestUpdate due to excessive flaking https://github.com/knative/serving/issues/8032` \
-run="Test[^U]" \
"--resolvabledomain=$(use_resolvable_domain)" "${use_https}" "$(ingress_class)" || failed=1

if (( HTTPS )); then
kubectl delete -f ${TMP_DIR}/test/config/autotls/certmanager/caissuer/ --ignore-not-found
turn_off_auto_tls
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ knative.dev/pkg/webhook/certificates/resources
knative.dev/pkg/webhook/configmaps
knative.dev/pkg/webhook/resourcesemantics
knative.dev/pkg/webhook/resourcesemantics/defaulting
# knative.dev/serving v0.14.1-0.20200521151457-24ed5a5c7ca2
# knative.dev/serving v0.15.0
knative.dev/serving/pkg/apis/autoscaling
knative.dev/serving/pkg/apis/autoscaling/v1alpha1
knative.dev/serving/pkg/apis/config
Expand Down

0 comments on commit f77c3fc

Please sign in to comment.