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

Re-introduce PR#1030 baseDomain patch and add backend logic #1176

Merged
merged 5 commits into from
Dec 9, 2022

Conversation

mangelajo
Copy link
Contributor

@mangelajo mangelajo commented Dec 7, 2022

  • Re-introduce PR#1030 baseDomain patch
  • USHIFT-664 Backend logic to baseDomain

Co-authored-by: Vu Dinh <vudinh@outlook.com>
Co-authored-by: Damien Grisonnet <dgrisonn@redhat.com>
@mangelajo
Copy link
Contributor Author

@fzdarsky @dinhxuanvu , please see the two commit structure, on first commit, I introduce @dinhxuanvu original patch, on second commit I handle the logic to match OpenShift behavior, also introducing the fixed "cluster.local" setting.

@mangelajo mangelajo changed the title USHIFT 664 Re-introduce PR#1030 baseDomain patch and add backend logic Dec 7, 2022
@openshift-ci openshift-ci bot requested a review from copejon December 7, 2022 16:36
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 7, 2022
docs/howto_config.md Outdated Show resolved Hide resolved
ClusterDomain is removed in the previous commit, since OpenShift seems
to always hardcode "cluster.local" in the DNS operator.

BaseDomain is propagated down to the right places, like TLS certificate
generation, and injected into the router pod.
docs/howto_config.md Outdated Show resolved Hide resolved
pkg/cmd/init.go Outdated Show resolved Hide resolved
docs/howto_config.md Outdated Show resolved Hide resolved
pkg/cmd/init.go Outdated Show resolved Hide resolved
pkg/cmd/init.go Outdated Show resolved Hide resolved
pkg/config/config.go Outdated Show resolved Hide resolved
// For example, given the base domain `openshift.example.com`, an API server
// DNS record may be created for `cluster-api.openshift.example.com`.
//
// Once set, this field cannot be changed.
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need another ticket to protect against the value changing?

Copy link
Member

Choose a reason for hiding this comment

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

I believe that this is a comment inherited from the OCP config API: https://github.com/openshift/api/blob/master/config/v1/types_dns.go#L27-L34

We might want to update it if it doesn't apply to MicroShift

Copy link
Contributor

Choose a reason for hiding this comment

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

It does apply to MicroShift, too, I think @dhellmann 's concern was more where/how this is enforced.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We may want to enforce against changes, I agree.

Copy link
Member

@dinhxuanvu dinhxuanvu left a comment

Choose a reason for hiding this comment

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

Just a few minor nits. Overall, the PR looks good.

pkg/config/config.go Outdated Show resolved Hide resolved
pkg/config/config.go Show resolved Hide resolved
pkg/cmd/init.go Outdated Show resolved Hide resolved
docs/howto_config.md Outdated Show resolved Hide resolved
assets/components/openshift-router/deployment.yaml Outdated Show resolved Hide resolved
pkg/cmd/init.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/cmd/init.go Show resolved Hide resolved
docs/howto_config.md Outdated Show resolved Hide resolved
@oglok
Copy link
Contributor

oglok commented Dec 9, 2022

Squash at least last two commits, so we avoid having two with the same title in history.

@fzdarsky
Copy link
Contributor

fzdarsky commented Dec 9, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 9, 2022
@mangelajo mangelajo added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Dec 9, 2022
@mangelajo
Copy link
Contributor Author

Squash at least last two commits, so we avoid having two with the same title in history.

I added the merge method "squash" for tide to handle.

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

fzdarsky commented Dec 9, 2022

/lgtm

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

openshift-ci bot commented Dec 9, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fzdarsky, 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

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 68fb38c and 2 for PR HEAD 9f7fff8 in total

@fzdarsky
Copy link
Contributor

fzdarsky commented Dec 9, 2022

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 9, 2022

@mangelajo: 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.

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. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants