Skip to content

[main] Upgrade to latest dependencies #411

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

Merged
merged 1 commit into from
Oct 8, 2025
Merged

[main] Upgrade to latest dependencies #411

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 @@ -13,7 +13,7 @@ require (
k8s.io/apimachinery v0.33.5
k8s.io/client-go v0.33.5
knative.dev/client/pkg v0.0.0-20251007022612-79bd2e100065
knative.dev/eventing-kafka-broker v0.46.1-0.20251007150512-bd08c0cfffeb
knative.dev/eventing-kafka-broker v0.46.1-0.20251008072414-150a9bd7ba81
knative.dev/hack v0.0.0-20250902153942-1499de21e119
knative.dev/pkg v0.0.0-20251007184713-a624c759bede
)
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 @@ -751,8 +751,8 @@ knative.dev/client/pkg v0.0.0-20251007022612-79bd2e100065 h1:myUyFpRzAVaME1LKz47
knative.dev/client/pkg v0.0.0-20251007022612-79bd2e100065/go.mod h1:U6Kx0zEHzOCfS/khJeP2H1MYUX/OWPKGVrOITGeeS/E=
knative.dev/eventing v0.46.1-0.20251002211605-5828b491e837 h1:YPS9wXY/roM6DZBp75rLqKZ9hDcsgijlj/hjIESpQZw=
knative.dev/eventing v0.46.1-0.20251002211605-5828b491e837/go.mod h1:HRusNPXiJsv2USQLE9i0gPm/cnUZo0jVTlkVdBTcfC8=
knative.dev/eventing-kafka-broker v0.46.1-0.20251007150512-bd08c0cfffeb h1:WZsZXVHO3mKw5uAap1Ua7K4XTBfqwMtjK08p92qvM18=
knative.dev/eventing-kafka-broker v0.46.1-0.20251007150512-bd08c0cfffeb/go.mod h1:B/JHSrzVgnZ2wAmY+YXJXepUXC7KwHL2wfS++GLrWbw=
knative.dev/eventing-kafka-broker v0.46.1-0.20251008072414-150a9bd7ba81 h1:VbtuCiN4mrxSr7PwHleOUvmdRr04pqCnsA/iNwiul0g=
knative.dev/eventing-kafka-broker v0.46.1-0.20251008072414-150a9bd7ba81/go.mod h1:xRMZKfycxPVjb4/hhq9DDHTXxcXlYJ+fL921nT1ijnY=
knative.dev/hack v0.0.0-20250902153942-1499de21e119 h1:NbQvjnFK1tL489LN0qAybWy0E17Jpziwcv/XIHwfp6M=
knative.dev/hack v0.0.0-20250902153942-1499de21e119/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
knative.dev/networking v0.0.0-20250916015400-8cc248b445a0 h1:OG6rRbmXMDh369o/puixTc8dv9YihZr964S9rt6EURo=
Expand Down
78 changes: 58 additions & 20 deletions ...r/knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1/kafka_lifecycle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,22 +92,41 @@ func (kfb *KafkaBinding) Do(ctx context.Context, ps *duckv1.WithPod) {
spec.InitContainers[i].Env = append(spec.InitContainers[i].Env, corev1.EnvVar{
Name: "KAFKA_NET_SASL_ENABLE",
Value: "true",
}, corev1.EnvVar{
Name: "KAFKA_NET_SASL_USER",
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: kfb.Spec.Net.SASL.User.SecretKeyRef,
},
}, corev1.EnvVar{
Name: "KAFKA_NET_SASL_PASSWORD",
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: kfb.Spec.Net.SASL.Password.SecretKeyRef,
},
}, corev1.EnvVar{
Name: "KAFKA_NET_SASL_TYPE",
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: kfb.Spec.Net.SASL.Type.SecretKeyRef,
},
})
if kfb.Spec.Net.SASL.User.SecretKeyRef != nil {
spec.InitContainers[i].Env = append(spec.InitContainers[i].Env, corev1.EnvVar{
Name: "KAFKA_NET_SASL_USER",
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: kfb.Spec.Net.SASL.User.SecretKeyRef,
},
}, corev1.EnvVar{
Name: "KAFKA_NET_SASL_PASSWORD",
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: kfb.Spec.Net.SASL.Password.SecretKeyRef,
},
})
}
if kfb.Spec.Net.SASL.TokenProvider.SecretKeyRef != nil {
spec.Containers[i].Env = append(spec.Containers[i].Env, corev1.EnvVar{
Name: "KAFKA_NET_SASL_TOKEN_PROVIDER",
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: kfb.Spec.Net.SASL.TokenProvider.SecretKeyRef,
},
})
}
if kfb.Spec.Net.SASL.RoleARN.SecretKeyRef != nil {
spec.Containers[i].Env = append(spec.Containers[i].Env, corev1.EnvVar{
Name: "KAFKA_NET_SASL_ROLE_ARN",
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: kfb.Spec.Net.SASL.RoleARN.SecretKeyRef,
},
})
}
}
if kfb.Spec.Net.TLS.Enable {
spec.InitContainers[i].Env = append(spec.InitContainers[i].Env, corev1.EnvVar{
Expand Down Expand Up @@ -142,22 +161,41 @@ func (kfb *KafkaBinding) Do(ctx context.Context, ps *duckv1.WithPod) {
spec.Containers[i].Env = append(spec.Containers[i].Env, corev1.EnvVar{
Name: "KAFKA_NET_SASL_ENABLE",
Value: "true",
}, corev1.EnvVar{
Name: "KAFKA_NET_SASL_USER",
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: kfb.Spec.Net.SASL.User.SecretKeyRef,
},
}, corev1.EnvVar{
Name: "KAFKA_NET_SASL_PASSWORD",
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: kfb.Spec.Net.SASL.Password.SecretKeyRef,
},
}, corev1.EnvVar{
Name: "KAFKA_NET_SASL_TYPE",
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: kfb.Spec.Net.SASL.Type.SecretKeyRef,
},
})
if kfb.Spec.Net.SASL.User.SecretKeyRef != nil {
spec.Containers[i].Env = append(spec.Containers[i].Env, corev1.EnvVar{
Name: "KAFKA_NET_SASL_USER",
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: kfb.Spec.Net.SASL.User.SecretKeyRef,
},
}, corev1.EnvVar{
Name: "KAFKA_NET_SASL_PASSWORD",
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: kfb.Spec.Net.SASL.Password.SecretKeyRef,
},
})
}
if kfb.Spec.Net.SASL.TokenProvider.SecretKeyRef != nil {
spec.Containers[i].Env = append(spec.Containers[i].Env, corev1.EnvVar{
Name: "KAFKA_NET_SASL_TOKEN_PROVIDER",
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: kfb.Spec.Net.SASL.TokenProvider.SecretKeyRef,
},
})
}
if kfb.Spec.Net.SASL.RoleARN.SecretKeyRef != nil {
spec.Containers[i].Env = append(spec.Containers[i].Env, corev1.EnvVar{
Name: "KAFKA_NET_SASL_ROLE_ARN",
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: kfb.Spec.Net.SASL.RoleARN.SecretKeyRef,
},
})
}
}
if kfb.Spec.Net.TLS.Enable {
spec.Containers[i].Env = append(spec.Containers[i].Env, corev1.EnvVar{
Expand Down
12 changes: 11 additions & 1 deletion vendor/knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1/kafka_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,17 @@ type KafkaSASLSpec struct {
// +optional
Password SecretValueFromSource `json:"password,omitempty"`

// Type of saslType, defaults to plain (vs SCRAM-SHA-512 or SCRAM-SHA-256)
// RoleARN is the Kubernetes secret containing the ARN of the IAM role to assume.
// Only used if saslType is OAUTHBEARER and tokenProvider is MSKRoleAccessTokenProvider.
// +optional
RoleARN SecretValueFromSource `json:"roleARN,omitempty"`

// Token Provider is the Kubernetes secret containing the OAUTHBEARER
// token provider function. Only used if saslType is OAUTHBEARER.
// +optional
TokenProvider SecretValueFromSource `json:"tokenProvider,omitempty"`

// Type of saslType, defaults to plain (vs SCRAM-SHA-512 or SCRAM-SHA-256 or OAUTHBEARER).
// +optional
Type SecretValueFromSource `json:"type,omitempty"`
}
Expand Down
2 changes: 2 additions & 0 deletions ...ive.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1/zz_generated.deepcopy.go
View file
Open in desktop

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

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 @@ -916,7 +916,7 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1
knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake
knative.dev/eventing/pkg/crossnamespace
knative.dev/eventing/pkg/eventingtls
# knative.dev/eventing-kafka-broker v0.46.1-0.20251007150512-bd08c0cfffeb
# knative.dev/eventing-kafka-broker v0.46.1-0.20251008072414-150a9bd7ba81
## explicit; go 1.24.0
knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings
knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1
Expand Down
Loading