Add support for Scaleway in etcd-manager #336

Mia-Cross · 2022-08-26T08:26:39Z

As we are currently working on adding support for Scaleway in kOps, we also need etcd-manager to have a Scaleway volume provider.

linux-foundation-easycla · 2022-08-26T08:26:43Z

The committers listed above are authorized under a signed CLA.

✅ login: Mia-Cross (bbe0a4b, 23603c4, 2879793)

k8s-ci-robot · 2022-08-26T08:26:47Z

Welcome @Mia-Cross!

It looks like this is your first PR to kubernetes-sigs/etcdadm 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/etcdadm has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2022-08-26T08:26:48Z

Hi @Mia-Cross. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

remyleone · 2022-08-26T09:14:23Z

etcd-manager/Dockerfile

@@ -0,0 +1,19 @@
+FROM golang:1.19-buster


Why is this file required?

It's only for dev purposes, it won't go in the final PR. I need it to be able to build an image containing both etcd-manager executable and sh since the command launching the etcd-manager image is generated by kops (hard to modify) and is in the form of /bin/sh -c exec /etcd-manager [arguments]

Maybe it could be contributed in a different PR to etcdmanager? Maybe other people would benefit from it.

Would be nice to move away from Bazel builds in the near future. The effort required is a little bigger, as etcd-manager requires the etcd binaries for the supported versions.

Quite happy with the ko-based builds we have for kops. Putting in the etcd versions as static files should not be too hard.

remyleone · 2022-08-26T09:15:56Z

etcd-manager/Makefile

 	${BAZEL} build ${BAZEL_FLAGS} --platforms=@io_bazel_rules_go//go/toolchain:linux_$* //cmd/etcd-manager:etcd-manager

 .PHONY: push-etcd-manager
 push-etcd-manager:
-	${BAZEL} run ${BAZEL_FLAGS} --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //images:push-etcd-manager
-	${BAZEL} run ${BAZEL_FLAGS} --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //images:push-etcd-manager
+	echo $(REGISTRY_NAME)


Why is this change required?

The echo is not required indeed and was only used for debugging a script I was making which purpose was to build and push to the registry all the images needed by kOps across several repositories.
If you're talking about why I got rid of the Bazel commands it's because they required me to write BUILD.bazel files for the sdk and it seemed like a lot of work that I was not sure was going to pay at the time. But now that I know that it works, I will eventually need to write these Bazel files.

@Mia-Cross The The BUILD.bazel files are auto-generated by running make vendor.

etcd-manager/cmd/etcd-manager/main.go

etcd-manager/pkg/volumes/scaleway/discovery.go

etcd-manager/pkg/volumes/scaleway/volumes.go

hakman · 2022-08-26T16:19:17Z

/ok-to-test

etcd-manager/Dockerfile

etcd-manager/Makefile

etcd-manager/pkg/volumes/scaleway/discovery.go

etcd-manager/pkg/volumes/scaleway/volumes.go

etcd-manager/pkg/volumes/scaleway/discovery.go

etcd-manager/pkg/volumes/scaleway/volumes.go

justinsb · 2022-09-01T12:20:57Z

I did a pass over the go code and it looks good - a few style points, but more just FYI, nothing blocking.

/ok-to-test

olemarkus

/lgtm

k8s-ci-robot · 2022-09-05T12:10:31Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Mia-Cross, olemarkus

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~etcd-manager/OWNERS~~ [olemarkus]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

remyleone · 2022-09-01T09:36:20Z

etcd-manager/Makefile

@@ -46,7 +46,7 @@ build-etcd-manager-amd64 build-etcd-manager-arm64: build-etcd-manager-%:
 .PHONY: push-etcd-manager
 push-etcd-manager:
 	${BAZEL} run ${BAZEL_FLAGS} --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //images:push-etcd-manager
-	${BAZEL} run ${BAZEL_FLAGS} --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //images:push-etcd-manager
+ 	${BAZEL} run ${BAZEL_FLAGS} --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //images:push-etcd-manager


Why is this change needed?

remyleone · 2022-09-01T09:39:21Z

etcd-manager/pkg/volumes/scaleway/discovery.go

+		}
+		serverPrivateIP := server.Server.PrivateIP
+
+		klog.V(2).Infof("Discovered volume %s(%d) of type %s attached to server %s(%d)", volume.Name, volume.ID, volume.VolumeType, server.Server.Name, serverID)


This line of logs does not use the serverPrivateIP defined on top of it. Maybe it should merged with the other log info line on top.

remyleone · 2022-09-01T09:40:17Z

etcd-manager/pkg/volumes/scaleway/discovery.go

+		// We use the etcd node ID as the persistent identifier, because the data determines who we are
+		node := discovery.Node{
+			ID:        "vol-" + volume.ID,
+			Endpoints: []discovery.NodeEndpoint{{IP: *serverPrivateIP}},


We don't use this variable anywhere else in the function. Maybe having server.Server.PrivateIP could be easier to follow.

k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 26, 2022

k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Aug 26, 2022

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 26, 2022

k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Aug 26, 2022

k8s-ci-robot requested review from hakman and justinsb August 26, 2022 08:26

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Aug 26, 2022

remyleone reviewed Aug 26, 2022

View reviewed changes

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 26, 2022

remyleone reviewed Aug 29, 2022

View reviewed changes

etcd-manager/Dockerfile Outdated Show resolved Hide resolved

etcd-manager/Makefile Outdated Show resolved Hide resolved

etcd-manager/pkg/volumes/scaleway/discovery.go Outdated Show resolved Hide resolved

etcd-manager/pkg/volumes/scaleway/volumes.go Outdated Show resolved Hide resolved

Mia-Cross force-pushed the scaleway branch from abb3df6 to 2d595d4 Compare September 1, 2022 09:23

justinsb reviewed Sep 1, 2022

View reviewed changes

Mia-Cross mentioned this pull request Sep 2, 2022

Update dependencies before adding support for Scaleway #341

Merged

Mia-Cross added 8 commits September 5, 2022 11:34

add a scaleway volume provider

464caf3

image built from Dockerfile rather than ko

8588583

removed powering off server

c3865fa

using only block volume for now

a7cc0bf

debugging store path

0ea7a74

bazel build successful

bc95ce7

PR ready but need scw support in kops/util/pkg/vfs/context.go first

81e9d78

style fixes

bfef125

Mia-Cross force-pushed the scaleway branch from 494c60e to bfef125 Compare September 5, 2022 09:44

Mia-Cross marked this pull request as ready for review September 5, 2022 11:38

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 5, 2022

k8s-ci-robot requested a review from olemarkus September 5, 2022 11:38

olemarkus approved these changes Sep 5, 2022

View reviewed changes

k8s-ci-robot assigned olemarkus Sep 5, 2022

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 5, 2022

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 5, 2022

remyleone reviewed Sep 5, 2022

View reviewed changes

k8s-ci-robot merged commit 0bbe43d into kubernetes-retired:master Sep 5, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for Scaleway in etcd-manager #336

Add support for Scaleway in etcd-manager #336

Mia-Cross commented Aug 26, 2022

linux-foundation-easycla bot commented Aug 26, 2022 •

edited

Loading

k8s-ci-robot commented Aug 26, 2022

k8s-ci-robot commented Aug 26, 2022

remyleone Aug 26, 2022

Mia-Cross Aug 26, 2022

remyleone Aug 26, 2022

hakman Aug 30, 2022

olemarkus Sep 5, 2022

remyleone Aug 26, 2022

Mia-Cross Aug 26, 2022 •

edited

Loading

hakman Aug 30, 2022

hakman commented Aug 26, 2022

justinsb commented Sep 1, 2022

olemarkus left a comment

k8s-ci-robot commented Sep 5, 2022

remyleone Sep 1, 2022

remyleone Sep 1, 2022

remyleone Sep 1, 2022

Add support for Scaleway in etcd-manager #336

Add support for Scaleway in etcd-manager #336

Conversation

Mia-Cross commented Aug 26, 2022

linux-foundation-easycla bot commented Aug 26, 2022 • edited Loading

k8s-ci-robot commented Aug 26, 2022

k8s-ci-robot commented Aug 26, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mia-Cross Aug 26, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hakman commented Aug 26, 2022

justinsb commented Sep 1, 2022

olemarkus left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Sep 5, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

linux-foundation-easycla bot commented Aug 26, 2022 •

edited

Loading

Mia-Cross Aug 26, 2022 •

edited

Loading