OCPBUGS-2436: Fix ingress config with empty lbType on AWS#6489
OCPBUGS-2436: Fix ingress config with empty lbType on AWS#6489Miciah wants to merge 1 commit intoopenshift:masterfrom
Conversation
When generating the ingresses.config.openshift.io/cluster manifest on AWS,
don't set spec.loadBalancer unless the install-config lbType is nonempty.
Before this commit, if lbType was empty, the installer generated a manifest
with the following:
loadBalancer:
platform:
aws: {}
type: AWS
Whereas loadBalancer, platform, and aws are optional fields, the type
subfield of the aws field is required. As a consequence, the cluster
bootstrap would fail with the following error:
"cluster-ingress-02-config.yml": failed to create ingresses.v1.config.openshift.io/cluster -n : Ingress.config.openshift.io "cluster" is invalid: spec.loadBalancer.platform.aws.type: Required value
This commit ensures that the installer doesn't generate an invalid ingress
manifest when lbType is empty.
Follow-up to commit 5d12adc.
This commit fixes bug OCPBUGS-2436.
https://issues.redhat.com/browse/OCPBUGS-2436
* pkg/asset/manifests/ingress.go (generateClusterConfig): Don't set
spec.loadBalancer unless we have a nonempty lbType value to put in
spec.loadBalancer.platform.aws.type.
|
@Miciah: This pull request references Jira Issue OCPBUGS-2436, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
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. |
|
@Miciah: This pull request references Jira Issue OCPBUGS-2436, which is invalid:
Comment DetailsIn response to this:
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. |
|
/jira refresh |
|
@Miciah: This pull request references Jira Issue OCPBUGS-2436, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira (gpei@redhat.com), skipping review request. DetailsIn response to this:
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. |
|
/lgtm |
|
thanks @Miciah ! |
|
/approve |
|
[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 DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/test e2e-aws-ovn |
|
/skip |
|
/retest-required |
1 similar comment
|
/retest-required |
|
/hold After the revert lands, can you build this fix on top of unreverting, and then make sure it passes the jobs that are currently broken on the payload? It looks like aws-sdn-serial is the clearest one. You can use |
|
@Miciah: PR needs rebase. DetailsInstructions 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. |
|
@Miciah: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
@Miciah: This pull request references Jira Issue OCPBUGS-2436. The bug has been updated to no longer refer to the pull request using the external bug tracker. DetailsIn response to this:
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. |
|
@Miciah: Closed this PR. DetailsIn response to this:
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. |
When generating the
ingresses.config.openshift.io/clustermanifest on AWS, don't setspec.loadBalancerunless the install-configlbTypeis nonempty.Before this PR, if
lbTypewas empty, the installer generated a manifest with the following:Whereas
loadBalancer,platform, andawsare optional fields, thetypesubfield of theawsfield is required. As a consequence, the cluster bootstrap would fail with the following error:This PR ensures that the installer doesn't generate an invalid ingress manifest when
lbTypeis empty.Follow-up to #6478.
pkg/asset/manifests/ingress.go(generateClusterConfig): Don't setspec.loadBalancerunless we have a nonemptylbTypevalue to put inspec.loadBalancer.platform.aws.type.