Skip to content

Commit

Permalink
upgrade to latest dependencies
Browse files Browse the repository at this point in the history
bumping knative.dev/eventing 65da6fc...3345c86:
  > 3345c86 Clean up remove session token (# 8369)
  > 6e7e3d4 Adding sns sink to Integration Sink (# 8365)
  > d4357e3 MT-Broker: return retriable status code based on the state to leverage retries (# 8366)
  > 795e4a3 Move image to map (# 8362)
  > 408db83 We changed the event type on the images (# 8364)
  > f577063 Align label generation and apply on container-source as well (# 8355)
  > cb31cb2 Add integrationsinks-addressable-resolver cluster role (# 8356)
  > 545c14c Change JobSink execution mode variable to `K_EXECUTION_MODE` (# 8350)
  > 91f1c79 Avoid using twice hardcoded strings for the names of the Kube Secret keys, for AWS access/secret key vals (# 8345)
  > cb29ac1 [main] Update community files (# 8354)
  > aef3a14 [main] Format Go code (# 8349)
bumping knative.dev/eventing-kafka-broker 6235e66...177b61a:
  > 177b61a Use and test KafkaSource v1 API (# 4138)
  > 6a1923b Update community files (# 4176)
bumping knative.dev/hack b799531...1978b3a:
  > 1978b3a Update community files (# 404)
bumping knative.dev/reconciler-test 0619dc3...984ae12:
  > 984ae12 Update community files (# 774)
  > 2f0e67f upgrade to latest dependencies (# 772)
bumping knative.dev/eventing-redis d080f7f...0283569:
  > 0283569 Update community files (# 635)
  > 5d457d3 upgrade to latest dependencies (# 634)
bumping knative.dev/pkg a7fd9b1...f3ab560:
  > f3ab560 Update community files (# 3118)

Signed-off-by: Knative Automation <automation@knative.team>
  • Loading branch information
knative-automation committed Dec 4, 2024
1 parent 3d25761 commit abf1278
Show file tree
Hide file tree
Showing 15 changed files with 96 additions and 46 deletions.
12 changes: 6 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ require (
k8s.io/apimachinery v0.30.3
k8s.io/client-go v0.30.3
k8s.io/code-generator v0.30.3
knative.dev/eventing v0.43.1-0.20241126125511-65da6fc77cd4
knative.dev/eventing-kafka-broker v0.43.1-0.20241118121547-6235e66f4872
knative.dev/eventing-redis v0.43.1-0.20241120035400-d080f7f91bc7
knative.dev/hack v0.0.0-20241106013728-b7995315deb5
knative.dev/pkg v0.0.0-20241118074447-a7fd9b10bb9f
knative.dev/reconciler-test v0.0.0-20241106013737-0619dc3ecbcf
knative.dev/eventing v0.43.1-0.20241203174144-3345c8609def
knative.dev/eventing-kafka-broker v0.43.1-0.20241202215144-177b61a9a6a6
knative.dev/eventing-redis v0.43.1-0.20241128014709-0283569fb317
knative.dev/hack v0.0.0-20241128013751-1978b3a02667
knative.dev/pkg v0.0.0-20241128013618-f3ab5605e542
knative.dev/reconciler-test v0.0.0-20241128013747-984ae1257c23
sigs.k8s.io/controller-runtime v0.13.1
)

Expand Down
24 changes: 12 additions & 12 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -774,18 +774,18 @@ k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 h1:1Wof1cGQgA5pqgo8MxKPtf
k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8/go.mod h1:Os6V6dZwLNii3vxFpxcNaTmH8LJJBkOTg1N0tOA0fvA=
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/eventing v0.43.1-0.20241126125511-65da6fc77cd4 h1:0jgqiStGgfXkFeTFKXM02tw7cxJSOypE0Q1xhInTucc=
knative.dev/eventing v0.43.1-0.20241126125511-65da6fc77cd4/go.mod h1:RxMFtxk903ZoxyS140MPdLLePTzBdeaGkVmBTB52t04=
knative.dev/eventing-kafka-broker v0.43.1-0.20241118121547-6235e66f4872 h1:dy88MMUfUlaGuhWq1cWTxN18Q9FqwuIW0Y1tu/8vnqI=
knative.dev/eventing-kafka-broker v0.43.1-0.20241118121547-6235e66f4872/go.mod h1:il6oiyiI5MSIg3MJ5ITnvDdogitWe1Wda9yz5W5iYMM=
knative.dev/eventing-redis v0.43.1-0.20241120035400-d080f7f91bc7 h1:JILX2gzqLE7b5IDgvwVtzJe8BrZn4lnDhhFuVBKZFEw=
knative.dev/eventing-redis v0.43.1-0.20241120035400-d080f7f91bc7/go.mod h1:l0i32OVjEGVbPEq3CYPMCmGcMj3n9T29O6KWKthvja4=
knative.dev/hack v0.0.0-20241106013728-b7995315deb5 h1:CfU5+6B+ylBd7mSGpvRqpzZV8H5ZQLGUwVygFzbE+1o=
knative.dev/hack v0.0.0-20241106013728-b7995315deb5/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
knative.dev/pkg v0.0.0-20241118074447-a7fd9b10bb9f h1:ggyD8WGF4LbTWfCiLo++EC/Q7rvYY4UI6CzuDt9dXkE=
knative.dev/pkg v0.0.0-20241118074447-a7fd9b10bb9f/go.mod h1:C2dxK66GlycMOS0SKqv0SMAnWkxsYbG4hkH32Xg1qD0=
knative.dev/reconciler-test v0.0.0-20241106013737-0619dc3ecbcf h1:FMgW5irj5xRPSRmtVICeLNHnZsnn7t8IFO0Fj3Kf+jo=
knative.dev/reconciler-test v0.0.0-20241106013737-0619dc3ecbcf/go.mod h1:W9Kmdoxelg2mswUpDKerL/4Ih1/ouVhlSMeZeJ5LX9c=
knative.dev/eventing v0.43.1-0.20241203174144-3345c8609def h1:PvB6R/O/vG8Tv6yw+A+u94YDnQV6nA1xaN7y0b1G7/s=
knative.dev/eventing v0.43.1-0.20241203174144-3345c8609def/go.mod h1:RxMFtxk903ZoxyS140MPdLLePTzBdeaGkVmBTB52t04=
knative.dev/eventing-kafka-broker v0.43.1-0.20241202215144-177b61a9a6a6 h1:0Vg+NVA77Q1ni3yZmbeXaKQH9CrkPyGYsn73lOsoujI=
knative.dev/eventing-kafka-broker v0.43.1-0.20241202215144-177b61a9a6a6/go.mod h1:il6oiyiI5MSIg3MJ5ITnvDdogitWe1Wda9yz5W5iYMM=
knative.dev/eventing-redis v0.43.1-0.20241128014709-0283569fb317 h1:ZhDpadU6mQHvaP5q7M5yI7Piqhpsvb/SamyplZ7rjjs=
knative.dev/eventing-redis v0.43.1-0.20241128014709-0283569fb317/go.mod h1:qcvkHSbW8fAKoVL5CHj/MNG3scQu85B7TUe8CR0cZ/8=
knative.dev/hack v0.0.0-20241128013751-1978b3a02667 h1:cp3GfEBnL0H2OrqdxLZ7nZ2K7U4PMdQhdBogl4Vd5+E=
knative.dev/hack v0.0.0-20241128013751-1978b3a02667/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
knative.dev/pkg v0.0.0-20241128013618-f3ab5605e542 h1:x5cEwa34aOgQDnSTEE+UtRk5lND0cvb8KbVBUShwNuI=
knative.dev/pkg v0.0.0-20241128013618-f3ab5605e542/go.mod h1:C2dxK66GlycMOS0SKqv0SMAnWkxsYbG4hkH32Xg1qD0=
knative.dev/reconciler-test v0.0.0-20241128013747-984ae1257c23 h1:uImxV6MAs6JEahOHfemXSq7fgWNQ5ZW1BtFPDlanEc4=
knative.dev/reconciler-test v0.0.0-20241128013747-984ae1257c23/go.mod h1:zDapuiJIFS67XEVBJWdEnVN5KHE8EvFGooLQGXeDH/c=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ package v1alpha1
import (
"context"

sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
"knative.dev/pkg/apis"

sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"

bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
bindings "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"

eventingv1alpha1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/eventing/v1alpha1"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ import (
"context"
"fmt"

"knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
"knative.dev/pkg/apis"

sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
)

func (c *Consumer) Validate(ctx context.Context) *apis.FieldError {
Expand Down Expand Up @@ -72,14 +73,14 @@ func (cc *ConsumerConfigs) Validate(ctx context.Context) *apis.FieldError {

if cc.KeyType != nil {
found := false
for _, allowed := range v1beta1.KafkaKeyTypeAllowed {
for _, allowed := range sources.KafkaKeyTypeAllowed {
if allowed == *cc.KeyType {
found = true
break
}
}
if !found {
return apis.ErrInvalidValue(*cc.KeyType, "keyType", fmt.Sprintf("allowed values: %v", v1beta1.KafkaKeyTypeAllowed))
return apis.ErrInvalidValue(*cc.KeyType, "keyType", fmt.Sprintf("allowed values: %v", sources.KafkaKeyTypeAllowed))
}
}

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
bindingsv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1"
eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1"
"knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"
"knative.dev/pkg/kmeta"
"knative.dev/pkg/webhook/resourcesemantics"

bindingsv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1beta1"
)

// +genclient
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ import (
"knative.dev/reconciler-test/pkg/k8s"
"knative.dev/reconciler-test/pkg/manifest"

sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
sources "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1"
kafkaclientset "knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/client"
)

//go:embed *.yaml
var yaml embed.FS

func GVR() schema.GroupVersionResource {
return schema.GroupVersionResource{Group: "sources.knative.dev", Version: "v1beta1", Resource: "kafkasources"}
return schema.GroupVersionResource{Group: sources.SchemeGroupVersion.Group, Version: sources.SchemeGroupVersion.Version, Resource: "kafkasources"}
}

// Install will create a KafkaSource resource, using the latest version, augmented with the config fn options.
Expand All @@ -66,7 +66,7 @@ func VerifyScale(name string, replicas int32) feature.StepFn {
last := &sources.KafkaSource{}
err := wait.PollImmediate(interval, timeout, func() (done bool, err error) {
ks, err := kafkaclientset.Get(ctx).
SourcesV1beta1().
SourcesV1().
KafkaSources(environment.FromContext(ctx).Namespace()).
Get(ctx, name, metav1.GetOptions{})
if err != nil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,19 @@ limitations under the License.

package v1alpha1

const (

// AwsAccessKey is the name of the expected key on the secret for accessing the actual AWS access key value.
AwsAccessKey = "aws.accessKey"
// AwsSecretKey is the name of the expected key on the secret for accessing the actual AWS secret key value.
AwsSecretKey = "aws.secretKey"
)

type AWSCommon struct {
// Auth is the S3 authentication (accessKey/secretKey) configuration.
Region string `json:"region,omitempty"` // AWS region
ProfileCredentialsName string `json:"profileCredentialsName,omitempty"` // Profile name for profile credentials provider
SessionToken string `json:"sessionToken,omitempty"` // Session token
URIEndpointOverride string `json:"uriEndpointOverride,omitempty"` // Override endpoint URI
OverrideEndpoint bool `json:"overrideEndpoint" default:"false"` // Override endpoint flag
Region string `json:"region,omitempty"` // AWS region
URIEndpointOverride string `json:"uriEndpointOverride,omitempty"` // Override endpoint URI
OverrideEndpoint bool `json:"overrideEndpoint" default:"false"` // Override endpoint flag
}

type AWSS3 struct {
Expand Down Expand Up @@ -62,3 +68,9 @@ type AWSDDBStreams struct {
StreamIteratorType string `json:"streamIteratorType,omitempty" default:"FROM_LATEST"` // Defines where in the DynamoDB stream to start getting records
Delay int `json:"delay,omitempty" default:"500"` // Delay in milliseconds before the next poll from the database
}

type AWSSNS struct {
AWSCommon `json:",inline"` // Embeds AWSCommon to inherit its fields in JSON
Arn string `json:"arn,omitempty" camel:"CAMEL_KAMELET_AWS_SNS_SINK_TOPICNAMEORARN"` // SNS ARN
AutoCreateTopic bool `json:"autoCreateTopic" default:"false"` // Auto-create SNS topic
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ type Log struct {
type Aws struct {
S3 *v1alpha1.AWSS3 `json:"s3,omitempty"` // S3 source configuration
SQS *v1alpha1.AWSSQS `json:"sqs,omitempty"` // SQS source configuration
SNS *v1alpha1.AWSSNS `json:"sns,omitempty"` // SNS source configuration
Auth *v1alpha1.Auth `json:"auth,omitempty"`
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ func (spec *IntegrationSinkSpec) Validate(ctx context.Context) *apis.FieldError
if spec.Aws.SQS != nil {
sinkSetCount++
}
if spec.Aws.SNS != nil {
sinkSetCount++
}
}

// Validate that only one sink field is set
Expand All @@ -53,7 +56,7 @@ func (spec *IntegrationSinkSpec) Validate(ctx context.Context) *apis.FieldError

// Only perform AWS-specific validation if exactly one AWS sink is configured
if sinkSetCount == 1 && spec.Aws != nil {
if spec.Aws.S3 != nil || spec.Aws.SQS != nil {
if spec.Aws.S3 != nil || spec.Aws.SQS != nil || spec.Aws.SNS != nil {
// Check that AWS Auth is properly configured
if !spec.Aws.Auth.HasAuth() {
errs = errs.Also(apis.ErrMissingField("aws.auth.secret.ref.name"))
Expand All @@ -79,6 +82,15 @@ func (spec *IntegrationSinkSpec) Validate(ctx context.Context) *apis.FieldError
errs = errs.Also(apis.ErrMissingField("aws.sqs.region"))
}
}
// Additional validation for AWS SNS required fields
if spec.Aws.SNS != nil {
if spec.Aws.SNS.Arn == "" {
errs = errs.Also(apis.ErrMissingField("aws.sns.arn"))
}
if spec.Aws.SNS.Region == "" {
errs = errs.Also(apis.ErrMissingField("aws.sns.region"))
}
}
}

return errs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
)

const (
ExecutionModeEnvVar = "KNATIVE_EXECUTION_MODE"
ExecutionModeEnvVar = "K_EXECUTION_MODE"
)

type ExecutionMode string
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@ k8s.io/utils/pointer
k8s.io/utils/ptr
k8s.io/utils/strings/slices
k8s.io/utils/trace
# knative.dev/eventing v0.43.1-0.20241126125511-65da6fc77cd4
# knative.dev/eventing v0.43.1-0.20241203174144-3345c8609def
## explicit; go 1.22.7
knative.dev/eventing/pkg/apis/common/integration/v1alpha1
knative.dev/eventing/pkg/apis/config
Expand Down Expand Up @@ -999,7 +999,7 @@ knative.dev/eventing/pkg/client/listers/sources/v1alpha1
knative.dev/eventing/pkg/client/listers/sources/v1beta2
knative.dev/eventing/pkg/crossnamespace
knative.dev/eventing/pkg/eventingtls
# knative.dev/eventing-kafka-broker v0.43.1-0.20241118121547-6235e66f4872
# knative.dev/eventing-kafka-broker v0.43.1-0.20241202215144-177b61a9a6a6
## explicit; go 1.22.0
knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings
knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1
Expand All @@ -1024,14 +1024,14 @@ knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/t
knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/sources/v1beta1
knative.dev/eventing-kafka-broker/control-plane/pkg/client/injection/client
knative.dev/eventing-kafka-broker/test/rekt/resources/kafkasource
# knative.dev/eventing-redis v0.43.1-0.20241120035400-d080f7f91bc7
# knative.dev/eventing-redis v0.43.1-0.20241128014709-0283569fb317
## explicit; go 1.22.7
knative.dev/eventing-redis/pkg/source/apis/sources
knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1
# knative.dev/hack v0.0.0-20241106013728-b7995315deb5
# knative.dev/hack v0.0.0-20241128013751-1978b3a02667
## explicit; go 1.21
knative.dev/hack
# knative.dev/pkg v0.0.0-20241118074447-a7fd9b10bb9f
# knative.dev/pkg v0.0.0-20241128013618-f3ab5605e542
## explicit; go 1.22.7
knative.dev/pkg/apis
knative.dev/pkg/apis/duck
Expand Down Expand Up @@ -1102,8 +1102,8 @@ knative.dev/pkg/webhook/json
knative.dev/pkg/webhook/resourcesemantics
knative.dev/pkg/webhook/resourcesemantics/defaulting
knative.dev/pkg/webhook/resourcesemantics/validation
# knative.dev/reconciler-test v0.0.0-20241106013737-0619dc3ecbcf
## explicit; go 1.22.0
# knative.dev/reconciler-test v0.0.0-20241128013747-984ae1257c23
## explicit; go 1.22.7
knative.dev/reconciler-test/cmd/eventshub
knative.dev/reconciler-test/pkg/environment
knative.dev/reconciler-test/pkg/eventshub
Expand Down

0 comments on commit abf1278

Please sign in to comment.