-
Notifications
You must be signed in to change notification settings - Fork 90
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bump CAPV to v1.7.4 #2691
Bump CAPV to v1.7.4 #2691
Conversation
d131d53
to
a75e042
Compare
a75e042
to
e95b074
Compare
@@ -26,46 +24,6 @@ index 999f9846..09fe9c39 100644 | |||
} | |||
} | |||
if ctx.VSphereVM.Spec.CustomVMXKeys != nil { | |||
diff --git a/test/e2e/data/infrastructure-vsphere/capi-upgrades/v1alpha3/cluster-template.yaml b/test/e2e/data/infrastructure-vsphere/capi-upgrades/v1alpha3/cluster-template.yaml |
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.
were these tests removed upstream?
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, it looks like it. This file was removed in this PR and included in v1.7.3 onwards
MANIFEST_DIR="out" \ | ||
PULL_POLICY="IfNotPresent" \ | ||
IMAGE="${IMAGE_REPO}/kubernetes-sigs/cluster-api-provider-vsphere/release/manager:$IMAGE_TAG" | ||
make manifest-modification STAGE="release" \ |
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 build
command.
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:
- /projects/kubernetes-sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere/.build/config
- /projects/kubernetes-sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere/.build/out
- /projects/kubernetes-sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere/_output/manifests/infrastructure-vsphere/
There are some small changes to the files because to the version differences it looks like.
- the vsphere tls thumbprint was added to the
csi-vsphere-config
secret upstream - update to the referenced controller-gen.kubebuilder.io/version: v0.11.4 - > v0.12.1
- adding usage of the
x-kubernetes-map-type: atomic
in the infrastructure-components templates
They'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
/approve |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cxbrowne1207 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 |
/cherry-pick release-0.18 |
@cxbrowne1207: new pull request created: #2694 In response to this:
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. |
Issue #, if available:
Description of changes:
Bumping CAPV to version v1.7.4
Additionally,
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
make build
successfully for the project.