Merge branch 'main' into topology-spread

knative · Mar 17, 2022 · 04cebd0 · 04cebd0
2 parents 3455f98 + 0753bb1
commit 04cebd0
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 64 deletions.
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -63,6 +63,7 @@ aliases:
   - lberk
   - lionelvillard
   - matzew
+  - odacremolbap
   - pierDipi
   - vaikas
   knative-admin:

diff --git a/go.mod b/go.mod
@@ -39,7 +39,7 @@ require (
 	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
 	knative.dev/caching v0.0.0-20220311005831-b2a3f59d7175
 	knative.dev/hack v0.0.0-20220314052818-c9c3ea17a2e9
-	knative.dev/networking v0.0.0-20220315020002-1890039ae107
-	knative.dev/pkg v0.0.0-20220315095603-616f1ab878c5
+	knative.dev/networking v0.0.0-20220316064759-31d0d3ffe54c
+	knative.dev/pkg v0.0.0-20220316002959-3a4cc56708b9
 	sigs.k8s.io/yaml v1.3.0
 )
diff --git a/go.sum b/go.sum
@@ -2139,12 +2139,11 @@ knative.dev/caching v0.0.0-20220311005831-b2a3f59d7175/go.mod h1:52//2yvw0iO3Nu2
 knative.dev/hack v0.0.0-20220224013837-e1785985d364/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
 knative.dev/hack v0.0.0-20220314052818-c9c3ea17a2e9 h1:s35TVdlERqg7D24LDwTa71KeaYnuWnAvj+Qp/1hXzBo=
 knative.dev/hack v0.0.0-20220314052818-c9c3ea17a2e9/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
-knative.dev/networking v0.0.0-20220315020002-1890039ae107 h1:1C2GvauCFKuYFOpQSu8eMli+VXObtMk65E+RlI0eLlk=
-knative.dev/networking v0.0.0-20220315020002-1890039ae107/go.mod h1:S5yaT89Z5mmhcuacYHPyB+ANkzKKXZ9xrMwMiUNCxDA=
+knative.dev/networking v0.0.0-20220316064759-31d0d3ffe54c h1:x3NJjohhFrXHgofPq8L1mDJeATpY5tUbhVURqiAl3TY=
+knative.dev/networking v0.0.0-20220316064759-31d0d3ffe54c/go.mod h1:bP1Plp9yh1EBneqvidxSnd4bqTbuWPat25Vb48j+yBc=
 knative.dev/pkg v0.0.0-20220301181942-2fdd5f232e77/go.mod h1:SsH9J6Gz+CvrHmoL0TELJXmMmohqKSQ5bpJvCv+1+ZI=
-knative.dev/pkg v0.0.0-20220314170718-721abec0a377/go.mod h1:3r6srDeiuiG5DXSGfIe12r2U3Tj5JeeHnQaIXPe/4Zc=
-knative.dev/pkg v0.0.0-20220315095603-616f1ab878c5 h1:gisMh15X2xnIUWJOja2BeJh2FrHb7usqZnAHh9QvfKU=
-knative.dev/pkg v0.0.0-20220315095603-616f1ab878c5/go.mod h1:3r6srDeiuiG5DXSGfIe12r2U3Tj5JeeHnQaIXPe/4Zc=
+knative.dev/pkg v0.0.0-20220316002959-3a4cc56708b9 h1:+l2JdQ5m9Pz8jVHq/dv74L8YR2nM1vr7CR5BiMP5fEs=
+knative.dev/pkg v0.0.0-20220316002959-3a4cc56708b9/go.mod h1:3r6srDeiuiG5DXSGfIe12r2U3Tj5JeeHnQaIXPe/4Zc=
 mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48=
 mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
 mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=

diff --git a/third_party/cert-manager-latest/net-certmanager.yaml b/third_party/cert-manager-latest/net-certmanager.yaml
@@ -19,9 +19,9 @@ metadata:
   name: knative-serving-certmanager
   labels:
     app.kubernetes.io/component: net-certmanager
-    app.kubernetes.io/version: "20220315-973c50a4"
+    app.kubernetes.io/version: "20220317-cd20fb15"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-973c50a4"
+    serving.knative.dev/release: "v20220317-cd20fb15"
     serving.knative.dev/controller: "true"
     networking.knative.dev/certificate-provider: cert-manager
 rules:
@@ -53,9 +53,9 @@ metadata:
   name: config.webhook.net-certmanager.networking.internal.knative.dev
   labels:
     app.kubernetes.io/component: net-certmanager
-    app.kubernetes.io/version: "20220315-973c50a4"
+    app.kubernetes.io/version: "20220317-cd20fb15"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-973c50a4"
+    serving.knative.dev/release: "v20220317-cd20fb15"
     networking.knative.dev/certificate-provider: cert-manager
 webhooks:
   - admissionReviewVersions:
@@ -95,9 +95,9 @@ metadata:
   namespace: knative-serving
   labels:
     app.kubernetes.io/component: net-certmanager
-    app.kubernetes.io/version: "20220315-973c50a4"
+    app.kubernetes.io/version: "20220317-cd20fb15"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-973c50a4"
+    serving.knative.dev/release: "v20220317-cd20fb15"
     networking.knative.dev/certificate-provider: cert-manager
 
 ---
@@ -122,9 +122,9 @@ metadata:
   namespace: knative-serving
   labels:
     app.kubernetes.io/component: net-certmanager
-    app.kubernetes.io/version: "20220315-973c50a4"
+    app.kubernetes.io/version: "20220317-cd20fb15"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-973c50a4"
+    serving.knative.dev/release: "v20220317-cd20fb15"
     networking.knative.dev/certificate-provider: cert-manager
 data:
   _example: |
@@ -172,9 +172,9 @@ metadata:
   namespace: knative-serving
   labels:
     app.kubernetes.io/component: net-certmanager
-    app.kubernetes.io/version: "20220315-973c50a4"
+    app.kubernetes.io/version: "20220317-cd20fb15"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-973c50a4"
+    serving.knative.dev/release: "v20220317-cd20fb15"
     networking.knative.dev/certificate-provider: cert-manager
 spec:
   selector:
@@ -187,16 +187,16 @@ spec:
       labels:
         app: net-certmanager-controller
         app.kubernetes.io/component: net-certmanager
-        app.kubernetes.io/version: "20220315-973c50a4"
+        app.kubernetes.io/version: "20220317-cd20fb15"
         app.kubernetes.io/name: knative-serving
-        serving.knative.dev/release: "v20220315-973c50a4"
+        serving.knative.dev/release: "v20220317-cd20fb15"
     spec:
       serviceAccountName: controller
       containers:
         - name: controller
           # This is the Go import path for the binary that is containerized
           # and substituted here.
-          image: gcr.io/knative-nightly/knative.dev/net-certmanager/cmd/controller@sha256:653858d6c74e7e1ba24a290068d5ed42971a6ec3246179675d6af0ef2617031c
+          image: gcr.io/knative-nightly/knative.dev/net-certmanager/cmd/controller@sha256:fc08d8e625a8efaf8d1ae927140f1f0467096bb2420f4c164d18124ef94efebd
           resources:
             requests:
               cpu: 30m
@@ -235,9 +235,9 @@ metadata:
   labels:
     app: net-certmanager-controller
     app.kubernetes.io/component: net-certmanager
-    app.kubernetes.io/version: "20220315-973c50a4"
+    app.kubernetes.io/version: "20220317-cd20fb15"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-973c50a4"
+    serving.knative.dev/release: "v20220317-cd20fb15"
     networking.knative.dev/certificate-provider: cert-manager
   name: net-certmanager-controller
   namespace: knative-serving
@@ -275,9 +275,9 @@ metadata:
   namespace: knative-serving
   labels:
     app.kubernetes.io/component: net-certmanager
-    app.kubernetes.io/version: "20220315-973c50a4"
+    app.kubernetes.io/version: "20220317-cd20fb15"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-973c50a4"
+    serving.knative.dev/release: "v20220317-cd20fb15"
     networking.knative.dev/certificate-provider: cert-manager
 spec:
   selector:
@@ -291,17 +291,17 @@ spec:
       labels:
         app: net-certmanager-webhook
         app.kubernetes.io/component: net-certmanager
-        app.kubernetes.io/version: "20220315-973c50a4"
+        app.kubernetes.io/version: "20220317-cd20fb15"
         app.kubernetes.io/name: knative-serving
         role: net-certmanager-webhook
-        serving.knative.dev/release: "v20220315-973c50a4"
+        serving.knative.dev/release: "v20220317-cd20fb15"
     spec:
       serviceAccountName: controller
       containers:
         - name: webhook
           # This is the Go import path for the binary that is containerized
           # and substituted here.
-          image: gcr.io/knative-nightly/knative.dev/net-certmanager/cmd/webhook@sha256:0d5bef347053b57a791a69a1ff1b2a87e0c0ac9838e3e15f1485bf2d3de6a233
+          image: gcr.io/knative-nightly/knative.dev/net-certmanager/cmd/webhook@sha256:9193788f4cc624d6e61a08fe2353e86e41d231c35d5b4b5fed2b68a25916aa4f
           resources:
             requests:
               cpu: 20m
@@ -361,9 +361,9 @@ metadata:
   labels:
     role: net-certmanager-webhook
     app.kubernetes.io/component: net-certmanager
-    app.kubernetes.io/version: "20220315-973c50a4"
+    app.kubernetes.io/version: "20220317-cd20fb15"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-973c50a4"
+    serving.knative.dev/release: "v20220317-cd20fb15"
     networking.knative.dev/certificate-provider: cert-manager
 spec:
   ports:

diff --git a/third_party/gateway-api-latest/istio-gateway.yaml b/third_party/gateway-api-latest/istio-gateway.yaml
@@ -20,7 +20,7 @@ metadata:
   name: knative-local-gateway
   namespace: istio-system
   labels:
-    serving.knative.dev/release: "v20220315-5669189b"
+    serving.knative.dev/release: "v20220316-164c01e4"
     networking.knative.dev/ingress-provider: istio
     experimental.istio.io/disable-gateway-port-translation: "true"
 spec:

diff --git a/third_party/gateway-api-latest/net-gateway-api.yaml b/third_party/gateway-api-latest/net-gateway-api.yaml
@@ -2264,7 +2264,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: knative-gateway-api-admin
   labels:
-    serving.knative.dev/release: "v20220315-5669189b"
+    serving.knative.dev/release: "v20220316-164c01e4"
 aggregationRule:
   clusterRoleSelectors:
     - matchLabels:
@@ -2276,7 +2276,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: knative-gateway-api-core
   labels:
-    serving.knative.dev/release: "v20220315-5669189b"
+    serving.knative.dev/release: "v20220316-164c01e4"
     serving.knative.dev/controller: "true"
 rules:
   - apiGroups: ["gateway.networking.k8s.io"]
@@ -2304,7 +2304,7 @@ metadata:
   name: config-gateway
   namespace: knative-serving
   labels:
-    serving.knative.dev/release: "v20220315-5669189b"
+    serving.knative.dev/release: "v20220316-164c01e4"
 data:
   _example: |
     ################################
@@ -2358,9 +2358,9 @@ metadata:
   labels:
     networking.knative.dev/ingress-provider: net-gateway-api
     app.kubernetes.io/component: net-gateway-api
-    app.kubernetes.io/version: "20220315-5669189b"
+    app.kubernetes.io/version: "20220316-164c01e4"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-5669189b"
+    serving.knative.dev/release: "v20220316-164c01e4"
 spec:
   replicas: 1
   selector:
@@ -2386,7 +2386,7 @@ spec:
         - name: controller
           # This is the Go import path for the binary that is containerized
           # and substituted here.
-          image: gcr.io/knative-nightly/knative.dev/net-gateway-api/cmd/controller@sha256:6003401b778383c83ca856afd25be3e398b8e6a412f4d25b75a4d14baf0e45bb
+          image: gcr.io/knative-nightly/knative.dev/net-gateway-api/cmd/controller@sha256:42121860c7d3e3d5acdc27e109f3cac5b3b63be4ab3b60250710c5294ceab3c8
           resources:
             requests:
               cpu: 100m

diff --git a/third_party/kourier-latest/kourier.yaml b/third_party/kourier-latest/kourier.yaml
@@ -20,8 +20,8 @@ metadata:
     networking.knative.dev/ingress-provider: kourier
     app.kubernetes.io/name: knative-serving
     app.kubernetes.io/component: net-kourier
-    app.kubernetes.io/version: "20220315-a7937d60"
-    serving.knative.dev/release: "v20220315-a7937d60"
+    app.kubernetes.io/version: "20220317-411ab1e9"
+    serving.knative.dev/release: "v20220317-411ab1e9"
 
 ---
 # Copyright 2020 The Knative Authors
@@ -46,9 +46,9 @@ metadata:
   labels:
     networking.knative.dev/ingress-provider: kourier
     app.kubernetes.io/component: net-kourier
-    app.kubernetes.io/version: "20220315-a7937d60"
+    app.kubernetes.io/version: "20220317-411ab1e9"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-a7937d60"
+    serving.knative.dev/release: "v20220317-411ab1e9"
 data:
   envoy-bootstrap.yaml: |
     dynamic_resources:
@@ -152,9 +152,9 @@ metadata:
   labels:
     networking.knative.dev/ingress-provider: kourier
     app.kubernetes.io/component: net-kourier
-    app.kubernetes.io/version: "20220315-a7937d60"
+    app.kubernetes.io/version: "20220317-411ab1e9"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-a7937d60"
+    serving.knative.dev/release: "v20220317-411ab1e9"
 data:
   _example: |
     ################################
@@ -206,9 +206,9 @@ metadata:
   labels:
     networking.knative.dev/ingress-provider: kourier
     app.kubernetes.io/component: net-kourier
-    app.kubernetes.io/version: "20220315-a7937d60"
+    app.kubernetes.io/version: "20220317-411ab1e9"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-a7937d60"
+    serving.knative.dev/release: "v20220317-411ab1e9"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -218,9 +218,9 @@ metadata:
   labels:
     networking.knative.dev/ingress-provider: kourier
     app.kubernetes.io/component: net-kourier
-    app.kubernetes.io/version: "20220315-a7937d60"
+    app.kubernetes.io/version: "20220317-411ab1e9"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-a7937d60"
+    serving.knative.dev/release: "v20220317-411ab1e9"
 rules:
   - apiGroups: [""]
     resources: ["events"]
@@ -248,9 +248,9 @@ metadata:
   labels:
     networking.knative.dev/ingress-provider: kourier
     app.kubernetes.io/component: net-kourier
-    app.kubernetes.io/version: "20220315-a7937d60"
+    app.kubernetes.io/version: "20220317-411ab1e9"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-a7937d60"
+    serving.knative.dev/release: "v20220317-411ab1e9"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -283,9 +283,9 @@ metadata:
   labels:
     networking.knative.dev/ingress-provider: kourier
     app.kubernetes.io/component: net-kourier
-    app.kubernetes.io/version: "20220315-a7937d60"
+    app.kubernetes.io/version: "20220317-411ab1e9"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-a7937d60"
+    serving.knative.dev/release: "v20220317-411ab1e9"
 spec:
   replicas: 1
   selector:
@@ -297,7 +297,7 @@ spec:
         app: net-kourier-controller
     spec:
       containers:
-        - image: gcr.io/knative-nightly/knative.dev/net-kourier/cmd/kourier@sha256:ffc7834902d382ff0c4152e78a3e19ca025217bb4cd6828bc6a14a6965f775fc
+        - image: gcr.io/knative-nightly/knative.dev/net-kourier/cmd/kourier@sha256:aec17e31b6a3724ea6d033b34229cee8501a8e39e1a06edf81e97de68cc2f972
           name: controller
           env:
             - name: CERTS_SECRET_NAMESPACE
@@ -337,9 +337,9 @@ metadata:
   labels:
     networking.knative.dev/ingress-provider: kourier
     app.kubernetes.io/component: net-kourier
-    app.kubernetes.io/version: "20220315-a7937d60"
+    app.kubernetes.io/version: "20220317-411ab1e9"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-a7937d60"
+    serving.knative.dev/release: "v20220317-411ab1e9"
 spec:
   ports:
     - name: grpc-xds
@@ -373,9 +373,9 @@ metadata:
   labels:
     networking.knative.dev/ingress-provider: kourier
     app.kubernetes.io/component: net-kourier
-    app.kubernetes.io/version: "20220315-a7937d60"
+    app.kubernetes.io/version: "20220317-411ab1e9"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-a7937d60"
+    serving.knative.dev/release: "v20220317-411ab1e9"
 spec:
   strategy:
     type: RollingUpdate
@@ -457,9 +457,9 @@ metadata:
   labels:
     networking.knative.dev/ingress-provider: kourier
     app.kubernetes.io/component: net-kourier
-    app.kubernetes.io/version: "20220315-a7937d60"
+    app.kubernetes.io/version: "20220317-411ab1e9"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-a7937d60"
+    serving.knative.dev/release: "v20220317-411ab1e9"
 spec:
   ports:
     - name: http2
@@ -482,9 +482,9 @@ metadata:
   labels:
     networking.knative.dev/ingress-provider: kourier
     app.kubernetes.io/component: net-kourier
-    app.kubernetes.io/version: "20220315-a7937d60"
+    app.kubernetes.io/version: "20220317-411ab1e9"
     app.kubernetes.io/name: knative-serving
-    serving.knative.dev/release: "v20220315-a7937d60"
+    serving.knative.dev/release: "v20220317-411ab1e9"
 spec:
   ports:
     - name: http2

diff --git a/vendor/knative.dev/pkg/hash/bucketer.go b/vendor/knative.dev/pkg/hash/bucketer.go
@@ -98,12 +98,22 @@ func (bs *BucketSet) Owner(key string) string {
 	}
 	bs.mu.RLock()
 	defer bs.mu.RUnlock()
-	l := ChooseSubset(bs.buckets, 1 /*single query wanted*/, key)
-	ret := l.UnsortedList()[0]
-	bs.cache.Add(key, ret)
+	ret, ok := GetAny(ChooseSubset(bs.buckets, 1 /*single query wanted*/, key))
+	if ok {
+		bs.cache.Add(key, ret)
+	}
 	return ret
 }
 
+// Returns a single element from the set.
+func GetAny(s sets.String) (string, bool) {
+	for key := range s {
+		return key, true
+	}
+	var zeroValue string
+	return zeroValue, false
+}
+
 // HasBucket returns true if this BucketSet has the given bucket name.
 func (bs *BucketSet) HasBucket(bkt string) bool {
 	return bs.buckets.Has(bkt)