Skip to content

Commit 29c2e01

Browse files
committed
dev-db/etcd: Replace our etcdctl package with Gentoo's etcd package
A `server` USE flag avoids including that binary. The client tools now include etcdutl for performing defragmentation and snapshot restoration on local data. We previously built etcdctl with `CGO_ENABLED=0`, apparently for consistency when cross-compiling, but we have since fixed that. Gentoo's package is not currently stabilised for arm64, as I have only just added that keyword while bumping to the latest release. The latest stable release is a little old, but still much newer than ours. Closes: flatcar/Flatcar#1932 Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
1 parent cca1157 commit 29c2e01

File tree

20 files changed

+399
-1187
lines changed

20 files changed

+399
-1187
lines changed

.github/workflows/portage-stable-packages-list

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ dev-cpp/gflags
211211
dev-cpp/glog
212212
dev-cpp/gtest
213213

214+
dev-db/etcd
214215
dev-db/sqlite
215216

216217
dev-debug/gdb
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- etcdctl ([3.5.18](https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md#v3518-2025-01-24))

sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r318.ebuild renamed to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r319.ebuild

File renamed without changes.

sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ RDEPEND="${RDEPEND}
118118
coreos-base/update-ssh-keys
119119
coreos-base/update_engine
120120
coreos-base/ue-rs
121-
dev-db/etcdctl
121+
dev-db/etcd
122122
dev-debug/strace
123123
dev-libs/libsodium
124124
dev-libs/openssl

sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/Manifest

Lines changed: 0 additions & 575 deletions
This file was deleted.

sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-3.5.0.ebuild

Lines changed: 0 additions & 607 deletions
This file was deleted.

sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/metadata.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,3 +101,6 @@ sys-apps/azure-vm-utils
101101

102102
=app-containers/containerd-2.1* ~amd64 ~arm64
103103
=app-containers/runc-1.3* ~amd64 ~arm64
104+
105+
# Not stabilised for arm64 yet.
106+
dev-db/etcd amd64

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,3 +194,6 @@ sys-apps/gawk -mpfr
194194
# We never had passwdqc stuff in old pam sys configs, so disable it
195195
# for now. Maybe this is something to enable later.
196196
sys-auth/pambase securetty -passwdqc
197+
198+
# We run the server in a container.
199+
dev-db/etcd -server
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
DIST etcd-3.4.31-deps.tar.xz 2212704 BLAKE2B 8b30941eefdb3811fb331014b69eb8d5b9c691b8ace1004432e5b05bb787bb3ba3ce872f881af2a559d7b955fae890a4ec0e8b10daa06cf388447af1b6a92679 SHA512 85915f5738493bfe3c09208649e26cfdc612df900916686006a437c44aad5afb2ab69b0840550e37544a50b79d2d3718e2cbdfd037e47bcaa8e33a8a6a95105f
2+
DIST etcd-3.4.31.tar.gz 6072806 BLAKE2B 30aa5b79d2fd0ba639bc766c104d5df28af50ae5398d860af3b3aff91c143ccd899538b341501386bac55dedc00086654de6e4ab9b237053b199a8de2fa509ec SHA512 4a7e366ced86ea86a324ab972ea47be56456c0aa8744e5ec07d499a56bdc9179ebc3bc2f33bd67c2d341181a5bcc703abc5a7c2e57879169a351457b4a0274f3
3+
DIST etcd-3.5.18-deps.tar.xz 46453448 BLAKE2B 677370cb6d9064f8474adbfc5030b46f3367198cb8defc9242be00423c570f8c9bc5358d6dbe9d8cfee8e7797a2f8c93e7b4c8cbee4702c59287005cd7885fef SHA512 f1ed36d49f199fff4b0ee920870c3ac66dee0dcb5e92fa24a3861d841bdcfa99b210b292138116de9aafeec424c7663111f9bb0ad87910e1314031eb501f4aeb
4+
DIST etcd-3.5.18.tar.gz 4128059 BLAKE2B 32f867170bf1195d019dcf562bff9104db00f6ccff6b91bf12a4c95a63a5d92dda6984437bed819240be7bd8d4e2b507904251f636e945c5847ef93e72f1dd63 SHA512 0d72c40d575997d70d9d4964e7ff4be75c77e13a40ea08fcc020fddc64dc420338f1853d5a51a2dbe3f4c2881ae196a7aa32565e4b41dbda77bc2b6ae2313104
5+
DIST etcd-3.5.26-deps.tar.xz 48943308 BLAKE2B 6c5719f47ef4be8b98260ff8b1f4d09c25bf01eb830e8e7851793d617336df0556bf7010bd9b6dba611b017501bdda18541282363e275d3ecded6c25efa43c50 SHA512 e3544d6787800d734ec9e851ea4755f166e3eaf6e82c3353e172aa2f34336a312f97811e39aae4babc905d91627fa182aed007c450737194db937d4ba76dc8c9
6+
DIST etcd-3.5.26.tar.gz 4145585 BLAKE2B e261a5ef3b629a69cc044b1a92ee6b3a2d56ee7e648b86036016c79b084bbb5dd748ecaf0214900b88c596b14f297815ab166e468c0fe84d63f46e6b51e867d5 SHA512 3a014d259725d8a116a3823fd921c6fa6cf9587c993038c12765085032610e997bf318d29ca2ae9ed34a55990cb500b61e2bc1f8151a80e200ec2299d918cf76
7+
DIST etcd-3.6.7-deps.tar.xz 109371156 BLAKE2B 46f3d0cfed7ad1f9c799d569cd78d766266e8f33f3b2421011860443d644044cd46a58c67180ac7c15d63385b33ab18b9139dc0954a509898147e616f470e4e0 SHA512 711506c537d721a3c64466a7b57a5cc32f25a018947b232a9fc6b28f0faa1985c3f319161ba6ca20e7a909574fd5c4887a0cf0290461a97d713182a38f11f48c
8+
DIST etcd-3.6.7.tar.gz 7379199 BLAKE2B 011a5fb132dbb3a5229d20f803df3ba8785c068e3ed38d14d8be798af74cf3895efe980be605014e648883903512f910129d5bb57600dd7f170361a1fb7c488b SHA512 05d85c127bf947799deccbf082bfb7e93c3a37378a13723d0cc925bec8fc153a2391b4d1be3cf9da46fc575ed45c3afbbdb143f227a163b37e92a27163f5a2e8

0 commit comments

Comments
 (0)