Skip to content
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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

馃尡 replace hardcoded kind cluster name to pickup env values #5822

Merged
merged 1 commit into from
Dec 21, 2021
Merged

馃尡 replace hardcoded kind cluster name to pickup env values #5822

merged 1 commit into from
Dec 21, 2021

Conversation

DiptoChakrabarty
Copy link
Member

馃尡

What this PR does / why we need it:
Replaces code to pickup kind cluster alternate from env variables instead of hardcoding it to capi-test. If env variable is not present the default value of capi-test cluster name is taken.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #5820

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 8, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @DiptoChakrabarty. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Dec 8, 2021
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 8, 2021
fabriziopandini
fabriziopandini reviewed Dec 8, 2021
View reviewed changes
hack/kind-install-for-capd.sh Outdated
Comment on lines 29 to 33
if [[ -z "$CAPI_KIND_CLUSTER_NAME" ]]; then
NAME="capi-test"
else
NAME="${CAPI_KIND_CLUSTER_NAME}"
fi
Copy link
Member

Choose a reason for hiding this comment

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

Q: Should we drop L35-L44 so there is only a single-mode the set the cluster name (envvar vs envvar+command arg)?
@killianmuldoon opinions?

Copy link
Contributor

Choose a reason for hiding this comment

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

Definitely - using and env variable will make it easy to use the same value elsewhere (e.g. tilt setup) where needed. @DiptoChakrabarty could you remove the while block from L35-L44?

Copy link
Member Author

Choose a reason for hiding this comment

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

okay sure

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 8, 2021
sbueringer
sbueringer reviewed Dec 8, 2021
View reviewed changes
hack/kind-install-for-capd.sh Outdated
esac
done

if [[ -z "$CAPI_KIND_CLUSTER_NAME" ]]; then
Copy link
Member

Choose a reason for hiding this comment

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

I know there's barely code left but we can simplify this further to:

NAME=${CAPI_KIND_CLUSTER_NAME:-"capi-test"}

Copy link
Member Author

Choose a reason for hiding this comment

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

done

@sbueringer
Copy link
Member

@DiptoChakrabarty fyi. Once #5785 is merged, we have the same issue there. But up to you if you want to already include this in the current PR.

@DiptoChakrabarty
Copy link
Member Author

@DiptoChakrabarty fyi. Once #5785 is merged, we have the same issue there. But up to you if you want to already include this in the current PR.

okay yeah I wanna work on it

killianmuldoon
killianmuldoon approved these changes Dec 8, 2021
View reviewed changes
Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 8, 2021
@enxebre
Copy link
Member

enxebre commented Dec 13, 2021 •
edited

@DiptoChakrabarty Please lets squash commits and remove WIP from PR title before moving forward.

@fabriziopandini
Copy link
Member

/ok-to-test

@DiptoChakrabarty do you mind implementing the same mechanism in

cluster-api/hack/tools/tilt-prepare/main.go

Line 311 in 3231c99

"--name=capi-test", // TODO: make this configurable
(it is the missing bit discussed in #5820 (comment))

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 13, 2021
@DiptoChakrabarty
Copy link
Member Author

/ok-to-test

@DiptoChakrabarty do you mind implementing the same mechanism in

cluster-api/hack/tools/tilt-prepare/main.go

Line 311 in 3231c99

"--name=capi-test", // TODO: make this configurable

(it is the missing bit discussed in #5820 (comment))

yes sure

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 17, 2021
@DiptoChakrabarty DiptoChakrabarty changed the title 馃尡 [WIP] replace hardcoded kind cluster name to pickup env values 馃尡 replace hardcoded kind cluster name to pickup env values Dec 17, 2021
@DiptoChakrabarty
Copy link
Member Author

@DiptoChakrabarty Please lets squash commits and remove WIP from PR title before moving forward.

Done

fabriziopandini
fabriziopandini reviewed Dec 20, 2021
View reviewed changes
hack/tools/tilt-prepare/main.go
cmd := exec.CommandContext(ctx,
"kind",
"load",
"docker-image",
"--name=capi-test", // TODO: make this configurable
namecmd,
Copy link
Member

Choose a reason for hiding this comment

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

I'm fine with a lint exception in this case

Suggested change
namecmd,
namecmd, //nolint:gosec

(not sure the exception is on the right line, but you can test this locally with make lint)

Copy link
Member Author

Choose a reason for hiding this comment

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

yes fixed it

@fabriziopandini
Copy link
Member

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 21, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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 Dec 21, 2021
@k8s-ci-robot k8s-ci-robot merged commit 46df46a into kubernetes-sigs:main Dec 21, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.1 milestone Dec 21, 2021
@DiptoChakrabarty DiptoChakrabarty deleted the kind-env branch December 29, 2021 14:51
@DiptoChakrabarty DiptoChakrabarty mentioned this pull request Mar 23, 2022
Closed
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@fabriziopandini fabriziopandini fabriziopandini left review comments

@killianmuldoon killianmuldoon killianmuldoon approved these changes

@CecileRobertMichon CecileRobertMichon Awaiting requested review from CecileRobertMichon

Assignees

@fabriziopandini fabriziopandini

@killianmuldoon killianmuldoon

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.1
Development

Successfully merging this pull request may close these issues.

Make dev kind cluster name configurable
6 participants
@DiptoChakrabarty @k8s-ci-robot @sbueringer @enxebre @fabriziopandini @killianmuldoon