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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

✨ Clusterctl local overrides #2679

Merged
merged 1 commit into from
Mar 19, 2020
Merged

✨ Clusterctl local overrides #2679

merged 1 commit into from
Mar 19, 2020

Conversation

wfernandes
Copy link
Contributor

What this PR does / why we need it:
This PR adds configurability to the overrides directory from within the clusterctl config yaml file.
clusterctl still defaults to ~/.cluster-api/overrides if this property is not specified.

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 #2404

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 13, 2020
@wfernandes wfernandes force-pushed the clusterctl-local-overrides branch from 2c39220 to 299e229 Compare March 13, 2020 21:50
fabriziopandini
fabriziopandini reviewed Mar 16, 2020
View reviewed changes
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

@wfernandes thanks1 for this PR!
Overall it looks ok to me; only a request to better document the background assumptions about layers and a few small nits

docs/book/src/clusterctl/developers.md Outdated Show resolved Hide resolved
cmd/clusterctl/client/repository/overrides.go Show resolved Hide resolved
cmd/clusterctl/client/repository/overrides.go Outdated Show resolved Hide resolved
@wfernandes wfernandes force-pushed the clusterctl-local-overrides branch from 50bd7c8 to 1c63815 Compare March 16, 2020 16:07
Use overridesFolder config to configure overrides
d5b9a37 
Specify the overridesFolder property in the clusterctl config to
determine where the overrides live.
@wfernandes wfernandes force-pushed the clusterctl-local-overrides branch from 1c63815 to d5b9a37 Compare March 17, 2020 17:43
@vincepri
Copy link
Member

/approve

@vincepri
Copy link
Member

@fabriziopandini do we want this to go in v0.3.2?

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri, wfernandes

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 Mar 18, 2020
@fabriziopandini
Copy link
Member

LGTM
@vincepri this work is related to the work on E2E, not to user request,.
nevertheless, I think it can help to clarify some confusion around local overrides so I'm +1 for getting this merged in the next patch release

@vincepri
Copy link
Member

/lgtm
per comment above

/milestone v0.3.2

@k8s-ci-robot k8s-ci-robot added this to the v0.3.2 milestone Mar 19, 2020
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 19, 2020
@k8s-ci-robot k8s-ci-robot merged commit 8b29a9a into kubernetes-sigs:master Mar 19, 2020
@wfernandes wfernandes deleted the clusterctl-local-overrides branch April 6, 2020 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fabriziopandini fabriziopandini fabriziopandini left review comments

@randomvariable randomvariable Awaiting requested review from randomvariable

@vincepri vincepri Awaiting requested review from vincepri

Assignees

@vincepri vincepri

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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v0.3.2
Development

Successfully merging this pull request may close these issues.

[clusterctl] Provide control over local override features
4 participants
@wfernandes @vincepri @k8s-ci-robot @fabriziopandini