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

Commit

Permalink
upgrade to latest dependencies
Browse files Browse the repository at this point in the history 
bumping knative.dev/reconciler-test 4b73d83...1bc30a7:
  > 1bc30a7 Update community files (# 584)
  > 922b219 Call the quit when the eventshub is closed (# 591)
bumping knative.dev/eventing 44aa15e...3dfc2ea:
  > 3dfc2ea Not filter properly calls cleanup on it's nested filter (# 7310)
  > efdfba6 Trigger create and expose OIDC service account (# 7299)
  > 55092a0 All filter optimization (# 7300)
  > 88fe195 Improved suffix benchmark performance (# 7312)

Signed-off-by: Knative Automation <[email protected]>
  • Loading branch information
@knative-automation
knative-automation committed Sep 28, 2023
1 parent a1f89bb commit 52a001c
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 11 deletions.
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ 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.20230927090829-44aa15e9584b
knative.dev/eventing v0.38.1-0.20230928090444-3dfc2ea9565e
knative.dev/hack v0.0.0-20230926181829-f2f9b6f91263
knative.dev/pkg v0.0.0-20230927121431-6cf4b051de4f
knative.dev/reconciler-test v0.0.0-20230920080213-4b73d83f40fc
knative.dev/reconciler-test v0.0.0-20230928130937-1bc30a77ad78
sigs.k8s.io/yaml v1.3.0
)

Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -932,14 +932,14 @@ 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.20230927090829-44aa15e9584b h1:oMnFQRKFceimJjyPy6OS8B6lzJ9Zq7dpEksNbUG5mdY=
knative.dev/eventing v0.38.1-0.20230927090829-44aa15e9584b/go.mod h1:eNSh5XX8xmAce1hImlXWYuE1iYowNCYr557tH7fqZI8=
knative.dev/eventing v0.38.1-0.20230928090444-3dfc2ea9565e h1:IftRPY9Wmr2jpgaoQ/3w7/wqX27H8p77zX4A/vY2Rt4=
knative.dev/eventing v0.38.1-0.20230928090444-3dfc2ea9565e/go.mod h1:eNSh5XX8xmAce1hImlXWYuE1iYowNCYr557tH7fqZI8=
knative.dev/hack v0.0.0-20230926181829-f2f9b6f91263 h1:e6r9J1YopzSh6tDCpyKhVBfRUlZ2r0KRo9wupRjdRF4=
knative.dev/hack v0.0.0-20230926181829-f2f9b6f91263/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/pkg v0.0.0-20230927121431-6cf4b051de4f h1:+J5spRfGrMzQguNXkJlnyUK8yHoYtakUn6d1Z6Ulm/c=
knative.dev/pkg v0.0.0-20230927121431-6cf4b051de4f/go.mod h1:h2O9k9WkB10sVeYUHqywUJNN88y4jZMmu9nFwemwKAE=
knative.dev/reconciler-test v0.0.0-20230920080213-4b73d83f40fc h1:2pGUphOyniBD5nhJ/Xt6a72owZLZEpAfR3NXcTEGIu8=
knative.dev/reconciler-test v0.0.0-20230920080213-4b73d83f40fc/go.mod h1:i+/PWK/n3HPgjXMoj5U7CA6WRW/C3c3EfHCQ0FmrhNM=
knative.dev/reconciler-test v0.0.0-20230928130937-1bc30a77ad78 h1:1/VFdHjSG0J1WYu9/TzqIjR5a6igrP8pSDBnMdKQxZ8=
knative.dev/reconciler-test v0.0.0-20230928130937-1bc30a77ad78/go.mod h1:i+/PWK/n3HPgjXMoj5U7CA6WRW/C3c3EfHCQ0FmrhNM=
pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU=
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
20 changes: 19 additions & 1 deletion vendor/knative.dev/eventing/pkg/apis/eventing/v1/trigger_lifecycle.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
duckv1 "knative.dev/pkg/apis/duck/v1"
)

var triggerCondSet = apis.NewLivingConditionSet(TriggerConditionBroker, TriggerConditionSubscribed, TriggerConditionDependency, TriggerConditionSubscriberResolved, TriggerConditionDeadLetterSinkResolved)
var triggerCondSet = apis.NewLivingConditionSet(TriggerConditionBroker, TriggerConditionSubscribed, TriggerConditionDependency, TriggerConditionSubscriberResolved, TriggerConditionDeadLetterSinkResolved, TriggerConditionOIDCIdentityCreated)

const (
// TriggerConditionReady has status True when all subconditions below have been set to True.
Expand All @@ -39,6 +39,8 @@ const (

TriggerConditionDeadLetterSinkResolved apis.ConditionType = "DeadLetterSinkResolved"

TriggerConditionOIDCIdentityCreated apis.ConditionType = "OIDCIdentityCreated"

// TriggerAnyFilter Constant to represent that we should allow anything.
TriggerAnyFilter = ""
)
Expand Down Expand Up @@ -199,3 +201,19 @@ func (ts *TriggerStatus) PropagateDependencyStatus(ks *duckv1.Source) {
ts.MarkDependencyUnknown("DependencyUnknown", "The status of Dependency is invalid: %v", kc.Status)
}
}

func (ts *TriggerStatus) MarkOIDCIdentityCreatedSucceeded() {
triggerCondSet.Manage(ts).MarkTrue(TriggerConditionOIDCIdentityCreated)
}

func (ts *TriggerStatus) MarkOIDCIdentityCreatedSucceededWithReason(reason, messageFormat string, messageA ...interface{}) {
triggerCondSet.Manage(ts).MarkTrueWithReason(TriggerConditionOIDCIdentityCreated, reason, messageFormat, messageA...)
}

func (ts *TriggerStatus) MarkOIDCIdentityCreatedFailed(reason, messageFormat string, messageA ...interface{}) {
triggerCondSet.Manage(ts).MarkFalse(TriggerConditionOIDCIdentityCreated, reason, messageFormat, messageA...)
}

func (ts *TriggerStatus) MarkOIDCIdentityCreatedUnknown(reason, messageFormat string, messageA ...interface{}) {
triggerCondSet.Manage(ts).MarkUnknown(TriggerConditionOIDCIdentityCreated, reason, messageFormat, messageA...)
}
6 changes: 4 additions & 2 deletions vendor/knative.dev/reconciler-test/pkg/eventshub/eventshub.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"golang.org/x/sync/errgroup"
"knative.dev/pkg/injection"
"knative.dev/pkg/logging"
"knative.dev/pkg/signals"
)

type envConfig struct {
Expand All @@ -39,8 +40,9 @@ type EventGeneratorStarter func(context.Context, *EventLogs) error
// Start starts a new eventshub process, with the provided factories.
// You can create your own eventshub providing event log factories and event generator factories.
func Start(eventLogFactories map[string]EventLogFactory, eventGeneratorFactories map[string]EventGeneratorStarter) {
//nolint // nil ctx is fine here, look at the code of EnableInjectionOrDie
ctx, _ := injection.EnableInjectionOrDie(nil, nil)
ctx := signals.NewContext()
defer maybeQuitIstioProxy(ctx) // quit at exit
ctx, _ = injection.EnableInjectionOrDie(ctx, nil)
ctx = ConfigureLogging(ctx, "eventshub")

tracer, err := ConfigureTracing(logging.FromContext(ctx), "")
Expand Down
38 changes: 38 additions & 0 deletions vendor/knative.dev/reconciler-test/pkg/eventshub/istio_quit.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
Copyright 2023 The Knative Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package eventshub

import (
"context"
"errors"
"net/http"
"syscall"

"knative.dev/pkg/logging"
)

// maybeQuitIstioProxy shuts down Istio's proxy when available.
func maybeQuitIstioProxy(ctx context.Context) {
log := logging.FromContext(ctx)
req, _ := http.NewRequest(http.MethodPost, "http://localhost:15020/quitquitquit", nil)

_, err := http.DefaultClient.Do(req)

if err != nil && !errors.Is(err, syscall.ECONNREFUSED) {
log.Warn("Ignore this warning if Istio proxy is not used on this pod", err)
}
}
4 changes: 2 additions & 2 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1261,7 +1261,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.20230927090829-44aa15e9584b
# knative.dev/eventing v0.38.1-0.20230928090444-3dfc2ea9565e
## explicit; go 1.19
knative.dev/eventing/cmd/heartbeats
knative.dev/eventing/pkg/adapter/v2
Expand Down Expand Up @@ -1473,7 +1473,7 @@ knative.dev/pkg/webhook/resourcesemantics
knative.dev/pkg/webhook/resourcesemantics/conversion
knative.dev/pkg/webhook/resourcesemantics/defaulting
knative.dev/pkg/webhook/resourcesemantics/validation
# knative.dev/reconciler-test v0.0.0-20230920080213-4b73d83f40fc
# knative.dev/reconciler-test v0.0.0-20230928130937-1bc30a77ad78
## explicit; go 1.18
knative.dev/reconciler-test/cmd/eventshub
knative.dev/reconciler-test/pkg/environment
Expand Down

0 comments on commit 52a001c

Please sign in to comment.