Skip to content
This repository has been archived by the owner on Jul 16, 2024. It is now read-only.

Merge in upstream changes to etcd-manager #180

Merged

Conversation

justinsb
Copy link
Contributor

No description provided.

Ciprian Hacman and others added 28 commits November 19, 2020 09:21
This reverts commit a968992b
This reverts commit d5b3e613
This reverts commit 92bef6f5
…mestamp

This commit refactors the `runDeleteCommand` function of
`etcd-manager-ctl` to use the "backup name" instead of the "timestamp"
attribute. More often than not, users are more likely to become familiar
with the syntax of `etcd-manager-ctl restore-backup`, which uses the
`backupname` attribute to identify the target backup to restore.

By bringing the `delete-backup` subcommand in alignment with
`restore-backup`, we improve the user experience of an operator in the
process of restoring a cluster.
Updating to the version used by k8s 1.19.4
This is how we used to build our images before bazel discouraged it,
but is similar to how distroless is built now.  It has many fewer
dependencies compared to the distroless stack, and is much more
reproducible than Dockerfile alternatives.  This is currently
integrated to bazel, but we could also do this standalone or in Docker
in future.
The older image is deprecated and is no longer guaranteed to contain
any particular bazel version.

Also increase the timeout.
Due to bazel-contrib/rules_go#456 , the build of etcd 2.2.1 did not work correctly on case-insensitive file systems, including MacOS.

etcd has a shell script named `build`, which bazel was treating as a `BUILD` file.  By setting bazel to only look for `BUILD.bazel` files, this is avoided.
This should address the deprecation in go 1.15 of server certificates
that only have a Common Name (CN).
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb

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:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 19, 2020
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Nov 19, 2020
@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If you signed the CLA as a corporation, please sign in with your organization's credentials at https://identity.linuxfoundation.org/projects/cncf to be authorized.
  • If you have done the above and are still having issues with the CLA being reported as unsigned, please log a ticket with the Linux Foundation Helpdesk: https://support.linuxfoundation.org/
  • Should you encounter any issues with the Linux Foundation Helpdesk, send a message to the backup e-mail support address at: [email protected]

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. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Nov 19, 2020
@justinsb
Copy link
Contributor Author

Changelist:

e2a80a8c Release notes for 3.0.20201117
c9e68871 Fix build on case-insensitive file systems (MacOS)
ae536008 Switch the cloudbuild docker image, locking to 2.2.0
e038d60d Set AltNames on server certificates
6daca9a0 govet: Fix a log message
9a8f17bf Build base image by raw expansion of deb packages
46977da9 Update vendor for kops 1.19.0-beta.1
22d9df56 Update etcd client
be637923 Add support for MountSensitive
8b3172d0 Update kops to pick up AllowReauth Openstack fix
9ae4a0c7 Added full cinder ID to candidateDeviceNodes
2dfa413a Push multi-arch compatible with DockerHub
6d47b43c Add back support for etcd 2.2.1
e38c45db Add ETCD_UNSUPPORTED_ARCH=arm64 env var
c12682a7 Add build targets for ARM64
0c08b57f Update Bazel rules
84f22417 Support for arm64
1acc15be Revert "Move from debian-hyperkube-base to debian-base"
aac22ec3 Revert "Switch to l.gcr.io/google/debian10"
48fe45f3 Revert "Update WORKSPACE"
ce8a4bd8 Revert "Update BUILD"
608db56c feat(docs): add documentation about handling bad commands in storage
b9c533bc feat(etcd-manager-ctl): use backupname to delete backup instead of timestamp
30d0d4e5 when doing discovery ignore AZ
a968992b Update BUILD
d5b3e613 Update WORKSPACE
92bef6f5 Switch to l.gcr.io/google/debian10
81ac26c0 Add support for etcd 3.4.13

Upstream PRs:

https://github.com/kopeio/etcd-manager/pulls/364
https://github.com/kopeio/etcd-manager/pulls/360
https://github.com/kopeio/etcd-manager/pulls/362
https://github.com/kopeio/etcd-manager/pulls/361
https://github.com/kopeio/etcd-manager/pulls/363
https://github.com/kopeio/etcd-manager/pulls/355
https://github.com/kopeio/etcd-manager/pulls/347
https://github.com/kopeio/etcd-manager/pulls/352
https://github.com/kopeio/etcd-manager/pulls/358
https://github.com/kopeio/etcd-manager/pulls/351
https://github.com/kopeio/etcd-manager/pulls/334
https://github.com/kopeio/etcd-manager/pulls/345
https://github.com/kopeio/etcd-manager/pulls/344

@justinsb
Copy link
Contributor Author

/wip while I chase the CLAs

@sudoforge
Copy link
Contributor

sudoforge commented Nov 21, 2020

I've signed the CLA. @justinsb I think you'll need to git commit --amend --no-edit && git push --force in order to re-trigger the check.

@k8s-ci-robot 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 Nov 21, 2020
@justinsb
Copy link
Contributor Author

Thanks for taking care of the CLA @sudoforge

With a few other fixes to the verify job, looks like we are now passing tests cc @dlipovetsky

@dlipovetsky
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 25, 2020
@k8s-ci-robot k8s-ci-robot merged commit bbe4049 into kubernetes-retired:master Nov 25, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants