Skip to content

Commit 88b3634

Browse files
knative-automationknative-automation
authored
upgrade to latest dependencies (#1686)
bumping knative.dev/client-pkg e1f3e9a...e75f12e:%0A > e75f12e upgrade to latest dependencies (# 98)%0A > 3bb19d6 upgrade to latest dependencies (# 93)%0Abumping knative.dev/serving 4db179f...84fa64c:%0A > 84fa64c Update data-plane Secrets (# 13859)%0A > 22783d6 Deployment probe fixes (# 13885)%0A > 113616b add support for downwardAPI in projected volumes (# 13896)%0A > 55f8dd7 upgrade to latest dependencies (# 13912)%0A > b2a416f Update net-gateway-api nightly (# 13907)%0A > 91ac3b3 Update net-certmanager nightly (# 13904)%0A > 787ac48 Update net-istio nightly (# 13902)%0A > d315f71 Update net-contour nightly (# 13903)%0A > b38ef3a Update net-istio nightly (# 13899)%0A > b9b9d13 Update net-contour nightly (# 13900)%0A > 9530fe9 Update net-certmanager nightly (# 13897)%0A > 12bd205 Update net-kourier nightly (# 13898)%0Abumping knative.dev/networking 750a9e4...e5d04e8:%0A > e5d04e8 upgrade to latest dependencies (# 796)%0A > 62fd5d0 Update actions (# 793)%0A > b77b4a6 Bump Go version in github action (# 795)%0Abumping knative.dev/eventing cc3d254...034bec9:%0A > 034bec9 [main] Upgrade to latest dependencies (# 6888)%0A > 4c2a3aa Bump Go to 1.20 in GH workflows (# 6882)%0A > 825a2b5 Create Cert-Manager resources (# 6849)%0A > 193f2df Eventing TLS: support `K_CA_CERTS` in adapter/v2 (# 6848) Signed-off-by: Knative Automation <[email protected]>
1 parent 5dc18a1 commit 88b3634

File tree

6 files changed

+82
-23
lines changed

6 files changed

+82
-23
lines changed

Diff for: ‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ require (
4545
k8s.io/api v0.26.1
4646
k8s.io/apimachinery v0.26.1
4747
k8s.io/client-go v1.5.2
48-
knative.dev/client-pkg v0.0.0-20230413132753-e1f3e9aba1f4
49-
knative.dev/eventing v0.36.1-0.20230418085055-cc3d254d555c
48+
knative.dev/client-pkg v0.0.0-20230424160443-e75f12ea9fa0
49+
knative.dev/eventing v0.36.1-0.20230425111243-034bec97c9c5
5050
knative.dev/hack v0.0.0-20230417170854-f591fea109b3
5151
knative.dev/pkg v0.0.0-20230418073056-dfad48eaa5d0
52-
knative.dev/serving v0.36.1-0.20230418074055-4db179fe5a37
52+
knative.dev/serving v0.36.1-0.20230425124544-84fa64c75bd3
5353
)
5454

5555
require (
@@ -237,7 +237,7 @@ require (
237237
k8s.io/klog/v2 v2.90.0 // indirect
238238
k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a // indirect
239239
k8s.io/utils v0.0.0-20230115233650-391b47cb4029 // indirect
240-
knative.dev/networking v0.0.0-20230412014752-750a9e4f13f1 // indirect
240+
knative.dev/networking v0.0.0-20230419144338-e5d04e805e50 // indirect
241241
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
242242
sigs.k8s.io/kustomize/api v0.12.1 // indirect
243243
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect

Diff for: ‎go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -2527,18 +2527,18 @@ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
25272527
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
25282528
k8s.io/utils v0.0.0-20230115233650-391b47cb4029 h1:L8zDtT4jrxj+TaQYD0k8KNlr556WaVQylDXswKmX+dE=
25292529
k8s.io/utils v0.0.0-20230115233650-391b47cb4029/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
2530-
knative.dev/client-pkg v0.0.0-20230413132753-e1f3e9aba1f4 h1:hDRpPm4Qsm+UIF+bwyWCXWq/7yfRi5+syU4R44lWa4w=
2531-
knative.dev/client-pkg v0.0.0-20230413132753-e1f3e9aba1f4/go.mod h1:ay34oweJk5AiUQ2XuZ9VxoQYwFmSjUDEYxklv6USy1M=
2532-
knative.dev/eventing v0.36.1-0.20230418085055-cc3d254d555c h1:9XRvapQa0EA2Gu92v3JMsW0eiF2ZTEBPx5wvBCDKcHw=
2533-
knative.dev/eventing v0.36.1-0.20230418085055-cc3d254d555c/go.mod h1:LxPAmS/FakpbFZvC4kkBuV6QSL5EyhwQYV62XLQQaQw=
2530+
knative.dev/client-pkg v0.0.0-20230424160443-e75f12ea9fa0 h1:XLYexGE1Z26CVgbIBWjdvDAkcxVJd5MKeyfFwB/wsNc=
2531+
knative.dev/client-pkg v0.0.0-20230424160443-e75f12ea9fa0/go.mod h1:lLJ4XAczLp1b6suYh2VWOaDeoRHA9l89jBRhFs9fNv0=
2532+
knative.dev/eventing v0.36.1-0.20230425111243-034bec97c9c5 h1:8p2IP/if3Ot/DgvJrc96UJh9OcKa5lS1gJ9Rgv79dLE=
2533+
knative.dev/eventing v0.36.1-0.20230425111243-034bec97c9c5/go.mod h1:62baPXiw5GPpPyV3f0GF64X7tOjc5x9cg64RAh1gjs4=
25342534
knative.dev/hack v0.0.0-20230417170854-f591fea109b3 h1:+W4WBOq83tfGXKhtv8OB/uJeYqze3zh69GKiz1ucuqk=
25352535
knative.dev/hack v0.0.0-20230417170854-f591fea109b3/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
2536-
knative.dev/networking v0.0.0-20230412014752-750a9e4f13f1 h1:ZkkzXLF+7tgcXh4VSEFEWSUT+Rzn0Umb95ximuw0/+o=
2537-
knative.dev/networking v0.0.0-20230412014752-750a9e4f13f1/go.mod h1:Hk0NjXch4XbahSdWifEcoT/JX8Xyjk3MT3XbvAx0PLk=
2536+
knative.dev/networking v0.0.0-20230419144338-e5d04e805e50 h1:X9rPBYr7Vrm075q0iXTr7/0oklkYoyqvlnrUwNzcUhI=
2537+
knative.dev/networking v0.0.0-20230419144338-e5d04e805e50/go.mod h1:o2MyGpGfU5DoSAWCE2f/jnSC9GjGOplCslbA99yDkGo=
25382538
knative.dev/pkg v0.0.0-20230418073056-dfad48eaa5d0 h1:EFQcoUo8I4bc+U3y6tR1B3ONYZSHWUdAfI7Vh7dae8g=
25392539
knative.dev/pkg v0.0.0-20230418073056-dfad48eaa5d0/go.mod h1:2qWPP9Gjh9Q7ETti+WRHnBnGCSCq+6q7m3p/nmUQviE=
2540-
knative.dev/serving v0.36.1-0.20230418074055-4db179fe5a37 h1:HPNbm9yYpDVn4rmAvi+Mom8Ibakh36ARjSlut0m7f3o=
2541-
knative.dev/serving v0.36.1-0.20230418074055-4db179fe5a37/go.mod h1:JxH2HRtA7aApDHBGUGE0kG6l7ZkvVbJFgE+0V6djB3k=
2540+
knative.dev/serving v0.36.1-0.20230425124544-84fa64c75bd3 h1:q/jrXiscC8F2fFQrCUI9MXrArL4qjpr9CdKKndOP7Ac=
2541+
knative.dev/serving v0.36.1-0.20230425124544-84fa64c75bd3/go.mod h1:v0Xbfp7olb0Gljm5l4qNuLsIf8/2p1rIt/mphxvx1z0=
25422542
modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
25432543
modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
25442544
modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=

Diff for: ‎vendor/knative.dev/serving/pkg/apis/serving/fieldmask.go

+36-3
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,8 @@ func VolumeProjectionMask(in *corev1.VolumeProjection) *corev1.VolumeProjection
8686
out.ConfigMap = in.ConfigMap
8787
out.ServiceAccountToken = in.ServiceAccountToken
8888

89-
// Disallowed fields
90-
// This list is unnecessary, but added here for clarity
91-
out.DownwardAPI = nil
89+
// TODO(KauzClay): Should this be behind a feature flag like EmptyDir?
90+
out.DownwardAPI = in.DownwardAPI
9291

9392
return out
9493
}
@@ -147,6 +146,40 @@ func ServiceAccountTokenProjectionMask(in *corev1.ServiceAccountTokenProjection)
147146
return out
148147
}
149148

149+
// DownwardAPIProjectionMask performs a _shallow_ copy of the Kubernetes DownwardAPIProjection
150+
// object to a new Kubernetes DownwardAPIProjection object bringing over only the fields allowed
151+
// in the Knative API. This does not validate the contents or the bounds of the provided fields.
152+
func DownwardAPIProjectionMask(in *corev1.DownwardAPIProjection) *corev1.DownwardAPIProjection {
153+
if in == nil {
154+
return nil
155+
}
156+
157+
out := new(corev1.DownwardAPIProjection)
158+
159+
out.Items = append(out.Items, in.Items...)
160+
161+
return out
162+
}
163+
164+
// DownwardAPIVolumeFileMask performs a _shallow_ copy of the Kubernetes DownwardAPIVolumeFileMask
165+
// object to a new Kubernetes DownwardAPIVolumeFileMask object bringing over only the fields allowed
166+
// in the Knative API. This does not validate the contents or the bounds of the provided fields.
167+
func DownwardAPIVolumeFileMask(in *corev1.DownwardAPIVolumeFile) *corev1.DownwardAPIVolumeFile {
168+
if in == nil {
169+
return nil
170+
}
171+
172+
out := new(corev1.DownwardAPIVolumeFile)
173+
174+
// Allowed fields
175+
out.FieldRef = in.FieldRef
176+
out.ResourceFieldRef = in.ResourceFieldRef
177+
out.Path = in.Path
178+
out.Mode = in.Mode
179+
180+
return out
181+
}
182+
150183
// KeyToPathMask performs a _shallow_ copy of the Kubernetes KeyToPath
151184
// object to a new Kubernetes KeyToPath object bringing over only the fields allowed
152185
// in the Knative API. This does not validate the contents or the bounds of the provided fields.

Diff for: ‎vendor/knative.dev/serving/pkg/apis/serving/k8s_validation.go

+27-1
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,12 @@ func validateProjectedVolumeSource(vp corev1.VolumeProjection) *apis.FieldError
196196
specified = append(specified, "serviceAccountToken")
197197
errs = errs.Also(validateServiceAccountTokenProjection(vp.ServiceAccountToken).ViaField("serviceAccountToken"))
198198
}
199+
if vp.DownwardAPI != nil {
200+
specified = append(specified, "downwardAPI")
201+
errs = errs.Also(validateDownwardAPIProjection(vp.DownwardAPI).ViaField("downwardAPI"))
202+
}
199203
if len(specified) == 0 {
200-
errs = errs.Also(apis.ErrMissingOneOf("secret", "configMap", "serviceAccountToken"))
204+
errs = errs.Also(apis.ErrMissingOneOf("secret", "configMap", "serviceAccountToken", "downwardAPI"))
201205
} else if len(specified) > 1 {
202206
errs = errs.Also(apis.ErrMultipleOneOf(specified...))
203207
}
@@ -239,6 +243,28 @@ func validateServiceAccountTokenProjection(sp *corev1.ServiceAccountTokenProject
239243
return errs
240244
}
241245

246+
func validateDownwardAPIProjection(dapi *corev1.DownwardAPIProjection) *apis.FieldError {
247+
errs := apis.CheckDisallowedFields(*dapi, *DownwardAPIProjectionMask(dapi))
248+
for i := range dapi.Items {
249+
errs = errs.Also(validateDownwardAPIVolumeFile(&dapi.Items[i]).ViaFieldIndex("items", i))
250+
}
251+
return errs
252+
}
253+
254+
func validateDownwardAPIVolumeFile(vf *corev1.DownwardAPIVolumeFile) *apis.FieldError {
255+
errs := apis.CheckDisallowedFields(*vf, *DownwardAPIVolumeFileMask(vf))
256+
if vf.FieldRef == nil && vf.ResourceFieldRef == nil {
257+
errs = errs.Also(apis.ErrMissingOneOf("fieldRef", "resourceFieldRef"))
258+
}
259+
if vf.FieldRef != nil && vf.ResourceFieldRef != nil {
260+
errs = errs.Also(apis.ErrGeneric("Within a single item, cannot set both", "resourceFieldRef", "fieldRef"))
261+
}
262+
if vf.Path == "" {
263+
errs = errs.Also(apis.ErrMissingField("path"))
264+
}
265+
return errs
266+
}
267+
242268
func validateKeyToPath(k2p corev1.KeyToPath) *apis.FieldError {
243269
errs := apis.CheckDisallowedFields(k2p, *KeyToPathMask(&k2p))
244270
if k2p.Key == "" {

Diff for: ‎vendor/knative.dev/serving/pkg/networking/constants.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ const (
5252
// e.g. Public, Private.
5353
ServiceTypeKey = networking.GroupName + "/serviceType"
5454

55-
// ServingCertName is used by the secret name for internal TLS as "namespace-${ServingCertName}".
56-
// Also the secret name has the label with "${ServingCertName}: data-plane"
55+
// ServingCertName is the secret name for internal TLS.
56+
// Also the secret name has the label with "${ServingCertName}: data-plane-user"
5757
ServingCertName = "serving-certs"
5858
)
5959

Diff for: ‎vendor/modules.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1671,7 +1671,7 @@ k8s.io/utils/net
16711671
k8s.io/utils/pointer
16721672
k8s.io/utils/strings/slices
16731673
k8s.io/utils/trace
1674-
# knative.dev/client-pkg v0.0.0-20230413132753-e1f3e9aba1f4
1674+
# knative.dev/client-pkg v0.0.0-20230424160443-e75f12ea9fa0
16751675
## explicit; go 1.18
16761676
knative.dev/client-pkg/pkg/apis/client
16771677
knative.dev/client-pkg/pkg/apis/client/v1alpha1
@@ -1685,8 +1685,8 @@ knative.dev/client-pkg/pkg/serving/v1
16851685
knative.dev/client-pkg/pkg/util
16861686
knative.dev/client-pkg/pkg/util/test
16871687
knative.dev/client-pkg/pkg/wait
1688-
# knative.dev/eventing v0.36.1-0.20230418085055-cc3d254d555c
1689-
## explicit; go 1.18
1688+
# knative.dev/eventing v0.36.1-0.20230425111243-034bec97c9c5
1689+
## explicit; go 1.19
16901690
knative.dev/eventing/pkg/apis/config
16911691
knative.dev/eventing/pkg/apis/duck
16921692
knative.dev/eventing/pkg/apis/duck/v1
@@ -1708,7 +1708,7 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1
17081708
# knative.dev/hack v0.0.0-20230417170854-f591fea109b3
17091709
## explicit; go 1.18
17101710
knative.dev/hack
1711-
# knative.dev/networking v0.0.0-20230412014752-750a9e4f13f1
1711+
# knative.dev/networking v0.0.0-20230419144338-e5d04e805e50
17121712
## explicit; go 1.18
17131713
knative.dev/networking/pkg
17141714
knative.dev/networking/pkg/apis/networking
@@ -1763,7 +1763,7 @@ knative.dev/pkg/tracing/propagation
17631763
knative.dev/pkg/tracing/propagation/tracecontextb3
17641764
knative.dev/pkg/tracker
17651765
knative.dev/pkg/webhook/resourcesemantics
1766-
# knative.dev/serving v0.36.1-0.20230418074055-4db179fe5a37
1766+
# knative.dev/serving v0.36.1-0.20230425124544-84fa64c75bd3
17671767
## explicit; go 1.18
17681768
knative.dev/serving/pkg/apis/autoscaling
17691769
knative.dev/serving/pkg/apis/autoscaling/v1alpha1

0 commit comments

Comments
 (0)