WIP: Rebase etcd 3.6.9 on openshift-4.22

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.24-openshift-4.22
+  tag: rhel-9-release-golang-1.25-openshift-4.22

.go-version

@@ -1 +1 @@
-1.24.7
+1.25.8

CLAUDE.md

@@ -0,0 +1,140 @@
+# Claude Code Instructions for openshift/etcd
+
+## Repository Overview
+
+This is the OpenShift fork of [etcd-io/etcd](https://github.com/etcd-io/etcd). It tracks upstream etcd releases with downstream patches applied on top for OpenShift integration.
+
+### Remotes
+
+- `origin` = `git@github.com:openshift/etcd` (the OpenShift fork)
+- `upstream` = `https://github.com/etcd-io/etcd` (upstream etcd)
+- User forks are added as needed for PRs
+
+### Branch Naming
+
+- `openshift-4.XX` branches track specific OpenShift releases
+- Rebase branches follow the pattern `rebase-etcd-<version>-openshift-<release>`
+
+## Upstream Rebase Procedure
+
+When asked to rebase to a new upstream etcd version (e.g., "rebase v3.6.9"), follow these steps:
+
+### 1. Identify the Current Upstream Base
+
+Find which upstream tag the current branch is based on. Look for a commit like `version: bump up to 3.6.X` in the log, or check the most recent upstream tag that is an ancestor:
+
+```
+git log --oneline | grep "version: bump up to"
+```
+
+### 2. Identify Downstream Patches
+
+List all commits on top of the current upstream base:
+
+```
+git log --oneline <current-upstream-tag>..HEAD --no-merges
+```
+
+Categorize each commit:
+
+- **`DOWNSTREAM: <carry>:`** - Must be cherry-picked onto the new base. These are ongoing downstream patches.
+- **`DOWNSTREAM: <drop>:`** - Skip these. They were fixups specific to the previous upstream version.
+- **Merge commits** - Skip these. They will be replaced by the new rebase structure.
+- **Other downstream commits** (ART image updates, Dockerfile changes, Konflux/cachi2 support, etc.) - Carry these forward unless they are clearly version-specific.
+
+### 3. Create the Rebase Branch
+
+```
+git checkout -b rebase-etcd-<new-version>-openshift-<release> <new-upstream-tag>
+```
+
+### 4. Cherry-pick Carry Patches
+
+Cherry-pick in chronological order (oldest first). Resolve conflicts as they arise, preferring the new upstream version for any upstream code and preserving downstream intent for downstream code:
+
+```
+git cherry-pick <commit-sha>
+```
+
+### 5. Merge the Target Branch to Resolve PR Conflicts
+
+After cherry-picking all carry patches, the PR will likely have merge conflicts because both branches (the target and the rebase) contain the same downstream files applied on different upstream bases. To fix this, merge the target branch into the rebase branch, resolving all conflicts by keeping the rebased (ours) version:
+
+```
+git merge origin/openshift-4.XX --no-commit
+git checkout --ours <conflicted-files>
+git add <conflicted-files>
+git commit
+```
+
+This merge commit ensures the PR can be merged cleanly on GitHub.
+
+### 6. Create a `DOWNSTREAM: <drop>` Fixup Commit
+
+After cherry-picking and merging, you almost certainly need a fixup commit to resolve build failures caused by upstream API changes. Common issues:
+
+**Moved/renamed packages:** Upstream refactors move packages between versions. Check for import errors and find the new locations using `find` or `ls`. Known moves in recent versions:
+- `server/datadir` → `server/storage/datadir`
+- `server/wal` → `server/storage/wal`
+- `server/wal/walpb` → `server/storage/wal/walpb`
+- `pkg/grpc_testing` → `pkg/grpctesting` (also `GrpcRecorder` → `GRPCRecorder`)
+- `server/etcdserver/api/v2http` was removed; use `etcdhttp` handlers instead
+
+**Removed/renamed functions:** Check the upstream equivalent code (e.g., `tests/framework/integration/cluster.go` for patterns) when a function like `toErr` is missing — it may have been renamed (e.g., to `ContextError`).
+
+**Missing imports:** Downstream carry patches may add code using stdlib packages (like `os`, `strconv`) that weren't needed in the original file. If upstream refactored imports, those may be lost.
+
+**Dockerfile/CI builder updates:** All `Dockerfile.*` and `.ci-operator.yaml` files reference specific Go versions and OpenShift release versions in their `FROM` lines. These must be updated to match the target OpenShift release and the Go version required by the new upstream tag.
+
+**Do NOT downgrade the Go version:** If the new upstream tag requires a newer Go version (e.g., 1.25), do not attempt to downgrade it. The `go` directive in `go.mod` will be bumped back by `go mod tidy` because upstream dependencies require it.
+
+Build and iterate:
+```
+make build
+go build -v ./openshift-tools/...
+```
+
+Commit all fixes as `DOWNSTREAM: <drop>: <version> fixup`.
+
+### 7. Push and Create PR
+
+Push the rebase branch to a personal fork and create a PR against the target `openshift-4.XX` branch.
+
+## Downstream Commit Message Conventions
+
+- `DOWNSTREAM: <carry>: <JIRA-ID>: description` - Patches carried across rebases
+- `DOWNSTREAM: <drop>: description` - One-time fixups dropped on next rebase
+- `DOWNSTREAM <carry>: description` - Also valid (note: no colon after DOWNSTREAM)
+
+## Build and Test
+
+- Build: `make build` (builds etcd, etcdctl, etcdutl)
+- Build downstream tools: `go build -v ./openshift-tools/...`
+- Test: `make test`
+- The `make build` target also builds etcdctl and etcdutl, so a successful `make build` covers the main binaries
+- The `yamlfmt` warning during build is cosmetic and can be ignored
+
+## Key Downstream Files
+
+These files are downstream-only and don't exist in upstream etcd:
+
+- `Dockerfile.art`, `Dockerfile.rhel`, `Dockerfile.installer` - OpenShift container builds
+- `Dockerfile.art-cachi2`, `Dockerfile.installer.art-cachi2` - Konflux/cachi2 builds
+- `.ci-operator.yaml` - CI configuration
+- `build.sh` - OpenShift build script
+- `openshift-hack/` - Downstream rebase tooling
+- `openshift-tools/` - Downstream tools (e.g., discover-etcd-initial-cluster)
+- `client/v3/patch_cluster.go` - Downstream client patch (NonLinearizeableMemberList)
+- `server/revbump/` - Downstream revision bumping for force-new-cluster
+- `server/config/config.go` - Has downstream additions (OPENSHIFT_ETCD_HARDWARE_DELAY_TIMEOUT)
+- `REBASE.openshift.md` - Additional rebase documentation
+
+**Removed files (do not re-add):**
+- `tests/integration/cluster.go` - Removed during v3.6.9 rebase. Was a stale carry from v3.5 that duplicated `tests/framework/integration/cluster.go` and could not compile (referenced many removed upstream symbols). The `tests/integration/` package works without it — `lazy_cluster.go` and test files import from `tests/framework/integration` for the actual cluster implementation. If this file reappears in future carries, remove it again.
+
+## Known Fragile Downstream Files
+
+These files reference upstream internal APIs and are most likely to break during a rebase:
+
+- `client/v3/patch_cluster.go` - Uses internal client functions that may be renamed upstream.
+- `openshift-tools/pkg/discover-etcd-initial-cluster/walutil.go` - Imports server-internal packages (wal, datadir, snap) that move during upstream refactors.

CONTRIBUTING.md

@@ -123,8 +123,6 @@ To get started, create a codespace for this repository by clicking this 👇
 
 [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=11225014)
 
-A codespace will open in a web-based version of Visual Studio Code. The [dev container](.devcontainer/devcontainer.json) is fully configured with the software needed for this project.
-
 **Note**: Dev containers is an open spec which is supported by [GitHub Codespaces](https://github.com/codespaces) and [other tools](https://containers.dev/supporting).
 
 [file an issue]: https://github.com/etcd-io/etcd/issues/new/choose

Dockerfile

@@ -1,5 +1,5 @@
 ARG ARCH=amd64
-FROM --platform=linux/${ARCH} gcr.io/distroless/static-debian12@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
+FROM --platform=linux/${ARCH} gcr.io/distroless/static-debian12@sha256:20bc6c0bc4d625a22a8fde3e55f6515709b32055ef8fb9cfbddaa06d1760f838
 
 ADD etcd /usr/local/bin/
 ADD etcdctl /usr/local/bin/

Dockerfile.art

@@ -0,0 +1,26 @@
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder
+
+COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR
+WORKDIR $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app
+RUN ls -lR $REMOTE_SOURCES_DIR
+RUN cat $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env
+RUN source $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env && GOFLAGS='-mod=readonly' GO_BUILD_FLAGS='-v' ./build.sh
+
+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.22:base-rhel9
+
+ENTRYPOINT ["/usr/bin/etcd"]
+
+RUN yum install --setopt=tsflags=nodocs -y jq && yum clean all && rm -rf /var/cache/yum/*
+
+COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcd /usr/bin/
+COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcdctl /usr/bin/
+COPY --from=builder /go/src/go.etcd.io/etcd/bin/etcdutl /usr/bin/
+COPY --from=builder /go/src/go.etcd.io/etcd/bin/discover-etcd-initial-cluster /usr/bin/
+
+LABEL io.k8s.display-name="etcd server" \
+      io.k8s.description="etcd is a distributed key-value store which stores the persistent master state for Kubernetes and OpenShift." \
+      maintainer="Sam Batschelet <sbatsche@redhat.com>"

Dockerfile.art-cachi2

@@ -1,11 +1,11 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder
 
 WORKDIR /go/src/go.etcd.io/etcd
 COPY . .
 RUN GOFLAGS='-mod=readonly' GO_BUILD_FLAGS='-v' ./build.sh
 
 # stage 2 (note: any changes should reflect in Dockerfile.rhel)
-FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.22:base-rhel9
 
 ENTRYPOINT ["/usr/bin/etcd"]
 

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.24-openshift-4.21 AS macbuilder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 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.24-openshift-4.21 AS macarmbuilder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 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.24-openshift-4.21 AS linuxbuilder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 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.24-openshift-4.21 AS linuxarmbuilder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 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.24-openshift-4.21 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder
 ENV GO_COMPLIANCE_EXCLUDE=".*"
 WORKDIR /go/src/go.etcd.io/etcd
 COPY . .
@@ -34,7 +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.21:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.22:base-rhel9
 
 RUN yum install --setopt=tsflags=nodocs -y jq && yum clean all && rm -rf /var/cache/yum/*
 

Dockerfile.installer.art

@@ -0,0 +1,87 @@
+# 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.25-openshift-4.22 AS macbuilder
+
+ENV GO_COMPLIANCE_EXCLUDE=".*"
+COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR
+WORKDIR $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app
+RUN cat $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env
+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
+WORKDIR /go/src/go.etcd.io/etcd
+COPY . .
+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.25-openshift-4.22 AS macarmbuilder
+
+ENV GO_COMPLIANCE_EXCLUDE=".*"
+COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR
+WORKDIR $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app
+RUN cat $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env
+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
+WORKDIR /go/src/go.etcd.io/etcd
+COPY . .
+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.25-openshift-4.22 AS linuxbuilder
+
+ENV GO_COMPLIANCE_EXCLUDE=".*"
+COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR
+WORKDIR $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app
+RUN cat $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env
+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
+WORKDIR /go/src/go.etcd.io/etcd
+COPY . .
+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.25-openshift-4.22 AS linuxarmbuilder
+
+ENV GO_COMPLIANCE_EXCLUDE=".*"
+COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR
+WORKDIR $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app
+RUN cat $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env
+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
+WORKDIR /go/src/go.etcd.io/etcd
+COPY . .
+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.25-openshift-4.22 AS builder
+ENV GO_COMPLIANCE_EXCLUDE=".*"
+COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR
+WORKDIR $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app
+RUN cat $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env
+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
+WORKDIR /go/src/go.etcd.io/etcd
+COPY . .
+RUN source $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/cachito.env \
+	&& export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \
+	&& CGO_ENABLED=0 ./build.sh
+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.22:base-rhel9
+
+RUN yum install --setopt=tsflags=nodocs -y jq && yum clean all && rm -rf /var/cache/yum/*
+
+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
+COPY --from=linuxbuilder /go/src/go.etcd.io/etcd/bin/etcd /usr/share/openshift/linux/amd64/etcd
+COPY --from=linuxarmbuilder /go/src/go.etcd.io/etcd/bin/etcd /usr/share/openshift/linux/arm64/etcd
+COPY --from=builder /usr/share/openshift/ /usr/share/openshift/
+
+# This image is not an operator, it is only used as part of the build pipeline
+LABEL io.openshift.release.operator=false