Add temporary support for mce installation #1474

mhanss · 2022-11-03T12:25:32Z

LSO has not been published to the 4.12 redhat-operators catalog, so it cannot be installed on OpenShift 4.12. Until this is resolved, installing LSO with 4.11 catalog as redhat-operators-v4-11.

openshift-ci · 2022-11-03T12:25:42Z

Hi @mhanss. Thanks for your PR.

I'm waiting for a openshift-metal3 member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

bfournie · 2022-11-03T13:16:42Z

agent/04_agent_configure.sh

@@ -461,7 +461,10 @@ EOF
 function oc_mirror_mce() {
   tmpimageset=$(mktemp --tmpdir "mceimageset--XXXXXXXXXX")
   _tmpfiles="$_tmpfiles $tmpimageset"
-
+   # TODO: Remove this once LSO is published to the 4.12 catalog.
+   if [[ ${OPENSHIFT_RELEASE_STREAM} == "4.12" || ${OPENSHIFT_RELEASE_STREAM} == "4.13" ]]; then


Need to add another conditional so this is only changed when using MCE, e.g.
if [ ! -z "${AGENT_DEPLOY_MCE}" ]; then

Also it would be useful to log a warning message so its obvious that the release stream being used is not the one the user set

Condition added!

bfournie · 2022-11-03T15:16:00Z

agent/05_agent_create_cluster.sh

+function create_lso_operator_v4_11() {
+  if [[ ${OPENSHIFT_RELEASE_STREAM} == "4.12" || ${OPENSHIFT_RELEASE_STREAM} == "4.13" ]]; then
+    oc delete subscription local-storage-operator -n openshift-local-storage
+    cat > "${mceManifests}/lso_operator_4_11.yaml" << EOF


I'd remove the 4_11 from the name of this file so it be made more generic if you need to this same mechanism for future releases

bfournie · 2022-11-03T15:16:30Z

agent/05_agent_create_cluster.sh

+ source: redhat-operators-v4-11
+ sourceNamespace: openshift-marketplace
+EOF
+    apply_manifest "$mceManifests/lso_operator_4_11.yaml"


also remove 4_11 name here

bfournie · 2022-11-03T15:17:02Z

agent/05_agent_create_cluster.sh

+spec:
+ installPlanApproval: Automatic
+ name: local-storage-operator
+ source: redhat-operators-v4-11


should use a variable for "4-11" so can use for future releases

bfournie · 2022-11-03T15:19:28Z

agent/05_agent_create_cluster.sh

 function mce_prepare_postinstallation_manifests() {
  local mceManifests=$1
-
+  # TODO: Remove this once LSO is published to the 4.12 catalog.
+  create_lso_operator_v4_11


If we think this same issue can happen in the future, e.g. when 4.13 is being released and its operator is not released yet we should make this generic, for example, call it "create_lp_operator_latest_available' and use a variable to contain the latest - 4.11 in this case

Changes have been implemented!

lranjbar · 2022-11-08T15:59:32Z

agent/04_agent_configure.sh

+   # TODO: Remove this once LSO is published to the 4.12 catalog.
+   local version="$(openshift_version ${OCP_DIR})"
+   if [[ ( -n "${AGENT_DEPLOY_MCE}" ) && ( ${version} == "4.12" || ${version} == "4.13" ) ]]; then
+     local OPENSHIFT_RELEASE_STREAM="4.11"
+   fi


This stops us from installing OCP 4.12 and OCP 4.13 doesn't it? Not sure if this is the right approach to take here.

Can't reach out to ART and DPTP to get LSO included in earlier catalogs to fix this?

lranjbar · 2022-11-09T21:51:40Z

Update: After talking about this with the team we will first take this approach and move this job to a weekly with a follow up approach to try to solving the underlying problem.

lranjbar · 2022-11-09T21:51:52Z

/approve

openshift-ci · 2022-11-09T21:57:16Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lranjbar

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:

~~agent/OWNERS~~ [lranjbar]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

andfasano · 2022-11-10T14:40:04Z

/ok-to-test

andfasano

Thanks @mhanss for your contribution. In general, I think it would be simpler to directly hard-code the "working" configuration in the existing manifests - so that we'll have the minimum impact possible on the existing code.
Also, it would be simpler in future to throw away such temporary change once the catalog will be working.

andfasano · 2022-11-10T14:47:00Z

agent/05_agent_create_cluster.sh

+    registryPoll:
+      interval: 10m0s
+EOF
+    apply_manifest "$mceManifests/catalog_source_lso_operator.yaml"


Any specific reason for not having it as a manifest asset directly under /agent/asset/mce folder? Otherwise, also for consistency with the other manifests, I'd prefer to have it there.
I guess it could also be added directly as an extra manifest.

I think putting it in /agent/asset/mce makes more sense

@andfasano @celebdor As per the current implementation, we only need to remove the code from the current file but when we will move the files to the mce directory then we need to remove code/files from multiple places when the operator would be available to the 4.12 catalog. Please let me know your thoughts, I am okay with both approaches.

@bfournie already started an activity to move the templating via Ansible, so it'd be better if we could stay on that side for the new developments (and keep away from bash). Wouldn't be sufficient just to define the source conditionally in this case? Note: any other change could be conditionally added in the same template as well, if required

andfasano · 2022-11-10T14:48:25Z

agent/05_agent_create_cluster.sh

+spec:
+ installPlanApproval: Automatic
+ name: local-storage-operator
+ source: ${catalog_source_name}


I guess this could be added directly in the existing manifest, in this way it seems it could be possible to simplify the code

openshift-merge-robot · 2022-12-21T02:20:03Z

@mhanss: PR needs rebase.

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.

openshift-ci · 2023-07-31T14:32:24Z

@mhanss: 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/e2e-agent-compact-ipv4	`0bdf0a2`	link	true	`/test e2e-agent-compact-ipv4`

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.

openshift-ci bot requested review from bfournie and pawanpinjarkar November 3, 2022 12:25

openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 3, 2022

bfournie reviewed Nov 3, 2022

View reviewed changes

Add temporary support for mce installation

0bdf0a2

mhanss force-pushed the temp-support-mce-4-12-13 branch from f591d65 to 0bdf0a2 Compare November 4, 2022 06:36

lranjbar suggested changes Nov 8, 2022

View reviewed changes

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 9, 2022

openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 10, 2022

andfasano reviewed Nov 10, 2022

View reviewed changes

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 21, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add temporary support for mce installation #1474

Add temporary support for mce installation #1474

mhanss commented Nov 3, 2022

openshift-ci bot commented Nov 3, 2022

bfournie Nov 3, 2022 •

edited

Loading

mhanss Nov 4, 2022

bfournie Nov 3, 2022

bfournie Nov 3, 2022

bfournie Nov 3, 2022

bfournie Nov 3, 2022

mhanss Nov 4, 2022

lranjbar Nov 8, 2022 •

edited

Loading

lranjbar commented Nov 9, 2022

lranjbar commented Nov 9, 2022

openshift-ci bot commented Nov 9, 2022

andfasano commented Nov 10, 2022

andfasano left a comment

andfasano Nov 10, 2022

celebdor Nov 10, 2022

mhanss Nov 14, 2022

andfasano Dec 5, 2022 •

edited

Loading

andfasano Nov 10, 2022

openshift-merge-robot commented Dec 21, 2022

openshift-ci bot commented Jul 31, 2023

Add temporary support for mce installation #1474

Are you sure you want to change the base?

Add temporary support for mce installation #1474

Conversation

mhanss commented Nov 3, 2022

openshift-ci bot commented Nov 3, 2022

bfournie Nov 3, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lranjbar Nov 8, 2022 • edited Loading

Choose a reason for hiding this comment

lranjbar commented Nov 9, 2022

lranjbar commented Nov 9, 2022

openshift-ci bot commented Nov 9, 2022

andfasano commented Nov 10, 2022

andfasano left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andfasano Dec 5, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

openshift-merge-robot commented Dec 21, 2022

openshift-ci bot commented Jul 31, 2023

bfournie Nov 3, 2022 •

edited

Loading

lranjbar Nov 8, 2022 •

edited

Loading

andfasano Dec 5, 2022 •

edited

Loading