Skip to content

Commit a78d085

Browse files
craig[bot]mgartnerwenyihu6bghaldhartunian
committed
153000: sql: fix incorrect min timestamp error check r=mgartner a=mgartner This commit fixes a check for a min timestamp error that would always return false. Release note: None 153008: kvserver: invoke callback when SetMaxSize drops replicas r=wenyihu6 a=wenyihu6 Epic: none Release note: none --- **kvserver: invoke callback when dropping replicas in bq.SetMaxSize** Previously, when SetMaxSize shrank the queue, replicas were dropped from the priority queue without invoking their callbacks. This commit ensures callbacks are properly invoked when SetMaxSize drops replicas. Replicas removed via removeFromReplicaSetLocked (such as when a replica is destroyed) still don’t always have their callbacks invoked. While the natural place to invoke the callback would be at removeFromReplicaSetLocked, invoking callbacks while holding a lock risks blocking for too long. (We are doing this already for addInternal though.) This PR focuses specifically on handling the SetMaxSize case since this PR is intended to be backported. We can follow up with a more complex but more principled approach on master if needed in the future. 153042: sql: fix single descriptor lookup r=bghal a=bghal The LLM bug-finder found this bug introduced in #150188. This addresses the issue. Epic: none Release note: None 153053: server: add SucceedsSoon to some CheckRestartSafe tests r=dhartunian a=dhartunian These tests are often waiting on internal signals which are asynchronous and hence should not fail immediately. Resolves: #152143 Resolves: #152198 Resolves: #151676 Epic: None Release note: None 153166: cloud/kubernetes: update manifests and enhance security r=shreyaskm623 a=shreyaskm623 This commit updates the Kubernetes deployment manifests by removing deprecated APIs, enhancing security with IMDSv2, improving ARM compatibility, and cleaning up legacy files. Key changes: Update PodDisruptionBudget API from policy/v1beta1 to policy/v1 Replace byrnedo/alpine-curl:0.1 with 3.20 for ARM64 support Implement IMDSv2 for secure AWS metadata access in EKS deployments Remove deprecated v1.6 and v1.7 directories (22 legacy files) Regenerate all manifest files from updated templates Release notes: none Epic: CRDB-49252 Co-authored-by: Marcus Gartner <[email protected]> Co-authored-by: wenyihu6 <[email protected]> Co-authored-by: Brendan Gerrity <[email protected]> Co-authored-by: David Hartunian <[email protected]> Co-authored-by: Shreyas KM <[email protected]>
6 parents bf78585 + 5af6250 + 7d9f922 + 8badfbd + 7f45c4b + 009fd29 commit a78d085

File tree

48 files changed

+328
-1163
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+328
-1163
lines changed

cloud/kubernetes/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ kubectl run cockroachdb --image=cockroachdb/cockroach --restart=Never -- start-s
2525
### Kubernetes version
2626

2727
The minimum Kubernetes version to successfully run the examples in this
28-
directory without modification is `1.8`. If you want to run them on an older
28+
directory without modification is `1.21`. If you want to run them on an older
2929
version of Kubernetes, use the files from the appropriate subdirectory (e.g. the
30-
`v1.7` directory for Kubernetes 1.7 or the `v1.6` directory for Kubernetes 1.6).
30+
`v1.20` directory for Kubernetes 1.20).
3131
Older Kubernetes versions that don't have their own directory are no longer
3232
supported.
3333

cloud/kubernetes/bring-your-own-certs/cockroachdb-statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ spec:
111111
selector:
112112
app: cockroachdb
113113
---
114-
apiVersion: policy/v1beta1
114+
apiVersion: policy/v1
115115
kind: PodDisruptionBudget
116116
metadata:
117117
name: cockroachdb-budget

cloud/kubernetes/cockroachdb-statefulset-secure.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ spec:
125125
selector:
126126
app: cockroachdb
127127
---
128-
apiVersion: policy/v1beta1
128+
apiVersion: policy/v1
129129
kind: PodDisruptionBudget
130130
metadata:
131131
name: cockroachdb-budget

cloud/kubernetes/cockroachdb-statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ spec:
5757
selector:
5858
app: cockroachdb
5959
---
60-
apiVersion: policy/v1beta1
60+
apiVersion: policy/v1
6161
kind: PodDisruptionBudget
6262
metadata:
6363
name: cockroachdb-budget

cloud/kubernetes/multiregion/cockroachdb-statefulset-secure.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ spec:
125125
selector:
126126
app: cockroachdb
127127
---
128-
apiVersion: policy/v1beta1
128+
apiVersion: policy/v1
129129
kind: PodDisruptionBudget
130130
metadata:
131131
name: cockroachdb-budget

cloud/kubernetes/multiregion/eks/cockroachdb-statefulset-secure-eks.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ spec:
125125
selector:
126126
app: cockroachdb
127127
---
128-
apiVersion: policy/v1beta1
128+
apiVersion: policy/v1
129129
kind: PodDisruptionBudget
130130
metadata:
131131
name: cockroachdb-budget
@@ -172,9 +172,13 @@ spec:
172172
- command:
173173
- sh
174174
- -ecx
175-
- echo "aws-$(curl http://169.254.169.254/latest/meta-data/placement/availability-zone/)"
176-
> /etc/cockroach-env/zone
177-
image: byrnedo/alpine-curl:0.1
175+
- |
176+
TOKEN=$(curl -X PUT "http://169.254.169.254/latest/api/token" \
177+
-H "X-aws-ec2-metadata-token-ttl-seconds: 21600")
178+
echo "aws-$(curl -H "X-aws-ec2-metadata-token: $TOKEN" \
179+
http://169.254.169.254/latest/meta-data/placement/availability-zone/)" \
180+
> /etc/cockroach-env/zone
181+
image: byrnedo/alpine-curl:3.20
178182
imagePullPolicy: IfNotPresent
179183
name: locality-container
180184
resources: {}

cloud/kubernetes/performance/cockroachdb-daemonset-insecure.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
selector:
3636
app: cockroachdb
3737
---
38-
apiVersion: policy/v1beta1
38+
apiVersion: policy/v1
3939
kind: PodDisruptionBudget
4040
metadata:
4141
name: cockroachdb-budget

cloud/kubernetes/performance/cockroachdb-daemonset-secure.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ spec:
106106
selector:
107107
app: cockroachdb
108108
---
109-
apiVersion: policy/v1beta1
109+
apiVersion: policy/v1
110110
kind: PodDisruptionBudget
111111
metadata:
112112
name: cockroachdb-budget

cloud/kubernetes/performance/cockroachdb-statefulset-insecure.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ spec:
8383
selector:
8484
app: cockroachdb
8585
---
86-
apiVersion: policy/v1beta1
86+
apiVersion: policy/v1
8787
kind: PodDisruptionBudget
8888
metadata:
8989
name: cockroachdb-budget

cloud/kubernetes/performance/cockroachdb-statefulset-secure.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ spec:
145145
selector:
146146
app: cockroachdb
147147
---
148-
apiVersion: policy/v1beta1
148+
apiVersion: policy/v1
149149
kind: PodDisruptionBudget
150150
metadata:
151151
name: cockroachdb-budget

0 commit comments

Comments
 (0)