Skip to content

Commit

Permalink
Simplify etcd image release process.
Browse files Browse the repository at this point in the history 
Only test and publish the single multi arch image.

Signed-off-by: James Blair <mail@jamesblair.net>
  • Loading branch information
@jmhbnz
jmhbnz committed Mar 31, 2023
1 parent c3b3f2b commit faf02cc
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 41 deletions.
2 changes: 1 addition & 1 deletion api/version/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
var (
// MinClusterVersion is the min cluster version this etcd binary is compatible with.
MinClusterVersion = "3.0.0"
Version = "3.6.0-alpha.0"
Version = "3.6.99"
APIVersion = "unknown"

// Git SHA Value will be set during build
Expand Down
4 changes: 2 additions & 2 deletions client/internal/v2/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module go.etcd.io/etcd/client/v2
go 1.19

require (
go.etcd.io/etcd/api/v3 v3.6.0-alpha.0
go.etcd.io/etcd/client/pkg/v3 v3.6.0-alpha.0
go.etcd.io/etcd/api/v3 v3.6.99
go.etcd.io/etcd/client/pkg/v3 v3.6.99
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6
)

Expand Down
4 changes: 2 additions & 2 deletions client/v3/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/prometheus/client_golang v1.14.0
github.com/stretchr/testify v1.8.2
go.etcd.io/etcd/api/v3 v3.6.0-alpha.0
go.etcd.io/etcd/client/pkg/v3 v3.6.0-alpha.0
go.etcd.io/etcd/api/v3 v3.6.99
go.etcd.io/etcd/client/pkg/v3 v3.6.99
go.uber.org/zap v1.24.0
google.golang.org/grpc v1.51.0
sigs.k8s.io/yaml v1.3.0
Expand Down
8 changes: 4 additions & 4 deletions etcdctl/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ require (
github.com/olekukonko/tablewriter v0.0.5
github.com/spf13/cobra v1.6.1
github.com/spf13/pflag v1.0.5
go.etcd.io/etcd/api/v3 v3.6.0-alpha.0
go.etcd.io/etcd/client/pkg/v3 v3.6.0-alpha.0
go.etcd.io/etcd/client/v3 v3.6.0-alpha.0
go.etcd.io/etcd/pkg/v3 v3.6.0-alpha.0
go.etcd.io/etcd/api/v3 v3.6.99
go.etcd.io/etcd/client/pkg/v3 v3.6.99
go.etcd.io/etcd/client/v3 v3.6.99
go.etcd.io/etcd/pkg/v3 v3.6.99
go.uber.org/zap v1.24.0
golang.org/x/time v0.3.0
google.golang.org/grpc v1.51.0
Expand Down
12 changes: 6 additions & 6 deletions etcdutl/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ require (
github.com/olekukonko/tablewriter v0.0.5
github.com/spf13/cobra v1.6.1
go.etcd.io/bbolt v1.3.7
go.etcd.io/etcd/api/v3 v3.6.0-alpha.0
go.etcd.io/etcd/client/pkg/v3 v3.6.0-alpha.0
go.etcd.io/etcd/client/v3 v3.6.0-alpha.0
go.etcd.io/etcd/pkg/v3 v3.6.0-alpha.0
go.etcd.io/etcd/server/v3 v3.6.0-alpha.0
go.etcd.io/etcd/api/v3 v3.6.99
go.etcd.io/etcd/client/pkg/v3 v3.6.99
go.etcd.io/etcd/client/v3 v3.6.99
go.etcd.io/etcd/pkg/v3 v3.6.99
go.etcd.io/etcd/server/v3 v3.6.99
go.etcd.io/raft/v3 v3.0.0-20221201111702-eaa6808e1f7a
go.uber.org/zap v1.24.0
)
Expand All @@ -54,7 +54,7 @@ require (
github.com/prometheus/procfs v0.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
go.etcd.io/etcd/client/v2 v2.306.0-alpha.0 // indirect
go.etcd.io/etcd/client/v2 v2.306.99 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.37.0 // indirect
go.opentelemetry.io/otel v1.14.0 // indirect
go.opentelemetry.io/otel/metric v0.34.0 // indirect
Expand Down
18 changes: 9 additions & 9 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ require (
github.com/spf13/cobra v1.6.1
github.com/stretchr/testify v1.8.2
go.etcd.io/bbolt v1.3.7
go.etcd.io/etcd/api/v3 v3.6.0-alpha.0
go.etcd.io/etcd/client/pkg/v3 v3.6.0-alpha.0
go.etcd.io/etcd/client/v2 v2.306.0-alpha.0
go.etcd.io/etcd/client/v3 v3.6.0-alpha.0
go.etcd.io/etcd/etcdctl/v3 v3.6.0-alpha.0
go.etcd.io/etcd/etcdutl/v3 v3.6.0-alpha.0
go.etcd.io/etcd/pkg/v3 v3.6.0-alpha.0
go.etcd.io/etcd/server/v3 v3.6.0-alpha.0
go.etcd.io/etcd/tests/v3 v3.6.0-alpha.0
go.etcd.io/etcd/api/v3 v3.6.99
go.etcd.io/etcd/client/pkg/v3 v3.6.99
go.etcd.io/etcd/client/v2 v2.306.99
go.etcd.io/etcd/client/v3 v3.6.99
go.etcd.io/etcd/etcdctl/v3 v3.6.99
go.etcd.io/etcd/etcdutl/v3 v3.6.99
go.etcd.io/etcd/pkg/v3 v3.6.99
go.etcd.io/etcd/server/v3 v3.6.99
go.etcd.io/etcd/tests/v3 v3.6.99
go.etcd.io/raft/v3 v3.0.0-20221201111702-eaa6808e1f7a
go.uber.org/zap v1.24.0
golang.org/x/time v0.3.0
Expand Down
2 changes: 1 addition & 1 deletion pkg/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/spf13/cobra v1.6.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.2
go.etcd.io/etcd/client/pkg/v3 v3.6.0-alpha.0
go.etcd.io/etcd/client/pkg/v3 v3.6.99
go.uber.org/zap v1.24.0
google.golang.org/grpc v1.51.0
)
Expand Down
3 changes: 0 additions & 3 deletions scripts/release.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,6 @@ main() {

# Check image versions
for IMAGE in "quay.io/coreos/etcd:${RELEASE_VERSION}" "gcr.io/etcd-development/etcd:${RELEASE_VERSION}"; do
if [ "${DRY_RUN}" == "true" ] || [ "${NO_DOCKER_PUSH}" == 1 ]; then
IMAGE="${IMAGE}-amd64"
fi
# shellcheck disable=SC2155
local image_version=$(docker run --rm "${IMAGE}" etcd --version | grep "etcd Version" | awk -F: '{print $2}' | tr -d '[:space:]')
if [ "${image_version}" != "${VERSION}" ]; then
Expand Down
10 changes: 5 additions & 5 deletions server/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ require (
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2
go.etcd.io/bbolt v1.3.7
go.etcd.io/etcd/api/v3 v3.6.0-alpha.0
go.etcd.io/etcd/client/pkg/v3 v3.6.0-alpha.0
go.etcd.io/etcd/client/v2 v2.306.0-alpha.0
go.etcd.io/etcd/client/v3 v3.6.0-alpha.0
go.etcd.io/etcd/pkg/v3 v3.6.0-alpha.0
go.etcd.io/etcd/api/v3 v3.6.99
go.etcd.io/etcd/client/pkg/v3 v3.6.99
go.etcd.io/etcd/client/v2 v2.306.99
go.etcd.io/etcd/client/v3 v3.6.99
go.etcd.io/etcd/pkg/v3 v3.6.99
go.etcd.io/raft/v3 v3.0.0-20221201111702-eaa6808e1f7a
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.37.0
go.opentelemetry.io/otel v1.14.0
Expand Down
16 changes: 8 additions & 8 deletions tests/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ require (
github.com/prometheus/common v0.37.0
github.com/soheilhy/cmux v0.1.5
github.com/stretchr/testify v1.8.2
go.etcd.io/etcd/api/v3 v3.6.0-alpha.0
go.etcd.io/etcd/client/pkg/v3 v3.6.0-alpha.0
go.etcd.io/etcd/client/v2 v2.306.0-alpha.0
go.etcd.io/etcd/client/v3 v3.6.0-alpha.0
go.etcd.io/etcd/etcdctl/v3 v3.6.0-alpha.0
go.etcd.io/etcd/etcdutl/v3 v3.6.0-alpha.0
go.etcd.io/etcd/pkg/v3 v3.6.0-alpha.0
go.etcd.io/etcd/server/v3 v3.6.0-alpha.0
go.etcd.io/etcd/api/v3 v3.6.99
go.etcd.io/etcd/client/pkg/v3 v3.6.99
go.etcd.io/etcd/client/v2 v2.306.99
go.etcd.io/etcd/client/v3 v3.6.99
go.etcd.io/etcd/etcdctl/v3 v3.6.99
go.etcd.io/etcd/etcdutl/v3 v3.6.99
go.etcd.io/etcd/pkg/v3 v3.6.99
go.etcd.io/etcd/server/v3 v3.6.99
go.etcd.io/raft/v3 v3.0.0-20221201111702-eaa6808e1f7a
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.37.0
go.opentelemetry.io/otel v1.14.0
Expand Down

0 comments on commit faf02cc

Please sign in to comment.