Skip to content

Commit 59a3a1c

Browse files
upgrade to latest dependencies (knative-extensions#1088)
bumping knative.dev/hack 9b303d6...7331bb1: > 7331bb1 rename function (# 149) bumping knative.dev/eventing 55a9c62...f13248e: > f13248e Generate duck v1alpha1 DeepCopy functions (# 6120) Signed-off-by: Knative Automation <automation@knative.team>
1 parent 7c5cef2 commit 59a3a1c

File tree

5 files changed

+20
-21
lines changed

5 files changed

+20
-21
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ require (
3535
k8s.io/client-go v0.22.5
3636
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704
3737
knative.dev/control-protocol v0.0.0-20220201152531-79a0b1ad34b9
38-
knative.dev/eventing v0.29.1-0.20220209132441-55a9c62e79c6
39-
knative.dev/hack v0.0.0-20220203160821-9b303d690fc9
38+
knative.dev/eventing v0.29.1-0.20220209143041-f13248e5a7de
39+
knative.dev/hack v0.0.0-20220209225905-7331bb16ba00
4040
knative.dev/pkg v0.0.0-20220203020920-51be315ed160
4141
knative.dev/reconciler-test v0.0.0-20220202155955-6e47083645cf
4242
sigs.k8s.io/yaml v1.3.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,13 +1344,13 @@ k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 h1:ZKMMxTvduyf5WUtREOqg5LiXaN1KO
13441344
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
13451345
knative.dev/control-protocol v0.0.0-20220201152531-79a0b1ad34b9 h1:9+OLxKuRiP87qlsvqrVDCLke+zvL6ryf17bL0rNVJKk=
13461346
knative.dev/control-protocol v0.0.0-20220201152531-79a0b1ad34b9/go.mod h1:OGZyr8rJQoDs8pE9gQ47koLdhJ+Vb0QubzntQbrwjdY=
1347-
knative.dev/eventing v0.29.1-0.20220209132441-55a9c62e79c6 h1:r0K3cszI8XJ2grgwwNwRfJOpucdVMjaxo9HFKQ9W5aY=
1348-
knative.dev/eventing v0.29.1-0.20220209132441-55a9c62e79c6/go.mod h1:jsc5u3aC+BYmfUR2cRz9jb77krfULStxXkR1EgMUWp0=
1347+
knative.dev/eventing v0.29.1-0.20220209143041-f13248e5a7de h1:Z0TnYRmUl+aM+m7l7yP2OqOW6xa3e04XDqDU/4r/ksI=
1348+
knative.dev/eventing v0.29.1-0.20220209143041-f13248e5a7de/go.mod h1:jsc5u3aC+BYmfUR2cRz9jb77krfULStxXkR1EgMUWp0=
13491349
knative.dev/hack v0.0.0-20220118141833-9b2ed8471e30/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
13501350
knative.dev/hack v0.0.0-20220128200847-51a42b2eb63e/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
13511351
knative.dev/hack v0.0.0-20220201013531-82bfca153560/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
1352-
knative.dev/hack v0.0.0-20220203160821-9b303d690fc9 h1:5BoabmjdxeFOICdkJyMn1n8/ny3kNkVMH/2Iel7/mmI=
1353-
knative.dev/hack v0.0.0-20220203160821-9b303d690fc9/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
1352+
knative.dev/hack v0.0.0-20220209225905-7331bb16ba00 h1:MbdDq3JZoCoUzYbw/liB0Idklk/fE2bXiSQnIRhgeC4=
1353+
knative.dev/hack v0.0.0-20220209225905-7331bb16ba00/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
13541354
knative.dev/hack/schema v0.0.0-20220128200847-51a42b2eb63e/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0=
13551355
knative.dev/pkg v0.0.0-20220118160532-77555ea48cd4/go.mod h1:etVT7Tm8pSDf4RKhGk4r7j/hj3dNBpvT7bO6a6wpahs=
13561356
knative.dev/pkg v0.0.0-20220131144930-f4b57aef0006/go.mod h1:bZMFTPDPHV3wXuiQ09UJuEGYYQnfpe81MCxNvsMAiJk=

vendor/knative.dev/eventing/pkg/apis/duck/v1alpha1/placement_types.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@ import (
2424

2525
// +genduck
2626

27-
// Placeable is a list of podName and virtual replicas pairs.
28-
// Each pair represents the assignment of virtual replicas to a pod
29-
type Placeable struct {
30-
MaxAllowedVReplicas *int32 `json:"maxAllowedVReplicas,omitempty"`
31-
Placements []Placement `json:"placements,omitempty"`
32-
}
33-
3427
// PlaceableType is a skeleton type wrapping Placeable in the manner we expect
3528
// resource writers defining compatible resources to embed it. We will
3629
// typically use this type to deserialize Placeable ObjectReferences and
@@ -47,6 +40,13 @@ type PlaceableStatus struct {
4740
Placeable `json:",inline"`
4841
}
4942

43+
// Placeable is a list of podName and virtual replicas pairs.
44+
// Each pair represents the assignment of virtual replicas to a pod
45+
type Placeable struct {
46+
MaxAllowedVReplicas *int32 `json:"maxAllowedVReplicas,omitempty"`
47+
Placements []Placement `json:"placements,omitempty"`
48+
}
49+
5050
type Placement struct {
5151
// PodName is the name of the pod where the resource is placed
5252
PodName string `json:"podName,omitempty"`

vendor/knative.dev/hack/release.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ function git_push() {
122122
git push "${repo_url}" ${git_args} )
123123
}
124124

125-
# Return the master version of a release.
125+
# Return the major+minor version of a release.
126126
# For example, "v0.2.1" returns "0.2"
127127
# Parameters: $1 - release version label.
128-
function master_version() {
128+
function major_minor_version() {
129129
local release="${1//v/}"
130130
local tokens=(${release//\./ })
131131
echo "${tokens[0]}.${tokens[1]}"
@@ -141,8 +141,7 @@ function hash_from_tag() {
141141
# Setup the repository upstream, if not set.
142142
function setup_upstream() {
143143
# hub and checkout need the upstream URL to be set
144-
# TODO(adrcunha): Use "git remote get-url" once available on Prow.
145-
local upstream="$(git config --get remote.upstream.url)"
144+
local upstream="$(git remote get-url upstream)"
146145
echo "Remote upstream URL is '${upstream}'"
147146
if [[ -z "${upstream}" ]]; then
148147
echo "Setting remote upstream URL to '${REPO_UPSTREAM}'"
@@ -223,7 +222,7 @@ function prepare_dot_release() {
223222
if [[ -z "${RELEASE_BRANCH}" ]]; then
224223
echo "Last release is ${last_version}"
225224
# Determine branch
226-
major_minor_version="$(master_version "${last_version}")"
225+
major_minor_version="$(major_minor_version "${last_version}")"
227226
RELEASE_BRANCH="release-${major_minor_version}"
228227
echo "Last release branch is ${RELEASE_BRANCH}"
229228
else
@@ -428,7 +427,7 @@ function parse_flags() {
428427
# TODO(adrcunha): "dot" releases from release branches require releasing nightlies
429428
# for such branches, which we don't do yet.
430429
[[ "${RELEASE_VERSION}" =~ ^[0-9]+\.[0-9]+\.0$ ]] || abort "version format must be 'X.Y.0'"
431-
RELEASE_BRANCH="release-$(master_version "${RELEASE_VERSION}")"
430+
RELEASE_BRANCH="release-$(major_minor_version "${RELEASE_VERSION}")"
432431
prepare_from_nightly_release
433432
setup_upstream
434433
fi

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,7 +1203,7 @@ knative.dev/control-protocol/pkg/message
12031203
knative.dev/control-protocol/pkg/network
12041204
knative.dev/control-protocol/pkg/reconciler
12051205
knative.dev/control-protocol/pkg/service
1206-
# knative.dev/eventing v0.29.1-0.20220209132441-55a9c62e79c6
1206+
# knative.dev/eventing v0.29.1-0.20220209143041-f13248e5a7de
12071207
## explicit
12081208
knative.dev/eventing/pkg/adapter/v2
12091209
knative.dev/eventing/pkg/adapter/v2/test
@@ -1343,7 +1343,7 @@ knative.dev/eventing/test/upgrade/prober/wathola/fetcher
13431343
knative.dev/eventing/test/upgrade/prober/wathola/forwarder
13441344
knative.dev/eventing/test/upgrade/prober/wathola/receiver
13451345
knative.dev/eventing/test/upgrade/prober/wathola/sender
1346-
# knative.dev/hack v0.0.0-20220203160821-9b303d690fc9
1346+
# knative.dev/hack v0.0.0-20220209225905-7331bb16ba00
13471347
## explicit
13481348
knative.dev/hack
13491349
knative.dev/hack/shell

0 commit comments

Comments
 (0)