diff --git a/go.mod b/go.mod index 8ed9d2a097..879f54739b 100644 --- a/go.mod +++ b/go.mod @@ -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.15.1-0.20200526130349-ed4c276bbfae + knative.dev/serving v0.15.0 knative.dev/test-infra v0.0.0-20200519161858-554a95a37986 ) diff --git a/go.sum b/go.sum index d926663e9e..61693d3d13 100644 --- a/go.sum +++ b/go.sum @@ -1376,8 +1376,8 @@ knative.dev/pkg v0.0.0-20200515002500-16d7b963416f h1:kcpAMvYUqftHMA69wZ7g83zEW4 knative.dev/pkg v0.0.0-20200515002500-16d7b963416f/go.mod h1:tMOHGbxtRz8zYFGEGpV/bpoTEM1o89MwYFC4YJXl3GY= 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.15.1-0.20200526130349-ed4c276bbfae h1:u3GGH15oXY7bQsrA16MgQuyGSqmfu4zPu3uxejyK/ec= -knative.dev/serving v0.15.1-0.20200526130349-ed4c276bbfae/go.mod h1:cc+LozTiaDvg3802drxoRta8qovnJbxxbtw5l5mqV3o= +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= diff --git a/hack/update-deps.sh b/hack/update-deps.sh index a4c0d599d8..5ec91cd8b0 100755 --- a/hack/update-deps.sh +++ b/hack/update-deps.sh @@ -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}" ) diff --git a/vendor/knative.dev/serving/pkg/apis/serving/v1/configuration_types.go b/vendor/knative.dev/serving/pkg/apis/serving/v1/configuration_types.go index cad8cfdf9e..fbf1ae155c 100644 --- a/vendor/knative.dev/serving/pkg/apis/serving/v1/configuration_types.go +++ b/vendor/knative.dev/serving/pkg/apis/serving/v1/configuration_types.go @@ -24,7 +24,7 @@ import ( ) // +genclient -// +genreconciler:krshapedlogic=true +// +genreconciler // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Configuration represents the "floating HEAD" of a linear history of Revisions. diff --git a/vendor/modules.txt b/vendor/modules.txt index 894d51d9c5..c1b41cdebc 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -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.15.1-0.20200526130349-ed4c276bbfae +# 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