Skip to content

Commit c543fe1

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request openshift#375 from dusk125/5.0-rebase-3.6.11
OCPBUGS-85258: 5.0 rebase 3.6.11
2 parents 7fff975 + 67297a5 commit c543fe1

41 files changed

Lines changed: 863 additions & 664 deletions

Some content is hidden

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

‎.ci-operator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-9-release-golang-1.25-openshift-4.23
4+
tag: rhel-9-release-golang-1.25-openshift-5.0

‎.go-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.25.8
1+
1.25.9

‎Dockerfile.art-cachi2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.23 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0 AS builder
22

33
WORKDIR /go/src/go.etcd.io/etcd
44
COPY . .
55
RUN GOFLAGS='-mod=readonly' GO_BUILD_FLAGS='-v' ./build.sh
66

77
# stage 2 (note: any changes should reflect in Dockerfile.rhel)
8-
FROM registry.ci.openshift.org/ocp/4.23:base-rhel9
8+
FROM registry.ci.openshift.org/ocp/5.0:base-rhel9
99

1010
ENTRYPOINT ["/usr/bin/etcd"]
1111

‎Dockerfile.installer‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
# This Dockerfile builds an image containing Mac and Linux ARM64/AMD64 versions of the etcd.
22
# The resulting image is used to build the statically-linked openshift-installer binary.
33

4-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.23 AS macbuilder
4+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0 AS macbuilder
55
ENV GO_COMPLIANCE_EXCLUDE=".*"
66
WORKDIR /go/src/go.etcd.io/etcd
77
COPY . .
88
RUN CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 GOFLAGS='-mod=readonly' GO_BUILD_FLAGS='-v' ./build.sh
99

10-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.23 AS macarmbuilder
10+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0 AS macarmbuilder
1111
ENV GO_COMPLIANCE_EXCLUDE=".*"
1212
WORKDIR /go/src/go.etcd.io/etcd
1313
COPY . .
1414
RUN CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 GOFLAGS='-mod=readonly' GO_BUILD_FLAGS='-v' ./build.sh
1515

16-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.23 AS linuxbuilder
16+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0 AS linuxbuilder
1717
ENV GO_COMPLIANCE_EXCLUDE=".*"
1818
WORKDIR /go/src/go.etcd.io/etcd
1919
COPY . .
2020
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GOFLAGS='-mod=readonly' GO_BUILD_FLAGS='-v' ./build.sh
2121

22-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.23 AS linuxarmbuilder
22+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0 AS linuxarmbuilder
2323
ENV GO_COMPLIANCE_EXCLUDE=".*"
2424
WORKDIR /go/src/go.etcd.io/etcd
2525
COPY . .
2626
RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm64 GOFLAGS='-mod=readonly' GO_BUILD_FLAGS='-v' ./build.sh
2727

28-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.23 AS builder
28+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0 AS builder
2929
ENV GO_COMPLIANCE_EXCLUDE=".*"
3030
WORKDIR /go/src/go.etcd.io/etcd
3131
COPY . .
@@ -34,7 +34,7 @@ RUN mkdir -p /usr/share/openshift/$(go env GOOS)/$(go env GOHOSTARCH) && \
3434
mv bin/etcd /usr/share/openshift/$(go env GOOS)/$(go env GOHOSTARCH)/
3535

3636
# stage 2
37-
FROM registry.ci.openshift.org/ocp/4.23:base-rhel9
37+
FROM registry.ci.openshift.org/ocp/5.0:base-rhel9
3838

3939
RUN yum install --setopt=tsflags=nodocs -y jq && yum clean all && rm -rf /var/cache/yum/*
4040

‎Dockerfile.installer.art-cachi2‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This Dockerfile builds an image containing Mac and Linux ARM64/AMD64 versions of the etcd.
22
# The resulting image is used to build the statically-linked openshift-installer binary.
33

4-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.23 AS macbuilder
4+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0 AS macbuilder
55

66
ENV GO_COMPLIANCE_EXCLUDE=".*"
77

@@ -12,7 +12,7 @@ RUN find $GOPATH
1212
RUN export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \
1313
&& CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 ./build.sh
1414

15-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.23 AS macarmbuilder
15+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0 AS macarmbuilder
1616

1717
ENV GO_COMPLIANCE_EXCLUDE=".*"
1818

@@ -22,7 +22,7 @@ COPY . .
2222
RUN export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \
2323
&& CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 ./build.sh
2424

25-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.23 AS linuxbuilder
25+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0 AS linuxbuilder
2626

2727
ENV GO_COMPLIANCE_EXCLUDE=".*"
2828

@@ -31,7 +31,7 @@ COPY . .
3131
RUN export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \
3232
&& CGO_ENABLED=0 GOOS=linux GOARCH=amd64 ./build.sh
3333

34-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.23 AS linuxarmbuilder
34+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0 AS linuxarmbuilder
3535

3636
ENV GO_COMPLIANCE_EXCLUDE=".*"
3737

@@ -40,7 +40,7 @@ COPY . .
4040
RUN export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \
4141
&& CGO_ENABLED=0 GOOS=linux GOARCH=arm64 ./build.sh
4242

43-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.23 AS builder
43+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0 AS builder
4444
ENV GO_COMPLIANCE_EXCLUDE=".*"
4545

4646
WORKDIR /go/src/go.etcd.io/etcd
@@ -51,7 +51,7 @@ RUN mkdir -p /usr/share/openshift/$(go env GOOS)/$(go env GOHOSTARCH) && \
5151
mv bin/etcd /usr/share/openshift/$(go env GOOS)/$(go env GOHOSTARCH)/
5252

5353
# stage 2
54-
FROM registry.ci.openshift.org/ocp/4.23:base-rhel9
54+
FROM registry.ci.openshift.org/ocp/5.0:base-rhel9
5555

5656
RUN yum install --setopt=tsflags=nodocs -y jq && yum clean all && rm -rf /var/cache/yum/*
5757

‎Dockerfile.rhel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.23 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-5.0 AS builder
22

33
WORKDIR /go/src/go.etcd.io/etcd
44

@@ -8,7 +8,7 @@ COPY . .
88
RUN GOFLAGS='-mod=readonly' GO_BUILD_FLAGS='-v' ./build.sh
99

1010
# stage 2 (note: any changes should reflect in Dockerfile.art)
11-
FROM registry.ci.openshift.org/ocp/4.23:base-rhel9
11+
FROM registry.ci.openshift.org/ocp/5.0:base-rhel9
1212

1313
ENTRYPOINT ["/usr/bin/etcd"]
1414

‎api/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/api/v3
22

33
go 1.25.0
44

5-
toolchain go1.25.8
5+
toolchain go1.25.9
66

77
require (
88
github.com/coreos/go-semver v0.3.1
@@ -20,9 +20,9 @@ require (
2020
github.com/kr/text v0.2.0 // indirect
2121
github.com/pmezard/go-difflib v1.0.0 // indirect
2222
github.com/rogpeppe/go-internal v1.14.1 // indirect
23-
golang.org/x/net v0.51.0 // indirect
24-
golang.org/x/sys v0.41.0 // indirect
25-
golang.org/x/text v0.35.0 // indirect
23+
golang.org/x/net v0.52.0 // indirect
24+
golang.org/x/sys v0.42.0 // indirect
25+
golang.org/x/text v0.36.0 // indirect
2626
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
2727
gopkg.in/yaml.v3 v3.0.1 // indirect
2828
)

‎api/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
5454
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
5555
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
5656
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
57-
golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
58-
golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=
57+
golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
58+
golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
5959
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
6060
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
6161
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
6262
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
6363
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
6464
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
65-
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
66-
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
65+
golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
66+
golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
6767
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
6868
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
69-
golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
70-
golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
69+
golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
70+
golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
7171
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
7272
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
7373
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=

‎api/version/version.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
var (
2727
// MinClusterVersion is the min cluster version this etcd binary is compatible with.
2828
MinClusterVersion = "3.0.0"
29-
Version = "3.6.10"
29+
Version = "3.6.11"
3030
APIVersion = "unknown"
3131

3232
// Git SHA Value will be set during build

‎client/pkg/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ module go.etcd.io/etcd/client/pkg/v3
22

33
go 1.25.0
44

5-
toolchain go1.25.8
5+
toolchain go1.25.9
66

77
require (
88
github.com/coreos/go-systemd/v22 v22.5.0
99
github.com/stretchr/testify v1.11.1
1010
go.uber.org/zap v1.27.0
11-
golang.org/x/sys v0.41.0
11+
golang.org/x/sys v0.42.0
1212
)
1313

1414
require (

0 commit comments

Comments
 (0)