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.

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

USHIFT-673: Clean up config file format #1187

Merged
merged 4 commits into from
Dec 15, 2022

Conversation

fzdarsky
Copy link
Contributor

@fzdarsky fzdarsky commented Dec 11, 2022

  • Groups cluster-, node-, and apiserver-related params.
  • Wires-through the cluster-name parameter.
  • Updates /etc/microshift/config.yaml.default to reflect the format correctly.
  • Removes 'url' field from being user-configurable.
  • Fixes a couple of parameter descriptions.

Closes USHIFT-673

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 11, 2022
@mangelajo
Copy link
Contributor

/approve

@mangelajo
Copy link
Contributor

For me this structure makes a lot of sense. I believe it would be a good idea to go with this structure for 4.12

@mangelajo
Copy link
Contributor

hostnameOverride: "" is a better name than what we had before because it's more specific about the intent, and seems ok to leave it empty, while before it was confusing if you had to provide it.

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.

This changes some of the fields I asked @dgrisonnet and @benluddy to include in their enhancement, so I'd like them to look at the PR.

I had a couple of questions inline, too.

docs/howto_config.md Show resolved Hide resolved
pkg/config/config.go 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 Dec 12, 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 Dec 12, 2022
docs/howto_config.md Show resolved Hide resolved
pkg/cmd/init.go Outdated Show resolved Hide resolved
docs/howto_config.md Show resolved Hide resolved
baseDomain: ""
node:
hostnameOverride: ""
nodeIP: ""
Copy link
Contributor

Choose a reason for hiding this comment

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

This field is (currently) used for many things that are unrelated to Node/kubelet. Unless that's going to change, I think putting it into a "node" config group is misleading.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can see your point, though I wouldn't call those "many things" unrelated:
We currently use nodeName for a) TLS certs for services on the node, b) in etcd config making the node member, c) as name for the node in kubelet, d) in mDNS to announce the node. In all cases but kubelet, that node name will be a domain name that resolves to the same IP address. In the case of kubelet, the node name defaults to the host name, thus also pointing to the same IP address. It may be overridden (with --override-hostname) to something else, of course, but would still need to be resolvable.

Is there another grouping that'd make more sense to you? Should I revert to "nodeName" (although that also suggests "node") or use hostnameOverride (although we use it for things unrelated to kubelet)?

docs/howto_config.md Show resolved Hide resolved
@@ -67,7 +67,7 @@ func TestConfigure(t *testing.T) {
"--secure-port=10257",
fmt.Sprintf("--service-account-private-key-file=%s", kcmServiceAccountPrivateKeyFile()),
"--use-service-account-credentials=true",
"-v=0",
"-v=2",
Copy link
Member

Choose a reason for hiding this comment

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

we should set it to Normal to make sure that the new UX works

Copy link
Contributor Author

Choose a reason for hiding this comment

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

"Normal" corresponds to "2", correct?

Copy link
Contributor

Choose a reason for hiding this comment

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

@dgrisonnet we commented about that here. Do you mean that?

Copy link
Contributor

@mangelajo mangelajo left a comment

Choose a reason for hiding this comment

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

We should probably just drop ClusterName then

Signed-off-by: Frank A. Zdarsky <fzdarsky@redhat.com>
Signed-off-by: Frank A. Zdarsky <fzdarsky@redhat.com>
Signed-off-by: Frank A. Zdarsky <fzdarsky@redhat.com>
Signed-off-by: Frank A. Zdarsky <fzdarsky@redhat.com>
Copy link
Contributor

@mangelajo mangelajo left a comment

Choose a reason for hiding this comment

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

/approve

@fzdarsky
Copy link
Contributor Author

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 15, 2022

@fzdarsky: all tests passed!

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.

@oglok
Copy link
Contributor

oglok commented Dec 15, 2022

I'll take the shot of tagging this. I think there were great points and discussions on the PR. Some of them have been addressed and I think the result makes a lot of sense. If there is a need to make a minor change, it could be done in a follow PR, but let's get this merged since it's important for 4.12.

/lgtm

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

openshift-ci bot commented Dec 15, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fzdarsky, mangelajo, oglok

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:
  • OWNERS [fzdarsky,mangelajo,oglok]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

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.

None yet

9 participants