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

no-jira: Private domains in survey for PowerVS #8303

Merged

Conversation

miyamotoh
Copy link
Contributor

@miyamotoh miyamotoh commented Apr 23, 2024

Adding private domains to the "Base Domain" survey, and when chosen, the publish: value in resultant install-config.yaml reflects the Internal publishing strategy.

Proposed here is to denote the private/internal ones with (Internal) like this in survey;
image

And selecting one of the Internal ones would result in publish: Internal (otherwise External);
image

Signed-off-by: Hiro Miyamoto miyamotoh@us.ibm.com

@AshwinHIBM
Copy link
Contributor

https://github.com/miyamotoh/installer/blob/private-domains-in-survey/pkg/asset/installconfig/installconfig_test.go#L23
baseDomain := &baseDomain{BaseDomain: "test-domain"}

Other than that, lgtm. install-config.yaml shows the correct values for base domain and publish strategy and I can generate correct manifests successfully.

Signed-off-by: Hiro Miyamoto <miyamotoh@us.ibm.com>
Copy link
Contributor

openshift-ci bot commented Apr 23, 2024

@miyamotoh: 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/okd-e2e-aws-ovn-upgrade 1db371c link false /test okd-e2e-aws-ovn-upgrade

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.

@miyamotoh
Copy link
Contributor Author

@r4f4 I'm seeking guidance here. This PR is proposing to modify the common baseDomain struct, as I didn't see any other way to pass the survey choice down further. Is that a bad idea, or can you suggest another way?

@r4f4
Copy link
Contributor

r4f4 commented Apr 25, 2024

This one I'll defer to @patrickdillon

Copy link
Contributor

@patrickdillon patrickdillon left a comment

Choose a reason for hiding this comment

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

Typically we only allow the most basic configuration in the survey. So publish: Internal has only been supported through the install config.

If there's a good reason to support private clusters through the survey for PowerVS (i.e. it's a common use case), I think this would be fine. Otherwise, it's not really a problem that needs to be solved as it can just be handled through the installconfig.

@@ -21,6 +22,7 @@ import (

type baseDomain struct {
BaseDomain string
Publish types.PublishingStrategy
Copy link
Contributor

Choose a reason for hiding this comment

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

This could be ok.
This creates an informal dependency for the Publishing Strategy on BaseDomain. Typically such dependencies would be formalized in the asset graph.

PublishingStrategy is a field in the Install Config, which depends on the BaseDomain. So the dependency chain seems theoretically fine.

@patrickdillon
Copy link
Contributor

/approve

Copy link
Contributor

openshift-ci bot commented May 3, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 3, 2024
@mjturek
Copy link
Contributor

mjturek commented May 5, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 5, 2024
@miyamotoh miyamotoh changed the title Private domains in survey for PowerVS no-jira: Private domains in survey for PowerVS May 6, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 6, 2024
@openshift-ci-robot
Copy link
Contributor

@miyamotoh: This pull request explicitly references no jira issue.

In response to this:

Adding private domains to the "Base Domain" survey, and when chosen, the publish: value in resultant install-config.yaml reflects the Internal publishing strategy.

Proposed here is to denote the private/internal ones with (Internal) like this in survey;
image

And selecting one of the Internal ones would result in publish: Internal (otherwise External);
image

Signed-off-by: Hiro Miyamoto miyamotoh@us.ibm.com

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 openshift-eng/jira-lifecycle-plugin repository.

@joepvd
Copy link

joepvd commented May 6, 2024

Rudely putting
/hold
wanting to get #8343 in first, and not wait for retests in case this one makes it earlier.

@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 May 6, 2024
@r4f4
Copy link
Contributor

r4f4 commented May 6, 2024

/hold cancel

@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 May 6, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 6692cfc into openshift:master May 7, 2024
21 of 23 checks passed
@miyamotoh
Copy link
Contributor Author

/cherry-pick release-4.15

@openshift-cherrypick-robot

@miyamotoh: #8303 failed to apply on top of branch "release-4.15":

Applying: Adding private DNS domains to survey for PowerVS
Using index info to reconstruct a base tree...
M	pkg/asset/installconfig/basedomain.go
M	pkg/asset/installconfig/installconfig.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/asset/installconfig/installconfig.go
Auto-merging pkg/asset/installconfig/basedomain.go
CONFLICT (content): Merge conflict in pkg/asset/installconfig/basedomain.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Adding private DNS domains to survey for PowerVS
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.15

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-sigs/prow repository.

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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

8 participants