Merge #137621 #137635

137621: release: update docker labels for Red Hat Connect images r=jlinder,rickystewart a=rail Recently Red Hat Connect stopped accepting our docker images, because they introduced a new requirement for labels. The current publishing tasks fail with the following error: > HasRequiredLabel: Failed > Checking if the required labels (name, vendor, version, release, summary, description, maintainer) are present in the container metadata and that they do not violate Red Hat trademark. This PR adds a new static label "maintainer" and dynamically adds the "version" label. Fixes: RE-769 Release note: None Release justification: release automation changes 137635: kvserver: change TestReplicaRaftOverload to use apply_to_elastic r=kvoli a=sumeerbhola This ensures it will pass when the default mode is changed to apply_to_all. Informs #136215 Epic: CRDB-37515 Release note: None Co-authored-by: Rail Aliiev <[email protected]> Co-authored-by: sumeerbhola <[email protected]>
cockroachdb · Dec 17, 2024 · ed5e1fe · ed5e1fe
3 parents 6384c0d + 2345fdc + fce7e7d
commit ed5e1fe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/build/deploy-redhat/Dockerfile.in b/build/deploy-redhat/Dockerfile.in
@@ -6,6 +6,7 @@ RUN microdnf install -y yum && \
   rm -rf /var/cache/yum
 
 LABEL name="CockroachDB"
+LABEL maintainer="Cockroach Labs"
 LABEL vendor="Cockroach Labs"
 LABEL summary="CockroachDB is a distributed SQL database."
 LABEL description="CockroachDB is a PostgreSQL wire-compatable distributed SQL database."

diff --git a/build/teamcity/internal/cockroach/release/publish/publish-redhat-release.sh b/build/teamcity/internal/cockroach/release/publish/publish-redhat-release.sh
@@ -54,6 +54,7 @@ cat build/deploy-redhat/Dockerfile
 docker build --no-cache \
   --pull \
   --label release=$rhel_release \
+  --label version=$version \
   --tag="${rhel_repository}:${version}" \
   build/deploy-redhat
 tc_end_block "Rebuild docker image"

diff --git a/pkg/kv/kvserver/client_replica_raft_overload_test.go b/pkg/kv/kvserver/client_replica_raft_overload_test.go
@@ -59,6 +59,10 @@ func TestReplicaRaftOverload(t *testing.T) {
 	{
 		_, err := tc.ServerConn(0).Exec(`SET CLUSTER SETTING admission.kv.pause_replication_io_threshold = 1.0`)
 		require.NoError(t, err)
+		// Replica pausing is disabled in apply_to_all mode, so make sure the
+		// cluster is running with a setting where replica pausing is enabled.
+		_, err = tc.ServerConn(0).Exec(`SET CLUSTER SETTING kvadmission.flow_control.mode = "apply_to_elastic"`)
+		require.NoError(t, err)
 	}
 	k := tc.ScratchRange(t)
 	tc.AddVotersOrFatal(t, k, tc.Targets(1, 2)...)