Skip to content
This repository has been archived by the owner on Sep 18, 2020. It is now read-only.

Enable etcd-wrapper on arm64. #2520

Merged
merged 3 commits into from
May 1, 2017
Merged

Conversation

glevand
Copy link
Contributor

@glevand glevand commented Apr 13, 2017

Also adds missing ebuild metadata.

Same ebuild structure as #2511 (Reenable flannel on arm64).

To work as-is on arm64 the etcd-wrapper needs etcd-io/etcd#7714 and an arm64 release to quay.io/coreos/etcd.

For testing, a systemd drop-in /etc/systemd/system/etcd-member.service.d/local.conf with something like this should work:

[Service]
Environment="ETCD_UNSUPPORTED_ARCH=arm64"
Environment="ETCD_IMAGE=docker://quay.io/glevand/etcd:v3.1.6-arm64"
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/coreos/etcd-member-wrapper.uuid --insecure-options=image"

@glevand glevand requested a review from crawford April 13, 2017 00:38
Copy link
Contributor

@crawford crawford left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine. We'll need those ARM images published first. I'll talk with the etcd team about that.

@glevand
Copy link
Contributor Author

glevand commented Apr 14, 2017

@crawford Did you want to rename etcd-wrapper-0.0.4.ebuild to etcd-wrapper-3.0.10.ebuild so the ebuild package version matches the etcd release? Then we can use ${PV} in the ebuild, and it makes it easier to know which etcd version the package uses.

I can do that in this PR, or make another.

@crawford
Copy link
Contributor

Seems like a reasonable idea. I'd be fine with it in a separate commit in this PR.

@glevand
Copy link
Contributor Author

glevand commented Apr 14, 2017

Added patch etcd-wrapper: Change ebuild version to etcd release.

@glevand
Copy link
Contributor Author

glevand commented Apr 26, 2017

Rebased to lastest.
Dropped patch etcd-wrapper: Change ebuild version to etcd release, which became duplicated in #2549 (app-admin/etcd-wrapper: bump to etcd 3.1.6).

Copy link
Contributor

@dm0- dm0- left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I missed this. A few minor tweaks, and this looks good.

amd64? (
app-admin/etcd-wrapper
)
app-admin/etcd-wrapper
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The coreos ebuild revision number should probably be bumped for this. (The symlink in the same directory.) Maybe the coreos-base/coreos changes could be in their own commit.

@@ -22,8 +22,15 @@ RDEPEND=">=app-emulation/rkt-1.9.1[rkt_stage1_fly]"
S=${WORKDIR}

src_install() {
local tag="v3.1.6"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the ebuild has the same version now, maybe make this value "v${PV}" so updates only require a rename with no edits.

Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Geoff Levand <geoff@infradead.org>
@glevand
Copy link
Contributor Author

glevand commented Apr 27, 2017

Used ${PV} for etcd release tag.
Moved coreos-base/coreos changes to separate patch and bumped ebuild version.

@glevand glevand merged commit 78b3474 into coreos:master May 1, 2017
@glevand glevand deleted the for-merge-etcd branch May 1, 2017 17:34
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
3 participants