[release-v1.10] Sync upstream release (#345)

* Min TLS for tag to digest defaults to 1.2 again and is configurable (knative#13963) quay.io only supports 1.2 Co-authored-by: dprotaso <[email protected]> * drop safe to evict annotations (knative#14051) this prevents nodes from draining Co-authored-by: dprotaso <[email protected]> * [release-1.10] RandomChoice 2 policy wasn't random when the number of targets is 2 (with equal weight) (knative#14052) * RandomChoice 2 policy wasn't random when the number of targets is 2 * fix linting --------- Co-authored-by: dprotaso <[email protected]> * Sync upstream release --------- Co-authored-by: Knative Prow Robot <[email protected]> Co-authored-by: dprotaso <[email protected]> Co-authored-by: John Doe <johndoe@localhost> Co-authored-by: nak3 <[email protected]>
openshift-knative · Jun 8, 2023 · 6e25efb · 6e25efb
1 parent 650511a
commit 6e25efb
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 28 deletions.
diff --git a/config/core/deployments/activator.yaml b/config/core/deployments/activator.yaml
@@ -28,8 +28,6 @@ spec:
       role: activator
   template:
     metadata:
-      annotations:
-        cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: activator
         role: activator

diff --git a/config/core/deployments/autoscaler.yaml b/config/core/deployments/autoscaler.yaml
@@ -32,8 +32,6 @@ spec:
        maxUnavailable: 0
   template:
     metadata:
-      annotations:
-        cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: autoscaler
         app.kubernetes.io/component: autoscaler

diff --git a/config/core/deployments/controller.yaml b/config/core/deployments/controller.yaml
@@ -27,8 +27,6 @@ spec:
       app: controller
   template:
     metadata:
-      annotations:
-        cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
       labels:
         app: controller
         app.kubernetes.io/component: controller

diff --git a/config/core/deployments/domainmapping-controller.yaml b/config/core/deployments/domainmapping-controller.yaml
@@ -27,8 +27,6 @@ spec:
       app: domain-mapping
   template:
     metadata:
-      annotations:
-        cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
       labels:
         app: domain-mapping
         app.kubernetes.io/component: domain-mapping

diff --git a/config/core/deployments/domainmapping-webhook.yaml b/config/core/deployments/domainmapping-webhook.yaml
@@ -28,8 +28,6 @@ spec:
       role: domainmapping-webhook
   template:
     metadata:
-      annotations:
-        cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: domainmapping-webhook
         role: domainmapping-webhook

diff --git a/config/core/deployments/webhook.yaml b/config/core/deployments/webhook.yaml
@@ -28,8 +28,6 @@ spec:
       role: webhook
   template:
     metadata:
-      annotations:
-        cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: webhook
         role: webhook

diff --git a/config/hpa-autoscaling/controller.yaml b/config/hpa-autoscaling/controller.yaml
@@ -28,8 +28,6 @@ spec:
       app: autoscaler-hpa
   template:
     metadata:
-      annotations:
-        cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
       labels:
         app: autoscaler-hpa
         app.kubernetes.io/component: autoscaler-hpa

diff --git a/openshift/release/artifacts/serving-core.yaml b/openshift/release/artifacts/serving-core.yaml
@@ -6028,8 +6028,6 @@ spec:
       role: activator
   template:
     metadata:
-      annotations:
-        cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: activator
         role: activator
@@ -6192,8 +6190,6 @@ spec:
        maxUnavailable: 0
   template:
     metadata:
-      annotations:
-        cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: autoscaler
         app.kubernetes.io/component: autoscaler
@@ -6334,8 +6330,6 @@ spec:
       app: controller
   template:
     metadata:
-      annotations:
-        cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
       labels:
         app: controller
         app.kubernetes.io/component: controller
@@ -6471,8 +6465,6 @@ spec:
       app: domain-mapping
   template:
     metadata:
-      annotations:
-        cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
       labels:
         app: domain-mapping
         app.kubernetes.io/component: domain-mapping
@@ -6582,8 +6574,6 @@ spec:
       role: domainmapping-webhook
   template:
     metadata:
-      annotations:
-        cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: domainmapping-webhook
         role: domainmapping-webhook
@@ -6790,8 +6780,6 @@ spec:
       role: webhook
   template:
     metadata:
-      annotations:
-        cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
       labels:
         app: webhook
         role: webhook

diff --git a/openshift/release/artifacts/serving-hpa.yaml b/openshift/release/artifacts/serving-hpa.yaml
@@ -29,8 +29,6 @@ spec:
       app: autoscaler-hpa
   template:
     metadata:
-      annotations:
-        cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
       labels:
         app: autoscaler-hpa
         app.kubernetes.io/component: autoscaler-hpa

diff --git a/pkg/activator/net/lb_policy.go b/pkg/activator/net/lb_policy.go
@@ -67,6 +67,11 @@ func randomChoice2Policy(_ context.Context, targets []*podTracker) (func(), *pod
 	// so fine.
 	if pick.getWeight() > alt.getWeight() {
 		pick = alt
+	} else if pick.getWeight() == alt.getWeight() {
+		//nolint:gosec // We don't need cryptographic randomness here.
+		if rand.Int63()%2 == 0 {
+			pick = alt
+		}
 	}
 	pick.increaseWeight()
 	return pick.decreaseWeight, pick

diff --git a/pkg/activator/net/lb_policy_test.go b/pkg/activator/net/lb_policy_test.go
@@ -25,6 +25,32 @@ import (
 	"knative.dev/serving/pkg/queue"
 )
 
+func TestRandomChoice_TwoTrackersDistribution(t *testing.T) {
+	podTrackers := makeTrackers(2, 0)
+	counts := map[string]int{}
+
+	total := 100
+	for i := 0; i < total; i++ {
+		cb, pt := randomChoice2Policy(context.Background(), podTrackers)
+		cb()
+		counts[pt.dest]++
+	}
+
+	first := counts[podTrackers[0].dest]
+	second := counts[podTrackers[1].dest]
+
+	// probability of this occurring is 0.5^100
+	if first == 0 {
+		t.Error("expected the first tracker to get some requests")
+	}
+	if second == 0 {
+		t.Error("expected the second tracker to get some requests")
+	}
+	if first+second != total {
+		t.Error("expected total requests to equal 100 - was ", first+second)
+	}
+}
+
 func TestRandomChoice2(t *testing.T) {
 	t.Run("1 tracker", func(t *testing.T) {
 		podTrackers := makeTrackers(1, 0)