Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[main] Upgrade to latest dependencies #14151

Merged
merged 1 commit into from
Jul 7, 2023
Merged

[main] Upgrade to latest dependencies #14151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ require (
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2
knative.dev/caching v0.0.0-20230707011843-0ba05f9fb292
knative.dev/hack v0.0.0-20230628110129-fc42790854e8
knative.dev/hack v0.0.0-20230707105034-cc92cdb68f01
knative.dev/networking v0.0.0-20230707011444-1431d70eb39d
knative.dev/pkg v0.0.0-20230628105954-6eb4b40a9a30
sigs.k8s.io/yaml v1.3.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,8 +995,8 @@ k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJ
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/caching v0.0.0-20230707011843-0ba05f9fb292 h1:duA7S9I+hIR/3SJJo0Zo7IdNSJH1Mmaex/g7MXPiArk=
knative.dev/caching v0.0.0-20230707011843-0ba05f9fb292/go.mod h1:/Dqof7ajw9jn3cxpsCZ7itMLNvBu8yZW0iVmMNoQG/c=
knative.dev/hack v0.0.0-20230628110129-fc42790854e8 h1:l7CnU4IiRB0TTQAWqOSXg9MnB2bxWjx4o/Vw6Yb27eM=
knative.dev/hack v0.0.0-20230628110129-fc42790854e8/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/hack v0.0.0-20230707105034-cc92cdb68f01 h1:ShbmvGzvZ8yTDL+9ANDj2RJmxP9e9VG5ssP719GjgLg=
knative.dev/hack v0.0.0-20230707105034-cc92cdb68f01/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/networking v0.0.0-20230707011444-1431d70eb39d h1:Ia/S12OUB/AmWaiEPJ4fdTO/dAlUXm6JvUTWmNwzhHE=
knative.dev/networking v0.0.0-20230707011444-1431d70eb39d/go.mod h1:cSrqxaHRb/SSNd19YS3tJq6YHoQIqlRpWv4v9OXmhDg=
knative.dev/pkg v0.0.0-20230628105954-6eb4b40a9a30 h1:UUjxZMKgK907IfFY3b7xj9sY53c+feiYvzUwPtajN8I=
Expand Down
6 changes: 3 additions & 3 deletions vendor/knative.dev/hack/library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@

# Simple header for logging purposes.
function header() {
local upper="$(echo $1 | tr a-z A-Z)"

Check warning on line 166 in vendor/knative.dev/hack/library.sh

View workflow job for this annotation

GitHub Actions / style / suggester / shell 

[shellcheck] reported by reviewdog 🐶


Raw Output:
vendor/knative.dev/hack/library.sh:166:-  local upper="$(echo $1 | tr a-z A-Z)"
vendor/knative.dev/hack/library.sh:166:+  local upper="$(echo "$1" | tr a-z A-Z)"
make_banner "=" "${upper}"
}

Expand All @@ -179,7 +179,7 @@

# Checks whether the given function exists.
function function_exists() {
[[ "$(type -t $1)" == "function" ]]

Check warning on line 182 in vendor/knative.dev/hack/library.sh

View workflow job for this annotation

GitHub Actions / style / suggester / shell 

[shellcheck] reported by reviewdog 🐶


Raw Output:
vendor/knative.dev/hack/library.sh:182:-  [[ "$(type -t $1)" == "function" ]]
vendor/knative.dev/hack/library.sh:182:+  [[ "$(type -t "$1")" == "function" ]]
}

# GitHub Actions aware output grouping.
Expand Down Expand Up @@ -227,7 +227,7 @@
fi
echo -n "Waiting until ${DESCRIPTION} does not exist"
for i in {1..150}; do # timeout after 5 minutes
if ! kubectl ${KUBECTL_ARGS} > /dev/null 2>&1; then

Check warning on line 230 in vendor/knative.dev/hack/library.sh

View workflow job for this annotation

GitHub Actions / style / suggester / shell 

[shellcheck] reported by reviewdog 🐶


Raw Output:
vendor/knative.dev/hack/library.sh:230:-    if ! kubectl ${KUBECTL_ARGS} > /dev/null 2>&1; then
vendor/knative.dev/hack/library.sh:230:+    if ! kubectl "${KUBECTL_ARGS}" > /dev/null 2>&1; then
echo -e "\n${DESCRIPTION} does not exist"
return 0
fi
Expand All @@ -235,7 +235,7 @@
sleep 2
done
echo -e "\n\nERROR: timeout waiting for ${DESCRIPTION} not to exist"
kubectl ${KUBECTL_ARGS}

Check warning on line 238 in vendor/knative.dev/hack/library.sh

View workflow job for this annotation

GitHub Actions / style / suggester / shell 

[shellcheck] reported by reviewdog 🐶


Raw Output:
vendor/knative.dev/hack/library.sh:238:-  kubectl ${KUBECTL_ARGS}
vendor/knative.dev/hack/library.sh:238:+  kubectl "${KUBECTL_ARGS}"
return 1
}

Expand All @@ -253,7 +253,7 @@
fi
echo -n "Waiting until ${DESCRIPTION} exists"
for i in {1..150}; do # timeout after 5 minutes
if kubectl ${KUBECTL_ARGS} > /dev/null 2>&1; then

Check warning on line 256 in vendor/knative.dev/hack/library.sh

View workflow job for this annotation

GitHub Actions / style / suggester / shell 

[shellcheck] reported by reviewdog 🐶


Raw Output:
vendor/knative.dev/hack/library.sh:256:-    if kubectl ${KUBECTL_ARGS} > /dev/null 2>&1; then
vendor/knative.dev/hack/library.sh:256:+    if kubectl "${KUBECTL_ARGS}" > /dev/null 2>&1; then
echo -e "\n${DESCRIPTION} exists"
return 0
fi
Expand All @@ -261,7 +261,7 @@
sleep 2
done
echo -e "\n\nERROR: timeout waiting for ${DESCRIPTION} to exist"
kubectl ${KUBECTL_ARGS}

Check warning on line 264 in vendor/knative.dev/hack/library.sh

View workflow job for this annotation

GitHub Actions / style / suggester / shell 

[shellcheck] reported by reviewdog 🐶


Raw Output:
vendor/knative.dev/hack/library.sh:264:-  kubectl ${KUBECTL_ARGS}
vendor/knative.dev/hack/library.sh:264:+  kubectl "${KUBECTL_ARGS}"
return 1
}

Expand All @@ -276,14 +276,14 @@
for i in {1..150}; do # timeout after 5 minutes
# List all pods. Ignore Terminating pods as those have either been replaced through
# a deployment or terminated on purpose (through chaosduck for example).
local pods="$(kubectl get pods --no-headers -n $1 | grep -v Terminating)"

Check warning on line 279 in vendor/knative.dev/hack/library.sh

View workflow job for this annotation

GitHub Actions / style / suggester / shell 

[shellcheck] reported by reviewdog 🐶


Raw Output:
vendor/knative.dev/hack/library.sh:279:-    local pods="$(kubectl get pods --no-headers -n $1 | grep -v Terminating)"
vendor/knative.dev/hack/library.sh:279:+    local pods="$(kubectl get pods --no-headers -n "$1" | grep -v Terminating)"
# All pods must be running (ignore ImagePull error to allow the pod to retry)
local not_running_pods=$(echo "${pods}" | grep -v Running | grep -v Completed | grep -v ErrImagePull | grep -v ImagePullBackOff)
if [[ -n "${pods}" ]] && [[ -z "${not_running_pods}" ]]; then
# All Pods are running or completed. Verify the containers on each Pod.
local all_ready=1
while read pod ; do
local status=(`echo -n ${pod} | cut -f2 -d' ' | tr '/' ' '`)

Check warning on line 286 in vendor/knative.dev/hack/library.sh

View workflow job for this annotation

GitHub Actions / style / suggester / shell 

[shellcheck] reported by reviewdog 🐶


Raw Output:
vendor/knative.dev/hack/library.sh:286:-        local status=(`echo -n ${pod} | cut -f2 -d' ' | tr '/' ' '`)
vendor/knative.dev/hack/library.sh:286:+        local status=($(echo -n "${pod}" | cut -f2 -d' ' | tr '/' ' '))
# Set this Pod as the failed_pod. If nothing is wrong with it, then after the checks, set
# failed_pod to the empty string.
failed_pod=$(echo -n "${pod}" | cut -f1 -d' ')
Expand All @@ -310,9 +310,9 @@
echo -e "\n\nERROR: timeout waiting for pods to come up\n${pods}"
if [[ -n "${failed_pod}" ]]; then
echo -e "\n\nFailed Pod (data in YAML format) - ${failed_pod}\n"
kubectl -n $1 get pods "${failed_pod}" -oyaml

Check warning on line 313 in vendor/knative.dev/hack/library.sh

View workflow job for this annotation

GitHub Actions / style / suggester / shell 

[shellcheck] reported by reviewdog 🐶


Raw Output:
vendor/knative.dev/hack/library.sh:313:-    kubectl -n $1 get pods "${failed_pod}" -oyaml
vendor/knative.dev/hack/library.sh:313:+    kubectl -n "$1" get pods "${failed_pod}" -oyaml
echo -e "\n\nPod Logs\n"
kubectl -n $1 logs "${failed_pod}" --all-containers

Check warning on line 315 in vendor/knative.dev/hack/library.sh

View workflow job for this annotation

GitHub Actions / style / suggester / shell 

[shellcheck] reported by reviewdog 🐶


Raw Output:
vendor/knative.dev/hack/library.sh:315:-    kubectl -n $1 logs "${failed_pod}" --all-containers
vendor/knative.dev/hack/library.sh:315:+    kubectl -n "$1" logs "${failed_pod}" --all-containers
fi
return 1
}
Expand Down Expand Up @@ -657,7 +657,7 @@
echo "Command '${cmd}' failed in module $gomod_dir: $failed" >&2
return $failed
fi
done < <(go_run knative.dev/test-infra/tools/modscope@latest ls -p)
done < <(go_run knative.dev/toolbox/modscope@latest ls -p)
}

# Update go deps.
Expand Down Expand Up @@ -709,7 +709,7 @@
else
group "Upgrading to release ${RELEASE}"
fi
FLOATING_DEPS+=( $(go_run knative.dev/test-infra/buoy@latest float ./go.mod "${buoyArgs[@]}") )
FLOATING_DEPS+=( $(go_run knative.dev/toolbox/buoy@latest float ./go.mod "${buoyArgs[@]}") )
if [[ ${#FLOATING_DEPS[@]} > 0 ]]; then
echo "Floating deps to ${FLOATING_DEPS[@]}"
go get -d ${FLOATING_DEPS[@]}
Expand Down Expand Up @@ -754,7 +754,7 @@
# Intended to be used like:
# export MODULE_NAME=$(go_mod_module_name)
function go_mod_module_name() {
go_run knative.dev/test-infra/tools/modscope@latest current
go_run knative.dev/toolbox/modscope@latest current
}

# Return a GOPATH to a temp directory. Works around the out-of-GOPATH issues
Expand Down
2 changes: 1 addition & 1 deletion vendor/knative.dev/hack/presubmit-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ function __build_test_runner_for_module() {
# Don't merge these two lines, or return code will always be 0.
# Get all build tags in go code (ignore /vendor, /hack and /third_party)
local tags
tags="$(go run knative.dev/test-infra/tools/go-ls-tags@latest --joiner=,)"
tags="$(go run knative.dev/toolbox/go-ls-tags@latest --joiner=,)"
local go_pkg_dirs
go_pkg_dirs="$(go list -tags "${tags}" ./...)" || return $?
if [[ -z "${go_pkg_dirs}" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1270,7 +1270,7 @@ knative.dev/caching/pkg/client/injection/informers/caching/v1alpha1/image/fake
knative.dev/caching/pkg/client/injection/informers/factory
knative.dev/caching/pkg/client/injection/informers/factory/fake
knative.dev/caching/pkg/client/listers/caching/v1alpha1
# knative.dev/hack v0.0.0-20230628110129-fc42790854e8
# knative.dev/hack v0.0.0-20230707105034-cc92cdb68f01
## explicit; go 1.18
knative.dev/hack
knative.dev/hack/shell
Expand Down
Loading