Skip to content
This repository has been archived by the owner on Sep 2, 2024. It is now read-only.

[main] Upgrade to latest dependencies #1369

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ require (
k8s.io/apimachinery v0.26.5
k8s.io/client-go v0.26.5
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2
knative.dev/eventing v0.38.1-0.20230802151048-91e156cad220
knative.dev/hack v0.0.0-20230802014852-338500eed425
knative.dev/eventing v0.38.1-0.20230803151922-0fd9aa16ec1e
knative.dev/hack v0.0.0-20230803220206-d7fde305c59f
knative.dev/pkg v0.0.0-20230802191948-8d3f95106327
knative.dev/reconciler-test v0.0.0-20230803013451-a8041ba726ed
sigs.k8s.io/yaml v1.3.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -952,10 +952,10 @@ k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+O
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJOIfnislxYlqTj8=
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/eventing v0.38.1-0.20230802151048-91e156cad220 h1:BS3AikPOWzcKBJi9smvcEi4D0rEOBpf/iUnRD8uIUuY=
knative.dev/eventing v0.38.1-0.20230802151048-91e156cad220/go.mod h1:ct8t+v6nmp1kFCy6ngkDWIEvnjJDNDoKptrfnQVh+z8=
knative.dev/hack v0.0.0-20230802014852-338500eed425 h1:/4R6Jbsfq3O7PTlVA4XcePxS/UAOZZ/qE4AdozSjy2s=
knative.dev/hack v0.0.0-20230802014852-338500eed425/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/eventing v0.38.1-0.20230803151922-0fd9aa16ec1e h1:J5GLNWOfAYGEHfdw1rWjXE+fIE68vy3NBreOMFwNAPU=
knative.dev/eventing v0.38.1-0.20230803151922-0fd9aa16ec1e/go.mod h1:ct8t+v6nmp1kFCy6ngkDWIEvnjJDNDoKptrfnQVh+z8=
knative.dev/hack v0.0.0-20230803220206-d7fde305c59f h1:lV2VDTQhM6UNEQzWChSjCULG6m7JsvICx6ckQxzg60U=
knative.dev/hack v0.0.0-20230803220206-d7fde305c59f/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/pkg v0.0.0-20230802191948-8d3f95106327 h1:YvgaCUbXU7S9lJpm+Qh/z6LGiTSAWhyJLs5E/6dIx+8=
knative.dev/pkg v0.0.0-20230802191948-8d3f95106327/go.mod h1:iOH3bns9qjwY1/Ufq3/Vaqd+Lsk65b7yMFcWG3EriiI=
knative.dev/reconciler-test v0.0.0-20230803013451-a8041ba726ed h1:T4eslri3A1t0UAovX5np9shdaK2RpUD/53DAH7N1VHI=
Expand Down
12 changes: 9 additions & 3 deletions vendor/knative.dev/eventing/test/e2e-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ readonly CONFIG_TRACING_CONFIG="test/config/config-tracing.yaml"
readonly KNATIVE_EVENTING_MONITORING_YAML="test/config/monitoring.yaml"

# The number of controlplane replicas to run.
readonly REPLICAS=3
readonly REPLICAS=${REPLICAS:-3}

# Should deploy a Knative Monitoring as well
readonly DEPLOY_KNATIVE_MONITORING="${DEPLOY_KNATIVE_MONITORING:-1}"
Expand All @@ -76,15 +76,15 @@ UNINSTALL_LIST=()

# Setup the Knative environment for running tests.
function knative_setup() {
install_cert_manager || fail_test "Could not install Cert Manager"

install_knative_eventing "HEAD"

install_mt_broker || fail_test "Could not install MT Channel Based Broker"

enable_sugar || fail_test "Could not enable Sugar Controller Injection"

unleash_duck || fail_test "Could not unleash the chaos duck"

install_cert_manager || fail_test "Could not install Cert Manager"
}

function scale_controlplane() {
Expand Down Expand Up @@ -147,6 +147,12 @@ function install_knative_eventing() {
-f "${EVENTING_CORE_NAME}" || return 1
UNINSTALL_LIST+=( "${EVENTING_CORE_NAME}" )

local EVENTING_TLS_NAME=${TMP_DIR}/${EVENTING_TLS_YAML##*/}
sed "s/namespace: ${KNATIVE_DEFAULT_NAMESPACE}/namespace: ${SYSTEM_NAMESPACE}/g" ${EVENTING_TLS_YAML} > ${EVENTING_TLS_NAME}
kubectl apply \
-f "${EVENTING_TLS_NAME}" || return 1
UNINSTALL_LIST+=( "${EVENTING_TLS_NAME}" )

kubectl patch horizontalpodautoscalers.autoscaling -n ${SYSTEM_NAMESPACE} eventing-webhook -p '{"spec": {"minReplicas": '${REPLICAS}'}}' || return 1

else
Expand Down
6 changes: 6 additions & 0 deletions vendor/knative.dev/eventing/test/e2e-rekt-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,10 @@ echo "Running E2E Reconciler Tests"

go_test_e2e -timeout=1h ./test/rekt || fail_test

echo "Running E2E Reconciler Tests with strict transport encryption"

kubectl apply -Rf "$(dirname "$0")/config-transport-encryption"

go_test_e2e -timeout=1h ./test/rekt -run TLS || fail_test

success
3 changes: 1 addition & 2 deletions vendor/knative.dev/eventing/test/e2e-upgrade-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/e2e-common.sh"
# Overrides

function knative_setup {
# Nothing to do at setup
true
install_cert_manager || return $?
}

function install_test_resources {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/kelseyhightower/envconfig"
"github.com/pkg/errors"
duckv1 "knative.dev/pkg/apis/duck/v1"
"knative.dev/pkg/network"
pkgTest "knative.dev/pkg/test"
pkgupgrade "knative.dev/pkg/test/upgrade"

Expand All @@ -53,7 +54,7 @@ const (

prefix = "eventing_upgrade_tests"

forwarderTargetFmt = "http://" + receiver.Name + ".%s.svc.cluster.local"
forwarderTargetFmt = "http://" + receiver.Name + ".%s.svc.%s"

defaultTraceExportLimit = 100
)
Expand Down Expand Up @@ -192,7 +193,7 @@ func (p *prober) compileTemplate(templateName string, endpoint interface{}, trac
p.config,
endpoint,
tracingConfig,
fmt.Sprintf(forwarderTargetFmt, p.client.Namespace),
fmt.Sprintf(forwarderTargetFmt, p.client.Namespace, network.GetClusterDomainName()),
}
p.ensureNoError(tmpl.Execute(&buff, data))
return buff.String()
Expand Down
5 changes: 3 additions & 2 deletions vendor/knative.dev/eventing/test/upgrade/prober/verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/kubernetes"
"knative.dev/pkg/network"
"knative.dev/pkg/system"
pkgTest "knative.dev/pkg/test"
"knative.dev/pkg/test/helpers"
Expand Down Expand Up @@ -141,7 +142,7 @@ func (p *prober) getStepNoFromMsg(message string) (string, error) {
func (p *prober) getTraceForStepEvent(eventNo string) []byte {
p.log.Debugf("Fetching trace for Step event #%s", eventNo)
query := fmt.Sprintf("step=%s and cloudevents.type=%s and target=%s",
eventNo, event.StepType, fmt.Sprintf(forwarderTargetFmt, p.client.Namespace))
eventNo, event.StepType, fmt.Sprintf(forwarderTargetFmt, p.client.Namespace, network.GetClusterDomainName()))
trace, err := event.FindTrace(query)
if err != nil {
p.log.Warn(err)
Expand All @@ -158,7 +159,7 @@ func (p *prober) exportFinishedEventTrace() {
func (p *prober) getTraceForFinishedEvent() []byte {
p.log.Info("Fetching trace for Finished event")
query := fmt.Sprintf("cloudevents.type=%s and target=%s",
event.FinishedType, fmt.Sprintf(forwarderTargetFmt, p.client.Namespace))
event.FinishedType, fmt.Sprintf(forwarderTargetFmt, p.client.Namespace, network.GetClusterDomainName()))
trace, err := event.FindTrace(query)
if err != nil {
p.log.Warn(err)
Expand Down
2 changes: 1 addition & 1 deletion vendor/knative.dev/hack/library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ readonly REPO_ROOT_DIR
function __resolveRepoName() {
local repoName
repoName="$(basename "${1:-$(git rev-parse --show-toplevel)}")"
repoName="${repoName#knative-sandbox-}" # Remove knative-sandbox- prefix if any
repoName="${repoName#knative-extensions-}" # Remove knative-extensions- prefix if any
repoName="${repoName#knative-}" # Remove knative- prefix if any
echo "${repoName}"
}
Expand Down
4 changes: 2 additions & 2 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1245,7 +1245,7 @@ k8s.io/utils/net
k8s.io/utils/pointer
k8s.io/utils/strings/slices
k8s.io/utils/trace
# knative.dev/eventing v0.38.1-0.20230802151048-91e156cad220
# knative.dev/eventing v0.38.1-0.20230803151922-0fd9aa16ec1e
## explicit; go 1.19
knative.dev/eventing/cmd/heartbeats
knative.dev/eventing/pkg/adapter/v2
Expand Down Expand Up @@ -1355,7 +1355,7 @@ knative.dev/eventing/test/upgrade/prober/wathola/fetcher
knative.dev/eventing/test/upgrade/prober/wathola/forwarder
knative.dev/eventing/test/upgrade/prober/wathola/receiver
knative.dev/eventing/test/upgrade/prober/wathola/sender
# knative.dev/hack v0.0.0-20230802014852-338500eed425
# knative.dev/hack v0.0.0-20230803220206-d7fde305c59f
## explicit; go 1.18
knative.dev/hack
knative.dev/hack/shell
Expand Down
Loading