Bump CAPV to v1.7.4 #2691
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| 21ad99fd6424e837145e2b8ecdfcf69c230717983f8b1372d99b85bddddf2317 _output/bin/cluster-api-provider-vsphere/linux-amd64/manager | ||
| d5ce1faace69067557645b930ee1a72195bf1211bb86dd8af454d83983df1172 _output/bin/cluster-api-provider-vsphere/linux-arm64/manager |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| v1.7.4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,14 @@ | ||
| From 02c21a83629c62c4526fcccf62bfb91865f493bc Mon Sep 17 00:00:00 2001 | ||
| From: Taylor Neyland <[email protected]> | ||
| Date: Tue, 6 Jun 2023 16:56:24 -0500 | ||
| Subject: [PATCH] Add capv support for Bottlerocket | ||
|
|
||
| --- | ||
| pkg/services/govmomi/vcenter/clone.go | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/pkg/services/govmomi/vcenter/clone.go b/pkg/services/govmomi/vcenter/clone.go | ||
| index c6d1e1d1..01a4fd86 100644 | ||
| --- a/pkg/services/govmomi/vcenter/clone.go | ||
| +++ b/pkg/services/govmomi/vcenter/clone.go | ||
| @@ -60,10 +60,10 @@ func Clone(ctx *context.VMContext, bootstrapData []byte, format bootstrapv1.Form | ||
|
|
@@ -26,46 +24,6 @@ index 999f9846..09fe9c39 100644 | |
| } | ||
| } | ||
| if ctx.VSphereVM.Spec.CustomVMXKeys != nil { | ||
|
There was a problem hiding this comment. were these tests removed upstream? There was a problem hiding this comment. Yeah, it looks like it. This file was removed in this PR and included in v1.7.3 onwards |
||
| -- | ||
| 2.40.1 | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does these still build to and create files which are similiar to what we were producing? probably best to diff what this creates with what we shipped in 0.18.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, they basically split this command and the combination of these two results in the same outputs from what I checked after running the
make buildcommand.I'll double check with a diff we shipped in 0.18
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So, I've confirmed the commands output similar files in the following directories and compared them using a diff tool:
There are some small changes to the files because to the version differences it looks like.
csi-vsphere-configsecret upstreamx-kubernetes-map-type: atomicin the infrastructure-components templatesThey're was no mention of breaking changes in the changelogs and these look find to me
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sounds good