Skip to content

Commit

Permalink
upgrade to latest dependencies
Browse files Browse the repository at this point in the history 
bumping knative.dev/caching ad3e6ed...3035eff:
  > 3035eff Update community files (# 775)
  > 5ea1589 upgrade to latest dependencies (# 774)
bumping knative.dev/hack ab12e24...044c02b:
  > 044c02b Update community files (# 309)
  > 3403e35 Update e2e-kind.sh (# 308)
bumping knative.dev/serving f9d9b28...ece2fea:
  > ece2fea upgrade to latest dependencies (# 14256)
  > 5c1c855 Support to use vegeta client with HTTPS (# 14255)
bumping knative.dev/eventing ea81855...8e9ab2a:
  > 8e9ab2a [main] Update community files (# 7171)
  > 742c45e Create new trigger rekt helper functions (# 7135)
  > 1b1b690 Test ApiServerSource with Broker as sink (# 7151)
bumping knative.dev/networking f25e82a...1632591:
  > 1632591 correct readme link (# 840)
  > 04f25c2 Update community files (# 838)
  > 29c1660 upgrade to latest dependencies (# 837)
bumping knative.dev/pkg 26b41ba...6519aff:
  > 6519aff Update community files (# 2794)

Signed-off-by: Knative Automation <[email protected]>
  • Loading branch information
@knative-automation
knative-automation committed Aug 15, 2023
1 parent 298826e commit 0350354
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 31 deletions.
12 changes: 6 additions & 6 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ require (
k8s.io/client-go v0.26.5
k8s.io/code-generator v0.26.5
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2
knative.dev/caching v0.0.0-20230809013737-ad3e6ede3635
knative.dev/eventing v0.38.1-0.20230811074339-ea81855c95d6
knative.dev/hack v0.0.0-20230809013436-ab12e24b8c13
knative.dev/pkg v0.0.0-20230814093643-26b41ba523a0
knative.dev/serving v0.38.1-0.20230810132939-f9d9b2847896
knative.dev/caching v0.0.0-20230815013041-3035effa3587
knative.dev/eventing v0.38.1-0.20230815012542-8e9ab2a7366a
knative.dev/hack v0.0.0-20230815012940-044c02b7a447
knative.dev/pkg v0.0.0-20230815012542-6519affc772b
knative.dev/serving v0.38.1-0.20230814151344-ece2fead5a7f
sigs.k8s.io/yaml v1.3.0
)

Expand Down Expand Up @@ -139,7 +139,7 @@ require (
k8s.io/gengo v0.0.0-20221011193443-fad74ee6edd9 // indirect
k8s.io/klog/v2 v2.80.2-0.20221028030830-9ae4992afb54 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
knative.dev/networking v0.0.0-20230807014815-f25e82aa2005 // indirect
knative.dev/networking v0.0.0-20230810114838-1632591af357 // indirect
sigs.k8s.io/controller-runtime v0.7.2 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
Expand Down
24 changes: 12 additions & 12 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1393,18 +1393,18 @@ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJOIfnislxYlqTj8=
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/caching v0.0.0-20230809013737-ad3e6ede3635 h1:NtS1hm+CGqfcJqMc0Jcanim+MBpYLwgOZUYeMp20VfU=
knative.dev/caching v0.0.0-20230809013737-ad3e6ede3635/go.mod h1:iBp7iDRbeMflKjr93RETGkbKB5vQJcM/QmPzkAM1D9M=
knative.dev/eventing v0.38.1-0.20230811074339-ea81855c95d6 h1:k3KRxD8CKu2RkaLq4JhCh0LGiT7TAo12WFEkG0lsOY8=
knative.dev/eventing v0.38.1-0.20230811074339-ea81855c95d6/go.mod h1:ehQuqItPXZ2GcIU5jalCgZhsc3pxsO3NLVIiJNdS8uM=
knative.dev/hack v0.0.0-20230809013436-ab12e24b8c13 h1:RdXhtR06YIABp9kL8t89R/bPY8Cbde8+F5QELpxxw1s=
knative.dev/hack v0.0.0-20230809013436-ab12e24b8c13/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/networking v0.0.0-20230807014815-f25e82aa2005 h1:LyXnt3TI8wdh7+2T6GKOxFW8TmjtPfzOUkwf5Ujze40=
knative.dev/networking v0.0.0-20230807014815-f25e82aa2005/go.mod h1:wDDrwfgGSnn2NDcR169IUPBi96FzY9iSBS4Q05hOTX0=
knative.dev/pkg v0.0.0-20230814093643-26b41ba523a0 h1:fqLbNL2/g016cnF3IQRjFr2aLmhcAnHiA1CANoBesOA=
knative.dev/pkg v0.0.0-20230814093643-26b41ba523a0/go.mod h1:D9D8LkOtlJBC09i+6nbTdZ5LAKsAbTJkkGGXEh2BPYI=
knative.dev/serving v0.38.1-0.20230810132939-f9d9b2847896 h1:zcOm0AoecQaX8v/OTCdbHIg5tZGjlGmMGYm4KmdcUAQ=
knative.dev/serving v0.38.1-0.20230810132939-f9d9b2847896/go.mod h1:Nxn2Eus8JXH+OW1f6hXvFNIVn6PV0DACMSR08DZmU1c=
knative.dev/caching v0.0.0-20230815013041-3035effa3587 h1:08LYMzsLOEx92qycYKFNzbjYjfFaReLjK0DNxp/12SY=
knative.dev/caching v0.0.0-20230815013041-3035effa3587/go.mod h1:HzP1IyZr8dYT3AW4T5gjh8f30v5htd3Z5PLI7cyEMrY=
knative.dev/eventing v0.38.1-0.20230815012542-8e9ab2a7366a h1:KZMQ9CfGgHPnvsRstp91y0DROTru9dmHY0Y1wTpjBHY=
knative.dev/eventing v0.38.1-0.20230815012542-8e9ab2a7366a/go.mod h1:ehQuqItPXZ2GcIU5jalCgZhsc3pxsO3NLVIiJNdS8uM=
knative.dev/hack v0.0.0-20230815012940-044c02b7a447 h1:Lr4O/WEyZHuUBFbqATYdQlfLXvhPUCluF4zlgRi59T4=
knative.dev/hack v0.0.0-20230815012940-044c02b7a447/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/networking v0.0.0-20230810114838-1632591af357 h1:aCQQSyZh2ueCfdORrV7WkI2Hn5XWqBw+DYses04MjM0=
knative.dev/networking v0.0.0-20230810114838-1632591af357/go.mod h1:Wyj56qmaLfd1uo8xRdZiKgu/wQQu4k5zdPdat6rtDLM=
knative.dev/pkg v0.0.0-20230815012542-6519affc772b h1:Gr7PGAgYAMvihhoF7fskqRLmqX/Mt+/su2t81KFpgRc=
knative.dev/pkg v0.0.0-20230815012542-6519affc772b/go.mod h1:D9D8LkOtlJBC09i+6nbTdZ5LAKsAbTJkkGGXEh2BPYI=
knative.dev/serving v0.38.1-0.20230814151344-ece2fead5a7f h1:E1DXEHZdUf6CVSQwMrZ84Wkv8xZPKfRHsNbKajn7ifw=
knative.dev/serving v0.38.1-0.20230814151344-ece2fead5a7f/go.mod h1:XNvj91QrfYWMMLSVo42q6P4X6XtNeOUKIEM5dwMjgGA=
nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
pgregory.net/rapid v1.0.0 h1:iQaM2w5PZ6xvt6x7hbd7tiDS+nk7YPp5uCaEba+T/F4=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
Expand Down
27 changes: 20 additions & 7 deletions vendor/knative.dev/serving/test/e2e/autoscale.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,15 @@ func (ctx *TestContext) SetNames(names *test.ResourceNames) {
ctx.names = names
}

func getVegetaTarget(kubeClientset kubernetes.Interface, domain, endpointOverride string, resolvable bool, paramName string, paramValue int) (vegeta.Target, error) {
func getVegetaTarget(kubeClientset kubernetes.Interface, domain, endpointOverride string, resolvable bool, paramName string, paramValue int, https bool) (vegeta.Target, error) {
scheme := "http"
if https {
scheme = "https"
}
if resolvable {
return vegeta.Target{
Method: http.MethodGet,
URL: fmt.Sprintf("http://%s?%s=%d", domain, paramName, paramValue),
URL: fmt.Sprintf("%s://%s?%s=%d", scheme, domain, paramName, paramValue),
}, nil
}

Expand All @@ -117,7 +121,7 @@ func getVegetaTarget(kubeClientset kubernetes.Interface, domain, endpointOverrid

return vegeta.Target{
Method: http.MethodGet,
URL: fmt.Sprintf("http://%s:%s?%s=%d", endpoint, mapper("80"), paramName, paramValue),
URL: fmt.Sprintf("%s://%s:%s?%s=%d", scheme, endpoint, mapper("80"), paramName, paramValue),
Header: http.Header{"Host": []string{domain}},
}, nil
}
Expand Down Expand Up @@ -165,12 +169,17 @@ func generateTraffic(

func generateTrafficAtFixedConcurrency(ctx *TestContext, concurrency int, stopChan chan struct{}) error {
pacer := vegeta.ConstantPacer{} // Sends requests as quickly as possible, capped by MaxWorkers below.
tlsConf := vegeta.DefaultTLSConfig
if test.ServingFlags.HTTPS {
tlsConf = test.TLSClientConfig(context.Background(), ctx.t.Logf, ctx.clients)
}
attacker := vegeta.NewAttacker(
vegeta.Timeout(0), // No timeout is enforced at all.
vegeta.Workers(uint64(concurrency)),
vegeta.MaxWorkers(uint64(concurrency)))
vegeta.MaxWorkers(uint64(concurrency)),
vegeta.TLSConfig(tlsConf))
target, err := getVegetaTarget(
ctx.clients.KubeClient, ctx.resources.Route.Status.URL.URL().Hostname(), pkgTest.Flags.IngressEndpoint, test.ServingFlags.ResolvableDomain, "sleep", autoscaleSleep)
ctx.clients.KubeClient, ctx.resources.Route.Status.URL.URL().Hostname(), pkgTest.Flags.IngressEndpoint, test.ServingFlags.ResolvableDomain, "sleep", autoscaleSleep, test.ServingFlags.HTTPS)
if err != nil {
return fmt.Errorf("error creating vegeta target: %w", err)
}
Expand All @@ -181,9 +190,13 @@ func generateTrafficAtFixedConcurrency(ctx *TestContext, concurrency int, stopCh

func generateTrafficAtFixedRPS(ctx *TestContext, rps int, stopChan chan struct{}) error {
pacer := vegeta.ConstantPacer{Freq: rps, Per: time.Second}
attacker := vegeta.NewAttacker(vegeta.Timeout(0)) // No timeout is enforced at all.
tlsConf := vegeta.DefaultTLSConfig
if test.ServingFlags.HTTPS {
tlsConf = test.TLSClientConfig(context.Background(), ctx.t.Logf, ctx.clients)
}
attacker := vegeta.NewAttacker(vegeta.Timeout(0), vegeta.TLSConfig(tlsConf)) // No timeout is enforced at all.
target, err := getVegetaTarget(
ctx.clients.KubeClient, ctx.resources.Route.Status.URL.URL().Hostname(), pkgTest.Flags.IngressEndpoint, test.ServingFlags.ResolvableDomain, "sleep", autoscaleSleep)
ctx.clients.KubeClient, ctx.resources.Route.Status.URL.URL().Hostname(), pkgTest.Flags.IngressEndpoint, test.ServingFlags.ResolvableDomain, "sleep", autoscaleSleep, test.ServingFlags.HTTPS)
if err != nil {
return fmt.Errorf("error creating vegeta target: %w", err)
}
Expand Down
12 changes: 6 additions & 6 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1254,11 +1254,11 @@ k8s.io/utils/net
k8s.io/utils/pointer
k8s.io/utils/strings/slices
k8s.io/utils/trace
# knative.dev/caching v0.0.0-20230809013737-ad3e6ede3635
# knative.dev/caching v0.0.0-20230815013041-3035effa3587
## explicit; go 1.18
knative.dev/caching/pkg/apis/caching
knative.dev/caching/pkg/apis/caching/v1alpha1
# knative.dev/eventing v0.38.1-0.20230811074339-ea81855c95d6
# knative.dev/eventing v0.38.1-0.20230815012542-8e9ab2a7366a
## explicit; go 1.19
knative.dev/eventing/pkg/apis/config
knative.dev/eventing/pkg/apis/duck
Expand Down Expand Up @@ -1347,11 +1347,11 @@ 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-20230809013436-ab12e24b8c13
# knative.dev/hack v0.0.0-20230815012940-044c02b7a447
## explicit; go 1.18
knative.dev/hack
knative.dev/hack/shell
# knative.dev/networking v0.0.0-20230807014815-f25e82aa2005
# knative.dev/networking v0.0.0-20230810114838-1632591af357
## explicit; go 1.18
knative.dev/networking/pkg
knative.dev/networking/pkg/apis/networking
Expand All @@ -1366,7 +1366,7 @@ knative.dev/networking/pkg/http/probe
knative.dev/networking/pkg/http/proxy
knative.dev/networking/pkg/http/stats
knative.dev/networking/pkg/k8s
# knative.dev/pkg v0.0.0-20230814093643-26b41ba523a0
# knative.dev/pkg v0.0.0-20230815012542-6519affc772b
## explicit; go 1.18
knative.dev/pkg/apiextensions/storageversion
knative.dev/pkg/apiextensions/storageversion/cmd/migrate
Expand Down Expand Up @@ -1446,7 +1446,7 @@ knative.dev/pkg/webhook
knative.dev/pkg/webhook/certificates
knative.dev/pkg/webhook/certificates/resources
knative.dev/pkg/webhook/resourcesemantics/conversion
# knative.dev/serving v0.38.1-0.20230810132939-f9d9b2847896
# knative.dev/serving v0.38.1-0.20230814151344-ece2fead5a7f
## explicit; go 1.18
knative.dev/serving/pkg/apis/autoscaling
knative.dev/serving/pkg/apis/autoscaling/v1alpha1
Expand Down

0 comments on commit 0350354

Please sign in to comment.