Repository navigation
[release-ocm-2.11] MGMT-18508: Allow converged from 4.17 hub - #6643
openshift-merge-bot[bot] merged 2 commits into
Conversation
…ble (openshift#6533) * MGMT-17478: Use ICC config secret for converged flow info when available When available, read the ICC secret set by BMO in order to retrieve the agent image, the agent URL(s), and the inspector URL(s). This this change, we wil try to: 1/ Get the agent image from the user override 2/ if 1/ is not found, get the image from the ICC configuration 3/ if 2/ is not found, get the image from the HUB cluster 4/ if 3/ is not found, return the default image * Add context to GetICCConfig method * remove space * refactor tiered logic * Create GetImageArchitecture mehod * fix lint * refactor logs and getIronicAgentImageByRelease * add infraenv in logger earlier * make getICCConfig private
…nshift#6639) * This allows ironic inspector URL to be missing in ICC config secret. In 4.17 this is expected to be missing as the inspector service as been removed. If this URL is provided the agent will attempt to contact the inspector service when it shouldn't causing the install to fail. In earlier versions the secret will not be present so the controller will continue to provide the inspector service URL as before. Resolves https://issues.redhat.com/browse/OCPBUGS-37472 * Update image-customization-controller to release-4.16 branch This includes a patch which removes the default for the inspector URL. This is required because when deploying from a 4.17 hub the inspector URL will not be present in the information on the cluster and we don't want that URL to be set in the ignition.
openshift-ci-robot
added
the
jira/valid-reference
|
@carbonin: This pull request references MGMT-18508 which is a valid jira issue. 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 openshift-eng/jira-lifecycle-plugin repository. |
openshift-ci
Bot
added
the
size/L
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: adriengentil, carbonin 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 |
openshift-ci
Bot
added
the
approved
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## release-ocm-2.11 #6643 +/- ##
====================================================
+ Coverage 68.45% 68.51% +0.05%
====================================================
Files 247 247
Lines 36267 36334 +67
====================================================
+ Hits 24827 24893 +66
- Misses 9238 9240 +2
+ Partials 2202 2201 -1
|
|
@carbonin: all tests passed! 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-sigs/prow repository. I understand the commands that are listed here. |
3 participants
This PR backports #6533 and #6639
Together these PRs allow successful discovery of hosts using a 4.17 hub cluster and converged flow which will be required in 2.11 when 4.17 is released.
List all the issues related to this PR
Resolves https://issues.redhat.com/browse/MGMT-18508
What environments does this code impact?
How was this code tested?
Checklist
docs, README, etc)Reviewers Checklist