Skip to content

Commit c9b6510

Browse files
knative-automationknative-automation
authored
upgrade to latest dependencies (#411)
bumping knative.dev/eventing-kafka-broker bd08c0c...150a9bd: > 150a9bd [# 3514] Add support for AWS MSK IAM authentication using SASL OAUTHBEARER (# 4516) Signed-off-by: Knative Automation <[email protected]>
1 parent a2c533d commit c9b6510

File tree

6 files changed

+75
-25
lines changed

6 files changed

+75
-25
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
k8s.io/apimachinery v0.33.5
1414
k8s.io/client-go v0.33.5
1515
knative.dev/client/pkg v0.0.0-20251007022612-79bd2e100065
16-
knative.dev/eventing-kafka-broker v0.46.1-0.20251007150512-bd08c0cfffeb
16+
knative.dev/eventing-kafka-broker v0.46.1-0.20251008072414-150a9bd7ba81
1717
knative.dev/hack v0.0.0-20250902153942-1499de21e119
1818
knative.dev/pkg v0.0.0-20251007184713-a624c759bede
1919
)

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -751,8 +751,8 @@ knative.dev/client/pkg v0.0.0-20251007022612-79bd2e100065 h1:myUyFpRzAVaME1LKz47
751751
knative.dev/client/pkg v0.0.0-20251007022612-79bd2e100065/go.mod h1:U6Kx0zEHzOCfS/khJeP2H1MYUX/OWPKGVrOITGeeS/E=
752752
knative.dev/eventing v0.46.1-0.20251002211605-5828b491e837 h1:YPS9wXY/roM6DZBp75rLqKZ9hDcsgijlj/hjIESpQZw=
753753
knative.dev/eventing v0.46.1-0.20251002211605-5828b491e837/go.mod h1:HRusNPXiJsv2USQLE9i0gPm/cnUZo0jVTlkVdBTcfC8=
754-
knative.dev/eventing-kafka-broker v0.46.1-0.20251007150512-bd08c0cfffeb h1:WZsZXVHO3mKw5uAap1Ua7K4XTBfqwMtjK08p92qvM18=
755-
knative.dev/eventing-kafka-broker v0.46.1-0.20251007150512-bd08c0cfffeb/go.mod h1:B/JHSrzVgnZ2wAmY+YXJXepUXC7KwHL2wfS++GLrWbw=
754+
knative.dev/eventing-kafka-broker v0.46.1-0.20251008072414-150a9bd7ba81 h1:VbtuCiN4mrxSr7PwHleOUvmdRr04pqCnsA/iNwiul0g=
755+
knative.dev/eventing-kafka-broker v0.46.1-0.20251008072414-150a9bd7ba81/go.mod h1:xRMZKfycxPVjb4/hhq9DDHTXxcXlYJ+fL921nT1ijnY=
756756
knative.dev/hack v0.0.0-20250902153942-1499de21e119 h1:NbQvjnFK1tL489LN0qAybWy0E17Jpziwcv/XIHwfp6M=
757757
knative.dev/hack v0.0.0-20250902153942-1499de21e119/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
758758
knative.dev/networking v0.0.0-20250916015400-8cc248b445a0 h1:OG6rRbmXMDh369o/puixTc8dv9YihZr964S9rt6EURo=

‎vendor/knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1/kafka_lifecycle.go‎

Lines changed: 58 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -92,22 +92,41 @@ func (kfb *KafkaBinding) Do(ctx context.Context, ps *duckv1.WithPod) {
9292
spec.InitContainers[i].Env = append(spec.InitContainers[i].Env, corev1.EnvVar{
9393
Name: "KAFKA_NET_SASL_ENABLE",
9494
Value: "true",
95-
}, corev1.EnvVar{
96-
Name: "KAFKA_NET_SASL_USER",
97-
ValueFrom: &corev1.EnvVarSource{
98-
SecretKeyRef: kfb.Spec.Net.SASL.User.SecretKeyRef,
99-
},
100-
}, corev1.EnvVar{
101-
Name: "KAFKA_NET_SASL_PASSWORD",
102-
ValueFrom: &corev1.EnvVarSource{
103-
SecretKeyRef: kfb.Spec.Net.SASL.Password.SecretKeyRef,
104-
},
10595
}, corev1.EnvVar{
10696
Name: "KAFKA_NET_SASL_TYPE",
10797
ValueFrom: &corev1.EnvVarSource{
10898
SecretKeyRef: kfb.Spec.Net.SASL.Type.SecretKeyRef,
10999
},
110100
})
101+
if kfb.Spec.Net.SASL.User.SecretKeyRef != nil {
102+
spec.InitContainers[i].Env = append(spec.InitContainers[i].Env, corev1.EnvVar{
103+
Name: "KAFKA_NET_SASL_USER",
104+
ValueFrom: &corev1.EnvVarSource{
105+
SecretKeyRef: kfb.Spec.Net.SASL.User.SecretKeyRef,
106+
},
107+
}, corev1.EnvVar{
108+
Name: "KAFKA_NET_SASL_PASSWORD",
109+
ValueFrom: &corev1.EnvVarSource{
110+
SecretKeyRef: kfb.Spec.Net.SASL.Password.SecretKeyRef,
111+
},
112+
})
113+
}
114+
if kfb.Spec.Net.SASL.TokenProvider.SecretKeyRef != nil {
115+
spec.Containers[i].Env = append(spec.Containers[i].Env, corev1.EnvVar{
116+
Name: "KAFKA_NET_SASL_TOKEN_PROVIDER",
117+
ValueFrom: &corev1.EnvVarSource{
118+
SecretKeyRef: kfb.Spec.Net.SASL.TokenProvider.SecretKeyRef,
119+
},
120+
})
121+
}
122+
if kfb.Spec.Net.SASL.RoleARN.SecretKeyRef != nil {
123+
spec.Containers[i].Env = append(spec.Containers[i].Env, corev1.EnvVar{
124+
Name: "KAFKA_NET_SASL_ROLE_ARN",
125+
ValueFrom: &corev1.EnvVarSource{
126+
SecretKeyRef: kfb.Spec.Net.SASL.RoleARN.SecretKeyRef,
127+
},
128+
})
129+
}
111130
}
112131
if kfb.Spec.Net.TLS.Enable {
113132
spec.InitContainers[i].Env = append(spec.InitContainers[i].Env, corev1.EnvVar{
@@ -142,22 +161,41 @@ func (kfb *KafkaBinding) Do(ctx context.Context, ps *duckv1.WithPod) {
142161
spec.Containers[i].Env = append(spec.Containers[i].Env, corev1.EnvVar{
143162
Name: "KAFKA_NET_SASL_ENABLE",
144163
Value: "true",
145-
}, corev1.EnvVar{
146-
Name: "KAFKA_NET_SASL_USER",
147-
ValueFrom: &corev1.EnvVarSource{
148-
SecretKeyRef: kfb.Spec.Net.SASL.User.SecretKeyRef,
149-
},
150-
}, corev1.EnvVar{
151-
Name: "KAFKA_NET_SASL_PASSWORD",
152-
ValueFrom: &corev1.EnvVarSource{
153-
SecretKeyRef: kfb.Spec.Net.SASL.Password.SecretKeyRef,
154-
},
155164
}, corev1.EnvVar{
156165
Name: "KAFKA_NET_SASL_TYPE",
157166
ValueFrom: &corev1.EnvVarSource{
158167
SecretKeyRef: kfb.Spec.Net.SASL.Type.SecretKeyRef,
159168
},
160169
})
170+
if kfb.Spec.Net.SASL.User.SecretKeyRef != nil {
171+
spec.Containers[i].Env = append(spec.Containers[i].Env, corev1.EnvVar{
172+
Name: "KAFKA_NET_SASL_USER",
173+
ValueFrom: &corev1.EnvVarSource{
174+
SecretKeyRef: kfb.Spec.Net.SASL.User.SecretKeyRef,
175+
},
176+
}, corev1.EnvVar{
177+
Name: "KAFKA_NET_SASL_PASSWORD",
178+
ValueFrom: &corev1.EnvVarSource{
179+
SecretKeyRef: kfb.Spec.Net.SASL.Password.SecretKeyRef,
180+
},
181+
})
182+
}
183+
if kfb.Spec.Net.SASL.TokenProvider.SecretKeyRef != nil {
184+
spec.Containers[i].Env = append(spec.Containers[i].Env, corev1.EnvVar{
185+
Name: "KAFKA_NET_SASL_TOKEN_PROVIDER",
186+
ValueFrom: &corev1.EnvVarSource{
187+
SecretKeyRef: kfb.Spec.Net.SASL.TokenProvider.SecretKeyRef,
188+
},
189+
})
190+
}
191+
if kfb.Spec.Net.SASL.RoleARN.SecretKeyRef != nil {
192+
spec.Containers[i].Env = append(spec.Containers[i].Env, corev1.EnvVar{
193+
Name: "KAFKA_NET_SASL_ROLE_ARN",
194+
ValueFrom: &corev1.EnvVarSource{
195+
SecretKeyRef: kfb.Spec.Net.SASL.RoleARN.SecretKeyRef,
196+
},
197+
})
198+
}
161199
}
162200
if kfb.Spec.Net.TLS.Enable {
163201
spec.Containers[i].Env = append(spec.Containers[i].Env, corev1.EnvVar{

‎vendor/knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1/kafka_types.go‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,17 @@ type KafkaSASLSpec struct {
5757
// +optional
5858
Password SecretValueFromSource `json:"password,omitempty"`
5959

60-
// Type of saslType, defaults to plain (vs SCRAM-SHA-512 or SCRAM-SHA-256)
60+
// RoleARN is the Kubernetes secret containing the ARN of the IAM role to assume.
61+
// Only used if saslType is OAUTHBEARER and tokenProvider is MSKRoleAccessTokenProvider.
62+
// +optional
63+
RoleARN SecretValueFromSource `json:"roleARN,omitempty"`
64+
65+
// Token Provider is the Kubernetes secret containing the OAUTHBEARER
66+
// token provider function. Only used if saslType is OAUTHBEARER.
67+
// +optional
68+
TokenProvider SecretValueFromSource `json:"tokenProvider,omitempty"`
69+
70+
// Type of saslType, defaults to plain (vs SCRAM-SHA-512 or SCRAM-SHA-256 or OAUTHBEARER).
6171
// +optional
6272
Type SecretValueFromSource `json:"type,omitempty"`
6373
}

‎vendor/knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1/zz_generated.deepcopy.go‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1
916916
knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake
917917
knative.dev/eventing/pkg/crossnamespace
918918
knative.dev/eventing/pkg/eventingtls
919-
# knative.dev/eventing-kafka-broker v0.46.1-0.20251007150512-bd08c0cfffeb
919+
# knative.dev/eventing-kafka-broker v0.46.1-0.20251008072414-150a9bd7ba81
920920
## explicit; go 1.24.0
921921
knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings
922922
knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1

0 commit comments

Comments
 (0)