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

USHIFT-607: Introduce a new config format for microshift config #1030

Merged
merged 1 commit into from
Dec 7, 2022
Merged

USHIFT-607: Introduce a new config format for microshift config #1030

merged 1 commit into from
Dec 7, 2022

Conversation

dinhxuanvu
Copy link
Member

Separate component-specific config and microshift-specific config into 2 sections within top-level config. The components config is modelled after OpenShift config v1 API while microshift config contains fields that are specific to microshift usage.

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

Which issue(s) this PR addresses:

Closes #

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 19, 2022
@openshift-ci openshift-ci bot requested review from ggiguash and oglok October 19, 2022 09:56
dhellmann
dhellmann reviewed Oct 19, 2022
View reviewed changes
pkg/config/config.go Outdated Show resolved Hide resolved
@dinhxuanvu
Copy link
Member Author

@benluddy @dgrisonnet @fzdarsky Please take a look.
Just a note here that this PR only contains the config API spec/definition and there is not wiring yet. I will do the wiring after we agree upon the spec.

deads2k
deads2k reviewed Oct 20, 2022
View reviewed changes
pkg/config/config.go Outdated Show resolved Hide resolved
fzdarsky
fzdarsky reviewed Oct 20, 2022
View reviewed changes
pkg/config/config.go Outdated Show resolved Hide resolved
dgrisonnet
dgrisonnet reviewed Oct 21, 2022
View reviewed changes
pkg/config/config.go Outdated Show resolved Hide resolved
pkg/config/config.go Outdated Show resolved Hide resolved
pkg/config/config.go Outdated Show resolved Hide resolved
dinhxuanvu
dinhxuanvu commented Oct 24, 2022
View reviewed changes
pkg/config/config.go Outdated Show resolved Hide resolved
pkg/config/config.go Outdated Show resolved Hide resolved
@dinhxuanvu dinhxuanvu mentioned this pull request Oct 25, 2022
Closed
dhellmann
dhellmann reviewed Oct 26, 2022
View reviewed changes
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.

We've had a few conversations about these changes in different places, so it would be useful to capture the reasoning in an enhancement. We could continue to use this PR to hammer out the final structure, and then document it retroactively.

pkg/config/config.go Outdated Show resolved Hide resolved
pkg/config/config.go Outdated Show resolved Hide resolved
pkg/config/config.go Outdated Show resolved Hide resolved
pkg/config/config.go Outdated Show resolved Hide resolved
benluddy
benluddy reviewed Oct 27, 2022
View reviewed changes
pkg/config/config.go Outdated Show resolved Hide resolved
@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 28, 2022
@dgrisonnet dgrisonnet mentioned this pull request Oct 31, 2022
Merged
@dinhxuanvu dinhxuanvu mentioned this pull request Nov 1, 2022
Closed
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 12, 2022
@dinhxuanvu dinhxuanvu changed the title [WIP] Introduce a new config format for microshift config Introduce a new config format for microshift config Nov 12, 2022
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 12, 2022
@dinhxuanvu dinhxuanvu force-pushed the re-config branch 4 times, most recently from 1d6f641 to 090f2c2 Compare November 15, 2022 16:29
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 15, 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 Nov 15, 2022
@dgrisonnet
Copy link
Member

I addressed the outstanding comments, PTAL @fzdarsky @dhellmann.

@dinhxuanvu
Copy link
Member Author

/retest

@mangelajo
Copy link
Contributor

/approve

The new format seems reasonable.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 5, 2022
mangelajo
mangelajo reviewed Dec 5, 2022
View reviewed changes
docs/howto_config.md Outdated Show resolved Hide resolved
mangelajo
mangelajo reviewed Dec 5, 2022
View reviewed changes
docs/howto_config.md Outdated Show resolved Hide resolved
mangelajo
mangelajo reviewed Dec 5, 2022
View reviewed changes
docs/howto_config.md Outdated Show resolved Hide resolved
@mangelajo
Copy link
Contributor

/unapprove

@mangelajo
Copy link
Contributor

I see some inconsistency with baseDomain/domain/clusterDomain

I would suggest we change that parameter to clusterDomain, and we update the description. So this would fully align with the name used in the openshift DNS operator: https://github.com/openshift/cluster-dns-operator/blob/master/pkg/operator/controller/controller_dns_configmap.go#L80

mangelajo
mangelajo reviewed Dec 5, 2022
View reviewed changes
pkg/config/config.go Outdated Show resolved Hide resolved
mangelajo
mangelajo reviewed Dec 5, 2022
View reviewed changes
pkg/config/config.go Outdated Show resolved Hide resolved
mangelajo
mangelajo reviewed Dec 5, 2022
View reviewed changes
test/config.yaml Outdated Show resolved Hide resolved
@mangelajo
Copy link
Contributor

For me it would work to merge and iterate.

@dgrisonnet
Copy link
Member

@mangelajo I renamed the option to clusterDomain and move it to the top-level following @dinhxuanvu's suggestion in #1030 (comment).

@mangelajo
Copy link
Contributor

The test/config.yaml needs an update, I guess it's simply not used yet. We can follow up on that as we explained

/approve

@dinhxuanvu @dgrisonnet
Introduce a new config format for microshift config
3ab20a2 
Separate component-specific config and microshift-specific config
into 2 sections within top-level config. The components config is
modelled after OpenShift config v1 API while microshift config
contains fields that are specific to microshift usage.

Signed-off-by: Vu Dinh <vudinh@outlook.com>
Co-authored-by: Damien Grisonnet <dgrisonn@redhat.com>
@dgrisonnet
Copy link
Member

I updated test/config.yaml.

@mangelajo
Copy link
Contributor

/lgtm

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

openshift-ci bot commented Dec 7, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dinhxuanvu, mangelajo

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

@fzdarsky
Copy link
Contributor

fzdarsky commented Dec 7, 2022

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 7, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 7, 2022 •
edited

@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 c010ced link true /test periodic-ocp-4.13-images

Full PR test history. Your PR dashboard.

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.

@fzdarsky
Copy link
Contributor

fzdarsky commented Dec 7, 2022

/hold cancel
/retest

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 7, 2022
@openshift-merge-robot openshift-merge-robot merged commit 7d924fb into openshift:main Dec 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dhellmann dhellmann dhellmann left review comments

@mangelajo mangelajo mangelajo left review comments

@benluddy benluddy benluddy left review comments

@zshi-redhat zshi-redhat zshi-redhat left review comments

@deads2k deads2k deads2k left review comments

@fzdarsky fzdarsky fzdarsky left review comments

@dgrisonnet dgrisonnet dgrisonnet left review comments

@ggiguash ggiguash Awaiting requested review from ggiguash

@oglok oglok Awaiting requested review from oglok

Assignees

@mangelajo mangelajo

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@dinhxuanvu @fzdarsky @dgrisonnet @mangelajo @dhellmann @benluddy @zshi-redhat @deads2k @openshift-merge-robot