Downstream patches for 1.1.0-1 release branch #8
Conversation
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
Co-authored-by: shalin patel <[email protected]>
Upstream stopped building the executable in a container. We continue to build it in a container, so that we can have multi-arch images.
dlipovetsky
force-pushed
the
dlipovetsky/patches-1.1.0-1
branch
from
31421c7
to
a1e16cd
Compare
A recent PR[1] updated the godoc comment that describes the VCDMachineSpec MachineAddress field, but the change was not reflected in the v1beta1 CRD. This updates the comment in the CRD base, as well as infrastructure-components.yaml [1]: vmware#445
make runs each line in a separate shell. In a recent commit[1], commands on one line were split to multiple lines. When `go test` ran, it did not have the environment variable required by envtest, and failed. [1]: https://github.com/vmware/cluster-api-provider-cloud-director/pull/466/files#diff-76ed074a9305c04054cdebb9e9aad2d818052b07091de1f20cad0bbac34ffb52R129-R134
A recent PR[1] introduced the use of a relative path for envtest assets. The path is relative to the repository root, and this means Go tests, which run relative to their package path, cannot find the envtest assets, and fail. [1]: https://github.com/vmware/cluster-api-provider-cloud-director/pull/466/files#diff-76ed074a9305c04054cdebb9e9aad2d818052b07091de1f20cad0bbac34ffb52R129-R134
It is sometimes necessary to skip some tests. For example, to skip the e2e tests, run: ```shell make test TEST_PACKAGES='$(shell go list ./... | grep -v 'tests/e2e')' ```
dlipovetsky
force-pushed
the
dlipovetsky/patches-1.1.0-1
branch
from
db62da4
to
424db45
Compare
supershal
approved these changes
Sep 21, 2023
dkoshkin
approved these changes
Sep 22, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We previously merged these patches into https://github.com/mesosphere/cluster-api-provider-cloud-director/tree/d2iq/release-1.1.0-0.
We have now rebased our fork, specifically https://github.com/mesosphere/cluster-api-provider-cloud-director/tree/d2iq/release-1.1.0-1, onto the upstream 1.1.0 tag, and need to merge these patches into the branch.