diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 64887a08b41..1e59c02c25a 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-9-release-golang-1.22-openshift-4.18 + tag: rhel-9-release-golang-1.22-openshift-4.17 diff --git a/Dockerfile.art b/Dockerfile.art index be01f479e97..7fb9b80915b 100644 --- a/Dockerfile.art +++ b/Dockerfile.art @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR WORKDIR $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app @@ -10,7 +10,7 @@ RUN mkdir -p /go/src/go.etcd.io/ RUN ln -s $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app /go/src/go.etcd.io/etcd # stage 2 (note: any changes should reflect in Dockerfile.rhel) -FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 ENTRYPOINT ["/usr/bin/etcd"] diff --git a/Dockerfile.art-cachi2 b/Dockerfile.art-cachi2 index 9cf5d998ac4..6b865663205 100644 --- a/Dockerfile.art-cachi2 +++ b/Dockerfile.art-cachi2 @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder WORKDIR /go/src/go.etcd.io/etcd COPY . . diff --git a/Dockerfile.installer b/Dockerfile.installer index ae2c7a4d122..4a7962d6cd3 100644 --- a/Dockerfile.installer +++ b/Dockerfile.installer @@ -1,31 +1,31 @@ # This Dockerfile builds an image containing Mac and Linux ARM64/AMD64 versions of the etcd. # The resulting image is used to build the statically-linked openshift-installer binary. -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS macbuilder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS macbuilder ENV GO_COMPLIANCE_EXCLUDE=".*" WORKDIR /go/src/go.etcd.io/etcd COPY . . RUN CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 GOFLAGS='-mod=readonly' GO_BUILD_FLAGS='-v' ./build.sh -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS macarmbuilder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS macarmbuilder ENV GO_COMPLIANCE_EXCLUDE=".*" WORKDIR /go/src/go.etcd.io/etcd COPY . . RUN CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 GOFLAGS='-mod=readonly' GO_BUILD_FLAGS='-v' ./build.sh -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS linuxbuilder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS linuxbuilder ENV GO_COMPLIANCE_EXCLUDE=".*" WORKDIR /go/src/go.etcd.io/etcd COPY . . RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GOFLAGS='-mod=readonly' GO_BUILD_FLAGS='-v' ./build.sh -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS linuxarmbuilder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS linuxarmbuilder ENV GO_COMPLIANCE_EXCLUDE=".*" WORKDIR /go/src/go.etcd.io/etcd COPY . . RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm64 GOFLAGS='-mod=readonly' GO_BUILD_FLAGS='-v' ./build.sh -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder ENV GO_COMPLIANCE_EXCLUDE=".*" WORKDIR /go/src/go.etcd.io/etcd COPY . . @@ -34,9 +34,7 @@ RUN mkdir -p /usr/share/openshift/$(go env GOOS)/$(go env GOHOSTARCH) && \ mv bin/etcd /usr/share/openshift/$(go env GOOS)/$(go env GOHOSTARCH)/ # stage 2 -FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 - -RUN yum install --setopt=tsflags=nodocs -y jq && yum clean all && rm -rf /var/cache/yum/* +FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 COPY --from=macbuilder /go/src/go.etcd.io/etcd/bin/etcd /usr/share/openshift/darwin/amd64/etcd COPY --from=macarmbuilder /go/src/go.etcd.io/etcd/bin/etcd /usr/share/openshift/darwin/arm64/etcd diff --git a/Dockerfile.installer.art b/Dockerfile.installer.art index bbe1dbd6f33..c4b1f347cb8 100644 --- a/Dockerfile.installer.art +++ b/Dockerfile.installer.art @@ -1,7 +1,7 @@ # This Dockerfile builds an image containing Mac and Linux ARM64/AMD64 versions of the etcd. # The resulting image is used to build the statically-linked openshift-installer binary. -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS macbuilder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS macbuilder ENV GO_COMPLIANCE_EXCLUDE=".*" COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR @@ -15,7 +15,7 @@ RUN source $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env \ && export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \ && CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 ./build.sh -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS macarmbuilder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS macarmbuilder ENV GO_COMPLIANCE_EXCLUDE=".*" COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR @@ -29,7 +29,7 @@ RUN source $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env \ && export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \ && CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 ./build.sh -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS linuxbuilder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS linuxbuilder ENV GO_COMPLIANCE_EXCLUDE=".*" COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR @@ -43,7 +43,7 @@ RUN source $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env \ && export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \ && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 ./build.sh -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS linuxarmbuilder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS linuxarmbuilder ENV GO_COMPLIANCE_EXCLUDE=".*" COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR @@ -57,7 +57,7 @@ RUN source $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env \ && export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \ && CGO_ENABLED=0 GOOS=linux GOARCH=arm64 ./build.sh -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder ENV GO_COMPLIANCE_EXCLUDE=".*" COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR WORKDIR $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app @@ -73,9 +73,7 @@ RUN mkdir -p /usr/share/openshift/$(go env GOOS)/$(go env GOHOSTARCH) && \ mv bin/etcd /usr/share/openshift/$(go env GOOS)/$(go env GOHOSTARCH)/ # stage 2 -FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 - -RUN yum install --setopt=tsflags=nodocs -y jq && yum clean all && rm -rf /var/cache/yum/* +FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 COPY --from=macbuilder /go/src/go.etcd.io/etcd/bin/etcd /usr/share/openshift/darwin/amd64/etcd COPY --from=macarmbuilder /go/src/go.etcd.io/etcd/bin/etcd /usr/share/openshift/darwin/arm64/etcd diff --git a/Dockerfile.installer.art-cachi2 b/Dockerfile.installer.art-cachi2 index 7902bbab57d..c0ac71fd88e 100644 --- a/Dockerfile.installer.art-cachi2 +++ b/Dockerfile.installer.art-cachi2 @@ -1,18 +1,17 @@ # This Dockerfile builds an image containing Mac and Linux ARM64/AMD64 versions of the etcd. # The resulting image is used to build the statically-linked openshift-installer binary. -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS macbuilder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS macbuilder ENV GO_COMPLIANCE_EXCLUDE=".*" WORKDIR /go/src/go.etcd.io/etcd COPY . . -RUN find $GOPATH RUN export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \ && CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 ./build.sh -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS macarmbuilder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS macarmbuilder ENV GO_COMPLIANCE_EXCLUDE=".*" @@ -22,7 +21,7 @@ COPY . . RUN export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \ && CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 ./build.sh -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS linuxbuilder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS linuxbuilder ENV GO_COMPLIANCE_EXCLUDE=".*" @@ -31,7 +30,7 @@ COPY . . RUN export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \ && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 ./build.sh -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS linuxarmbuilder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS linuxarmbuilder ENV GO_COMPLIANCE_EXCLUDE=".*" @@ -40,7 +39,7 @@ COPY . . RUN export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \ && CGO_ENABLED=0 GOOS=linux GOARCH=arm64 ./build.sh -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder ENV GO_COMPLIANCE_EXCLUDE=".*" WORKDIR /go/src/go.etcd.io/etcd @@ -51,7 +50,7 @@ RUN mkdir -p /usr/share/openshift/$(go env GOOS)/$(go env GOHOSTARCH) && \ mv bin/etcd /usr/share/openshift/$(go env GOOS)/$(go env GOHOSTARCH)/ # stage 2 -FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 RUN yum install --setopt=tsflags=nodocs -y jq && yum clean all && rm -rf /var/cache/yum/* diff --git a/Dockerfile.rhel b/Dockerfile.rhel index b500e1edce3..cfd474505e7 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder WORKDIR /go/src/go.etcd.io/etcd @@ -8,7 +8,7 @@ COPY . . RUN GOFLAGS='-mod=readonly' GO_BUILD_FLAGS='-v' ./build.sh # stage 2 (note: any changes should reflect in Dockerfile.art) -FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 ENTRYPOINT ["/usr/bin/etcd"] diff --git a/client/v3/patch_cluster.go b/client/v3/patch_cluster.go index b629628850b..a6311746cc2 100644 --- a/client/v3/patch_cluster.go +++ b/client/v3/patch_cluster.go @@ -20,5 +20,5 @@ func (c *cluster) NonLinearizeableMemberList(ctx context.Context) (*MemberListRe if err == nil { return (*MemberListResponse)(resp), nil } - return nil, toErr(ctx, err) -} \ No newline at end of file + return nil, ContextError(ctx, err) +} diff --git a/go.mod b/go.mod index a17d9174826..3768c361cba 100644 --- a/go.mod +++ b/go.mod @@ -21,6 +21,7 @@ require ( github.com/bgentry/speakeasy v0.1.0 github.com/dustin/go-humanize v1.0.0 github.com/spf13/cobra v1.1.3 + github.com/spf13/pflag v1.0.5 go.etcd.io/bbolt v1.3.11 go.etcd.io/etcd/api/v3 v3.5.18 go.etcd.io/etcd/client/pkg/v3 v3.5.18 @@ -71,7 +72,6 @@ require ( github.com/prometheus/procfs v0.6.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/soheilhy/cmux v0.1.5 // indirect - github.com/spf13/pflag v1.0.5 // indirect github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect @@ -95,9 +95,4 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect sigs.k8s.io/yaml v1.2.0 // indirect - go.etcd.io/gofail v0.2.0 // indirect - github.com/urfave/cli v1.22.4 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect - github.com/russross/blackfriday/v2 v2.0.1 //indirect - github.com/shurcooL/sanitized_anchor_name v1.0.0 //indirect )