Skip to content
This repository has been archived by the owner on Jan 20, 2022. It is now read-only.

Update Kops dependency for Azure Blob Storage support #372

Merged
merged 3 commits into from
Dec 2, 2020

Conversation

rifelpet
Copy link
Contributor

This updates the kops dependency to the current master HEAD. note that the go.mod replace directive is changing from v1.19.0-beta.1 to v1.19.0-alpha.5.0.20201129060248-dc1c2210cf77 because v1.19.0-alpha.5 is the most recent tag cut from the master branch before we created the release-1.19 branch.

This also updates klog to v2.

@justinsb
Copy link
Contributor

justinsb commented Dec 2, 2020

So I think I messed this up with the tools/deb-tools subdirectory.

The next 3 PRs should fix it properly, but if you want this one to pass tests I think this should do it...

pushd tools/deb-tools
go mod vendor
bazel run //:gazelle
popd

@rifelpet
Copy link
Contributor Author

rifelpet commented Dec 2, 2020

Thanks @justinsb, updated. I think one issue is gazelle is using the wrong prefix for the deb-tools module:

prefix = "kope.io/etcd-manager/tools/deb-extract",

@justinsb
Copy link
Contributor

justinsb commented Dec 2, 2020

Thanks @rifelpet and you're right - that should be deb-tools not deb-extract. It might work anyway, but I agree we should fix it :-)

@@ -0,0 +1 @@
/private/var/tmp/_bazel_prifel/1b4f270d25cb3a9340b9e5aad3a4249e/execroot/__main__
Copy link
Contributor

Choose a reason for hiding this comment

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

This (symlink?) probably shouldn't be committed.. though it looks like it isn't causing problems...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah thanks, i'm not sure which command I ran that generated that symlink but it should probably get gitignored if its still created after deb-tools is fixed.

@justinsb
Copy link
Contributor

justinsb commented Dec 2, 2020

Removing travis in #377, so not going to wait for it. The same tests are passing in github actions.

/approve
/lgtm

@justinsb justinsb merged commit a895d98 into kopeio:master Dec 2, 2020
justinsb added a commit to justinsb/kops that referenced this pull request Dec 9, 2020
Highlights:

* Fix arm64 images, which were built with an incorrect base image.
* Initial (experimental) Azure support

Full change list:

* Update Kops dependency for Azure Blob Storage support [kubernetes#372](kopeio/etcd-manager#372)
* Exclude gazelle from tools/deb-tools [kubernetes#373](kopeio/etcd-manager#373)
* Regenerate bazel in tools/deb-tools [kubernetes#374](kopeio/etcd-manager#374)
* Release notes for 3.0.20201202 [kubernetes#375](kopeio/etcd-manager#375)
* Remove travis CI [kubernetes#377](kopeio/etcd-manager#377)
* Fix vendor generation for tools/deb-tools subproject [kubernetes#376](kopeio/etcd-manager#376)
* Add script to verify image hashes [kubernetes#380](kopeio/etcd-manager#380)
* Fix some incorrect base image hashes for arm64 [kubernetes#379](kopeio/etcd-manager#379)
* Support Azure [kubernetes#378](kopeio/etcd-manager#378)
* Add more descriptions to wait loops [kubernetes#383](kopeio/etcd-manager#383)
* Rename fields in the azure client struct [kubernetes#382](kopeio/etcd-manager#382)
* Fix small typo in code comment [kubernetes#381](kopeio/etcd-manager#381)
hakman pushed a commit to hakman/kops that referenced this pull request Dec 9, 2020
Highlights:

* Fix arm64 images, which were built with an incorrect base image.
* Initial (experimental) Azure support

Full change list:

* Update Kops dependency for Azure Blob Storage support [kubernetes#372](kopeio/etcd-manager#372)
* Exclude gazelle from tools/deb-tools [kubernetes#373](kopeio/etcd-manager#373)
* Regenerate bazel in tools/deb-tools [kubernetes#374](kopeio/etcd-manager#374)
* Release notes for 3.0.20201202 [kubernetes#375](kopeio/etcd-manager#375)
* Remove travis CI [kubernetes#377](kopeio/etcd-manager#377)
* Fix vendor generation for tools/deb-tools subproject [kubernetes#376](kopeio/etcd-manager#376)
* Add script to verify image hashes [kubernetes#380](kopeio/etcd-manager#380)
* Fix some incorrect base image hashes for arm64 [kubernetes#379](kopeio/etcd-manager#379)
* Support Azure [kubernetes#378](kopeio/etcd-manager#378)
* Add more descriptions to wait loops [kubernetes#383](kopeio/etcd-manager#383)
* Rename fields in the azure client struct [kubernetes#382](kopeio/etcd-manager#382)
* Fix small typo in code comment [kubernetes#381](kopeio/etcd-manager#381)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants