AGENT-1072: Apply operator manifests from ConfigMap for agent-installer #1175
Conversation
openshift-ci-robot
added
the
jira/valid-reference
|
@bfournie: This pull request references AGENT-1072 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set. In 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. |
|
/cc @andfasano |
openshift-ci
bot
added
the
size/L
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: bfournie The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## master #1175 +/- ##
==========================================
+ Coverage 55.71% 56.06% +0.35%
==========================================
Files 15 15
Lines 3450 3510 +60
==========================================
+ Hits 1922 1968 +46
- Misses 1323 1330 +7
- Partials 205 212 +7
🚀 New features to boost your workflow:
|
bfournie
force-pushed
the
agent-operators-configmap
branch
3 times, most recently
from
1085219 to
bfa1a01
Compare
| Content string | ||
| } | ||
|
|
||
| // Contents of ConfigMap containing operator manifests | ||
| type operatorMetadata struct { |
There was a problem hiding this comment.
Since it's already defined in AS (https://github.com/openshift/assisted-service/pull/7818/files#diff-bedca24305045fda0daa5e7b8fee347f6e9c3ec018f6eebddbfe9e55b93fe9d7R62), couldn't be vendored to avoid duplications?
There was a problem hiding this comment.
The internal directory where this is defined can't be vendored and it didn't seem worth it to create a new model file just for it.
src/assisted_installer_controller/assisted_installer_controller.go
Outdated
Show resolved
Hide resolved
| } | ||
| } | ||
| // Apply manifests from configMap if ready | ||
| if !c.applyOperatorManifests(olmOperators, manifests, kubeconfigPath) { |
There was a problem hiding this comment.
I was expecting this method to just retrieve the manifests (instead of querying them to AS)? Wasn't the PostInstallConfigs already responsible for applying them?
There was a problem hiding this comment.
PostInstallConfigs() isn't called since it uses the API, which is why this function - PostInstallConfigsK8sClient() was added to only use the Kubernetes API to apply the manifests. This is the only place they will be applied.
bfournie
force-pushed
the
agent-operators-configmap
branch
2 times, most recently
from
b853750 to
1cd1aa5
Compare
In the agent-based installer, when cluster installation is complete the assisted-installer cannot access assisted-service since it has terminated. Therefore any operator custom-manifests are not applied. Instead the assisted-service will create a ConfigMap with the manifests and operator info (openshift/assisted-service#7818) and in this PR the assisted-installer will retrieve the ConfigMap and apply the manifests. The intent is that this will only be done for the agent-based installer and not affect the normal path of applying manifests using the assisted-service API.
bfournie
force-pushed
the
agent-operators-configmap
branch
from
1cd1aa5 to
68675d1
Compare
|
@bfournie: 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-sigs/prow repository. I understand the commands that are listed here. |
In the agent-based installer, when cluster installation is complete the assisted-installer cannot access assisted-service since it has terminated. Therefore any operator custom-manifests are not applied. Instead the assisted-service will create a ConfigMap with the manifests and operator info (openshift/assisted-service#7818) and in this PR the assisted-installer will retrieve the ConfigMap and apply the manifests.
The intent is that this will only be done for the agent-based installer and not affect the normal path of applying manifests using the assisted-service API.