Skip to content

Conversation

@dinhxuanvu
Copy link
Member

The three fields ConfigFile, DataDir and Manifests don't need to be user-configurable. Those values should be set to be default values at all time. As a result, those fields can be removed off microshift config to avoid supporting these user-facing configuration in the future.

Signed-off-by: Vu Dinh vudinh@outlook.com

Which issue(s) this PR addresses:

Closes #

@dinhxuanvu
Copy link
Member Author

@dgrisonnet @benluddy PTAL

@openshift-ci openshift-ci bot requested review from benluddy and pacevedom October 17, 2022 13:56
@dinhxuanvu dinhxuanvu force-pushed the config-update branch 2 times, most recently from abf83a0 to 4236e6e Compare October 19, 2022 18:48
Copy link
Contributor

Choose a reason for hiding this comment

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

The manifest directories are described in the next section, can we drop the mention here? Is the config docs the first place a user will look to figure out where persistent cluster state is stored?

Copy link
Member Author

Choose a reason for hiding this comment

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

So far this is the only place where all of config settings are mentioned. So I took the liberty to update it. I'm not sure if there is a more formal docs for all of these somewhere else.

@ggiguash
Copy link
Contributor

ggiguash commented Oct 21, 2022

/retitle USHIFT-500: Remove ConfigFile, DataDir and Manifests fields off MicroShift config

@openshift-ci openshift-ci bot changed the title Remove ConfigFile, DataDir and Manifests fields off microshift config USHIFT-500: Remove ConfigFile, DataDir and Manifests fields off MicroShift config Oct 21, 2022
@dinhxuanvu dinhxuanvu force-pushed the config-update branch 2 times, most recently from 54552d6 to f1a693a Compare October 24, 2022 16:44
@benluddy
Copy link
Contributor

/retest

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 26, 2022
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 26, 2022
@dinhxuanvu dinhxuanvu force-pushed the config-update branch 2 times, most recently from 1f6ec50 to 26a517c Compare October 26, 2022 15:40
@benluddy
Copy link
Contributor

/approve

/assign @fzdarsky

This looks in line with the discussion on Vu's original PR. Are there any outstanding concerns about this particular change?

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 26, 2022
The three fields ConfigFile, DataDir and Manifests don't need to be
user-configurable. Those values should be set to be default values
at all time. As a result, those fields can be removed off microshift
config to avoid supporting these user-facing configuration in the
future.

Signed-off-by: Vu Dinh <vudinh@outlook.com>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 27, 2022

@dinhxuanvu: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/periodic-ocp-4.13-images f1a693ab2a63dfae310d7a0261271b750586cda8 link true /test periodic-ocp-4.13-images

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

@dinhxuanvu
Copy link
Member Author

@dhellmann please take a look when you have the time. Thanks

Copy link
Contributor

@dhellmann dhellmann left a comment

Choose a reason for hiding this comment

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

I think we can point to a few cleanups, but let's get this in now and iterate on those separately.

/lgtm

func RunMicroshift(cfg *config.MicroshiftConfig, flags *pflag.FlagSet) error {

if err := cfg.ReadAndValidate(flags); err != nil {
if err := cfg.ReadAndValidate("", flags); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think instead of having ReadAndValidatate() be responsible for setting a default, this higher level function should do it. We can fix that in a follow-up PR, though.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 27, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 27, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: benluddy, dhellmann, dinhxuanvu

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@benluddy
Copy link
Contributor

/retest-required

@dhellmann
Copy link
Contributor

I realized after approving that the sample file (https://github.com/openshift/microshift/blob/main/packaging/microshift/config.yaml) also mentions some of these options. That should be a quick follow-up PR, too.

@benluddy
Copy link
Contributor

@dhellmann @dinhxuanvu I took the liberty of opening https://issues.redhat.com/browse/USHIFT-528 to keep track of the requested follow-up changes. Please add anything I missed.

@openshift-merge-robot openshift-merge-robot merged commit 964fa3d into openshift:main Oct 27, 2022
Comment on lines -183 to -185
if len(c.ConfigFile) == 0 {
return nil
}
Copy link
Contributor

Choose a reason for hiding this comment

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

^

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants