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

MGMT-15425: Change chosen MCE release to match OCP version #5716

Merged
merged 1 commit into from Dec 3, 2023

Conversation

danmanor
Copy link
Contributor

@danmanor danmanor commented Nov 19, 2023

Currently MCE version is hard coded in our code and set to 2.3 (from stable channel). Each OCP release matches at least one (mostly exactly one) MCE release, hence when installing a cluster with OCP release that doesn't match MCE 2.3, we will get an error. To solve this I added a new configuration file which will be updated periodically manually or by an automation that soon will be created. Assisted-service takes the right MCE release according to the cluster's OCP release and this configuration.

For reference:

oc-mirror list operators releases  --catalog=registry.redhat.io/redhat/redhat-operator-index:v4.x --package=multicluster-engine

For 4.15
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
Nothing

For 4.14
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.3

For 4.13
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.2  multicluster-engine.v2.2.9
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.3

For 4.12
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.1  multicluster-engine.v2.1.9
multicluster-engine  stable-2.2  multicluster-engine.v2.2.9
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.3

For 4.11
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.0  multicluster-engine.v2.0.9
multicluster-engine  stable-2.1  multicluster-engine.v2.1.9
multicluster-engine  stable-2.2  multicluster-engine.v2.2.9
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.3

For 4.10
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.0  multicluster-engine.v2.0.9
multicluster-engine  stable-2.1  multicluster-engine.v2.1.9
multicluster-engine  stable-2.2  multicluster-engine.v2.2.9
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.3

List all the issues related to this PR

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

Checklist

  • Title and description added to both, commit and PR.
  • Relevant issues have been associated (see CONTRIBUTING guide)
  • This change does not require a documentation update (docstring, docs, README, etc)
  • Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

  • Are the title and description (in both PR and commit) meaningful and clear?
  • Is there a bug required (and linked) for this change?
  • Should this PR be backported?

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 19, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 19, 2023

@danmanor: This pull request references MGMT-15425 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 bug to target the "4.15.0" version, but no target version was set.

In response to this:

Change chosen MCE release to match OCP version

List all the issues related to this PR

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

Checklist

  • Title and description added to both, commit and PR.
  • Relevant issues have been associated (see CONTRIBUTING guide)
  • This change does not require a documentation update (docstring, docs, README, etc)
  • Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

  • Are the title and description (in both PR and commit) meaningful and clear?
  • Is there a bug required (and linked) for this change?
  • Should this PR be backported?

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 openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 19, 2023
Copy link

openshift-ci bot commented Nov 19, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@danmanor
Copy link
Contributor Author

/test all

@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 19, 2023
@danmanor
Copy link
Contributor Author

/test

Copy link

openshift-ci bot commented Nov 19, 2023

@danmanor: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

  • /test e2e-agent-compact-ipv4
  • /test edge-assisted-operator-catalog-publish-verify
  • /test edge-ci-index
  • /test edge-e2e-ai-operator-ztp
  • /test edge-e2e-ai-operator-ztp-sno-day2-workers
  • /test edge-e2e-ai-operator-ztp-sno-day2-workers-late-binding
  • /test edge-e2e-metal-assisted
  • /test edge-e2e-metal-assisted-4-10
  • /test edge-e2e-metal-assisted-4-11
  • /test edge-e2e-metal-assisted-4-12
  • /test edge-e2e-metal-assisted-4-9
  • /test edge-e2e-metal-assisted-cnv
  • /test edge-e2e-metal-assisted-lvm
  • /test edge-e2e-metal-assisted-odf
  • /test edge-images
  • /test edge-lint
  • /test edge-subsystem-aws
  • /test edge-subsystem-kubeapi-aws
  • /test edge-unit-test
  • /test edge-verify-generated-code
  • /test images
  • /test mce-images

The following commands are available to trigger optional jobs:

  • /test e2e-agent-ha-dualstack
  • /test e2e-agent-sno-ipv6
  • /test edge-e2e-ai-operator-ztp-3masters
  • /test edge-e2e-ai-operator-ztp-capi
  • /test edge-e2e-ai-operator-ztp-compact-day2-masters
  • /test edge-e2e-ai-operator-ztp-compact-day2-workers
  • /test edge-e2e-ai-operator-ztp-disconnected
  • /test edge-e2e-ai-operator-ztp-hypershift-zero-nodes
  • /test edge-e2e-ai-operator-ztp-multiarch-3masters-ocp-411
  • /test edge-e2e-ai-operator-ztp-multiarch-sno-ocp-411
  • /test edge-e2e-ai-operator-ztp-node-labels
  • /test edge-e2e-ai-operator-ztp-sno-day2-masters
  • /test edge-e2e-ai-operator-ztp-sno-day2-workers-ignitionoverride
  • /test edge-e2e-metal-assisted-4-13
  • /test edge-e2e-metal-assisted-4-14
  • /test edge-e2e-metal-assisted-4-15
  • /test edge-e2e-metal-assisted-bond
  • /test edge-e2e-metal-assisted-day2
  • /test edge-e2e-metal-assisted-day2-arm-workers
  • /test edge-e2e-metal-assisted-day2-single-node
  • /test edge-e2e-metal-assisted-ipv4v6
  • /test edge-e2e-metal-assisted-ipv6
  • /test edge-e2e-metal-assisted-kube-api-late-binding-single-node
  • /test edge-e2e-metal-assisted-kube-api-late-unbinding-ipv4-single-node
  • /test edge-e2e-metal-assisted-kube-api-net-suite
  • /test edge-e2e-metal-assisted-mce
  • /test edge-e2e-metal-assisted-mce-4-10
  • /test edge-e2e-metal-assisted-mce-sno
  • /test edge-e2e-metal-assisted-metallb
  • /test edge-e2e-metal-assisted-none
  • /test edge-e2e-metal-assisted-onprem
  • /test edge-e2e-metal-assisted-single-node
  • /test edge-e2e-metal-assisted-static-ip-suite
  • /test edge-e2e-metal-assisted-tang
  • /test edge-e2e-metal-assisted-tpmv2
  • /test edge-e2e-metal-assisted-upgrade-agent
  • /test edge-e2e-nutanix-assisted
  • /test edge-e2e-nutanix-assisted-2workers
  • /test edge-e2e-nutanix-assisted-4-14
  • /test edge-e2e-oci-assisted
  • /test edge-e2e-oci-assisted-4-14
  • /test edge-e2e-vsphere-assisted
  • /test edge-e2e-vsphere-assisted-4-12
  • /test edge-e2e-vsphere-assisted-4-13
  • /test edge-e2e-vsphere-assisted-4-14
  • /test edge-e2e-vsphere-assisted-umn
  • /test edge-push-pr-image
  • /test push-pr-image

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-assisted-service-master-e2e-agent-compact-ipv4
  • pull-ci-openshift-assisted-service-master-edge-ci-index
  • pull-ci-openshift-assisted-service-master-edge-e2e-ai-operator-ztp
  • pull-ci-openshift-assisted-service-master-edge-e2e-metal-assisted
  • pull-ci-openshift-assisted-service-master-edge-e2e-metal-assisted-cnv
  • pull-ci-openshift-assisted-service-master-edge-e2e-metal-assisted-lvm
  • pull-ci-openshift-assisted-service-master-edge-e2e-metal-assisted-mce
  • pull-ci-openshift-assisted-service-master-edge-e2e-metal-assisted-odf
  • pull-ci-openshift-assisted-service-master-edge-images
  • pull-ci-openshift-assisted-service-master-edge-lint
  • pull-ci-openshift-assisted-service-master-edge-subsystem-aws
  • pull-ci-openshift-assisted-service-master-edge-subsystem-kubeapi-aws
  • pull-ci-openshift-assisted-service-master-edge-unit-test
  • pull-ci-openshift-assisted-service-master-edge-verify-generated-code
  • pull-ci-openshift-assisted-service-master-images
  • pull-ci-openshift-assisted-service-master-mce-images

In response to this:

/test

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.

Copy link

codecov bot commented Nov 19, 2023

Codecov Report

Merging #5716 (dda4e7d) into master (270b38b) will increase coverage by 0.05%.
Report is 23 commits behind head on master.
The diff coverage is 65.15%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5716      +/-   ##
==========================================
+ Coverage   67.94%   67.99%   +0.05%     
==========================================
  Files         233      235       +2     
  Lines       34395    34716     +321     
==========================================
+ Hits        23370    23606     +236     
- Misses       8952     9018      +66     
- Partials     2073     2092      +19     
Files Coverage Δ
internal/operators/builder.go 100.00% <100.00%> (ø)
internal/operators/mce/manifest.go 70.83% <71.42%> (-2.50%) ⬇️
internal/operators/mce/mce_operator.go 68.18% <73.33%> (-2.30%) ⬇️
internal/operators/mce/config.go 70.37% <70.37%> (ø)
internal/common/version.go 59.45% <43.75%> (+9.45%) ⬆️

... and 39 files with indirect coverage changes

@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 20, 2023

@danmanor: This pull request references MGMT-15425 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 bug to target the "4.15.0" version, but no target version was set.

In response to this:

Currently MCE version is hard coded in our code and set to 2.3 (from stable channel). Each OCP release matches at least one (mostly exactly one) MCE release, hence when installing a cluster with OCP release that dowsn't match mce 2.3, we will get an error. To solve this I added a new configuration file which will be updated periodically manually or by an automation that soon will be created. Assisted-service takes the right MCE release according toi the cluster's OCP release and this configuration.

List all the issues related to this PR

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

Checklist

  • Title and description added to both, commit and PR.
  • Relevant issues have been associated (see CONTRIBUTING guide)
  • This change does not require a documentation update (docstring, docs, README, etc)
  • Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

  • Are the title and description (in both PR and commit) meaningful and clear?
  • Is there a bug required (and linked) for this change?
  • Should this PR be backported?

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.

@danmanor danmanor marked this pull request as ready for review November 20, 2023 11:39
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 20, 2023
@danmanor
Copy link
Contributor Author

/cc @eifrach @gamli75 @adriengentil

@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 20, 2023

@danmanor: This pull request references MGMT-15425 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 bug to target the "4.15.0" version, but no target version was set.

In response to this:

Currently MCE version is hard coded in our code and set to 2.3 (from stable channel). Each OCP release matches at least one (mostly exactly one) MCE release, hence when installing a cluster with OCP release that doesn't match MCE 2.3, we will get an error. To solve this I added a new configuration file which will be updated periodically manually or by an automation that soon will be created. Assisted-service takes the right MCE release according to the cluster's OCP release and this configuration.

List all the issues related to this PR

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

Checklist

  • Title and description added to both, commit and PR.
  • Relevant issues have been associated (see CONTRIBUTING guide)
  • This change does not require a documentation update (docstring, docs, README, etc)
  • Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

  • Are the title and description (in both PR and commit) meaningful and clear?
  • Is there a bug required (and linked) for this change?
  • Should this PR be backported?

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-robot
Copy link

openshift-ci-robot commented Nov 20, 2023

@danmanor: This pull request references MGMT-15425 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 bug to target the "4.15.0" version, but no target version was set.

In response to this:

Currently MCE version is hard coded in our code and set to 2.3 (from stable channel). Each OCP release matches at least one (mostly exactly one) MCE release, hence when installing a cluster with OCP release that doesn't match MCE 2.3, we will get an error. To solve this I added a new configuration file which will be updated periodically manually or by an automation that soon will be created. Assisted-service takes the right MCE release according to the cluster's OCP release and this configuration.

For reference:

For 4.15
NAME DISPLAY NAME DEFAULT CHANNEL
multicluster-engine multicluster engine for Kubernetes stable-2.4

For 4.14
PACKAGE CHANNEL HEAD
multicluster-engine stable-2.3 multicluster-engine.v2.3.3
multicluster-engine stable-2.4 multicluster-engine.v2.4.0
NAME DISPLAY NAME DEFAULT CHANNEL
multicluster-engine multicluster engine for Kubernetes stable-2.4

For 4.13
PACKAGE CHANNEL HEAD
multicluster-engine stable-2.2 multicluster-engine.v2.2.9
multicluster-engine stable-2.3 multicluster-engine.v2.3.3
multicluster-engine stable-2.4 multicluster-engine.v2.4.0
NAME DISPLAY NAME DEFAULT CHANNEL
multicluster-engine multicluster engine for Kubernetes stable-2.4

For 4.12
PACKAGE CHANNEL HEAD
multicluster-engine stable-2.1 multicluster-engine.v2.1.9
multicluster-engine stable-2.2 multicluster-engine.v2.2.9
multicluster-engine stable-2.3 multicluster-engine.v2.3.3
multicluster-engine stable-2.4 multicluster-engine.v2.4.0
NAME DISPLAY NAME DEFAULT CHANNEL
multicluster-engine multicluster engine for Kubernetes stable-2.3

For 4.11
PACKAGE CHANNEL HEAD
multicluster-engine stable-2.0 multicluster-engine.v2.0.9
multicluster-engine stable-2.1 multicluster-engine.v2.1.9
multicluster-engine stable-2.2 multicluster-engine.v2.2.9
multicluster-engine stable-2.3 multicluster-engine.v2.3.3
NAME DISPLAY NAME DEFAULT CHANNEL
multicluster-engine multicluster engine for Kubernetes stable-2.3

For 4.10
PACKAGE CHANNEL HEAD
multicluster-engine stable-2.0 multicluster-engine.v2.0.9
multicluster-engine stable-2.1 multicluster-engine.v2.1.9
multicluster-engine stable-2.2 multicluster-engine.v2.2.9
multicluster-engine stable-2.3 multicluster-engine.v2.3.3
NAME DISPLAY NAME DEFAULT CHANNEL
multicluster-engine multicluster engine for Kubernetes stable-2.3

List all the issues related to this PR

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

Checklist

  • Title and description added to both, commit and PR.
  • Relevant issues have been associated (see CONTRIBUTING guide)
  • This change does not require a documentation update (docstring, docs, README, etc)
  • Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

  • Are the title and description (in both PR and commit) meaningful and clear?
  • Is there a bug required (and linked) for this change?
  • Should this PR be backported?

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-robot
Copy link

openshift-ci-robot commented Nov 20, 2023

@danmanor: This pull request references MGMT-15425 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 bug to target the "4.15.0" version, but no target version was set.

In response to this:

Currently MCE version is hard coded in our code and set to 2.3 (from stable channel). Each OCP release matches at least one (mostly exactly one) MCE release, hence when installing a cluster with OCP release that doesn't match MCE 2.3, we will get an error. To solve this I added a new configuration file which will be updated periodically manually or by an automation that soon will be created. Assisted-service takes the right MCE release according to the cluster's OCP release and this configuration.

For reference:

For 4.15
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.4

For 4.14
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
multicluster-engine  stable-2.4  multicluster-engine.v2.4.0
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.4


For 4.13
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.2  multicluster-engine.v2.2.9
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
multicluster-engine  stable-2.4  multicluster-engine.v2.4.0
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.4

For 4.12
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.1  multicluster-engine.v2.1.9
multicluster-engine  stable-2.2  multicluster-engine.v2.2.9
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
multicluster-engine  stable-2.4  multicluster-engine.v2.4.0
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.3

For 4.11
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.0  multicluster-engine.v2.0.9
multicluster-engine  stable-2.1  multicluster-engine.v2.1.9
multicluster-engine  stable-2.2  multicluster-engine.v2.2.9
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.3

For 4.10
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.0  multicluster-engine.v2.0.9
multicluster-engine  stable-2.1  multicluster-engine.v2.1.9
multicluster-engine  stable-2.2  multicluster-engine.v2.2.9
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.3

List all the issues related to this PR

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

Checklist

  • Title and description added to both, commit and PR.
  • Relevant issues have been associated (see CONTRIBUTING guide)
  • This change does not require a documentation update (docstring, docs, README, etc)
  • Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

  • Are the title and description (in both PR and commit) meaningful and clear?
  • Is there a bug required (and linked) for this change?
  • Should this PR be backported?

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-robot
Copy link

openshift-ci-robot commented Nov 20, 2023

@danmanor: This pull request references MGMT-15425 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 bug to target the "4.15.0" version, but no target version was set.

In response to this:

Currently MCE version is hard coded in our code and set to 2.3 (from stable channel). Each OCP release matches at least one (mostly exactly one) MCE release, hence when installing a cluster with OCP release that doesn't match MCE 2.3, we will get an error. To solve this I added a new configuration file which will be updated periodically manually or by an automation that soon will be created. Assisted-service takes the right MCE release according to the cluster's OCP release and this configuration.

For reference:

oc-mirror list operators releases  --catalog=registry.redhat.io/redhat/redhat-operator-index:v4.x --package=multicluster-engine

For 4.15
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.4

For 4.14
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
multicluster-engine  stable-2.4  multicluster-engine.v2.4.0
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.4


For 4.13
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.2  multicluster-engine.v2.2.9
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
multicluster-engine  stable-2.4  multicluster-engine.v2.4.0
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.4

For 4.12
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.1  multicluster-engine.v2.1.9
multicluster-engine  stable-2.2  multicluster-engine.v2.2.9
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
multicluster-engine  stable-2.4  multicluster-engine.v2.4.0
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.3

For 4.11
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.0  multicluster-engine.v2.0.9
multicluster-engine  stable-2.1  multicluster-engine.v2.1.9
multicluster-engine  stable-2.2  multicluster-engine.v2.2.9
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.3

For 4.10
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.0  multicluster-engine.v2.0.9
multicluster-engine  stable-2.1  multicluster-engine.v2.1.9
multicluster-engine  stable-2.2  multicluster-engine.v2.2.9
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.3

List all the issues related to this PR

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

Checklist

  • Title and description added to both, commit and PR.
  • Relevant issues have been associated (see CONTRIBUTING guide)
  • This change does not require a documentation update (docstring, docs, README, etc)
  • Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

  • Are the title and description (in both PR and commit) meaningful and clear?
  • Is there a bug required (and linked) for this change?
  • Should this PR be backported?

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.

@@ -57,3 +58,15 @@ func BaseVersionEqual(version1, versionMayEqual string) (bool, error) {

return v1[0] == v2[0] && v1[1] == v2[1], nil
}

func GetBaseVersion(version string) (*string, error) {
Copy link
Contributor

Choose a reason for hiding this comment

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

it looks like a duplicate of the other code in this file - you can use this method in other methods.
if you don't want to replace all the code - at least add tests to this method

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Initially I replaced the code and saw it doesn't actually saves code due to error handling, so I preferred leaving it like this. I will add tests for this one as well.

internal/common/version.go Outdated Show resolved Hide resolved
@danmanor
Copy link
Contributor Author

@danmanor
Copy link
Contributor Author

I will change the config accordingly and retest

@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 28, 2023

@danmanor: This pull request references MGMT-15425 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 bug to target the "4.15.0" version, but no target version was set.

In response to this:

Currently MCE version is hard coded in our code and set to 2.3 (from stable channel). Each OCP release matches at least one (mostly exactly one) MCE release, hence when installing a cluster with OCP release that doesn't match MCE 2.3, we will get an error. To solve this I added a new configuration file which will be updated periodically manually or by an automation that soon will be created. Assisted-service takes the right MCE release according to the cluster's OCP release and this configuration.

For reference:

oc-mirror list operators releases  --catalog=registry.redhat.io/redhat/redhat-operator-index:v4.x --package=multicluster-engine

For 4.15
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
Nothing

For 4.14
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.3

For 4.13
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.2  multicluster-engine.v2.2.9
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.3

For 4.12
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.1  multicluster-engine.v2.1.9
multicluster-engine  stable-2.2  multicluster-engine.v2.2.9
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.3

For 4.11
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.0  multicluster-engine.v2.0.9
multicluster-engine  stable-2.1  multicluster-engine.v2.1.9
multicluster-engine  stable-2.2  multicluster-engine.v2.2.9
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.3

For 4.10
PACKAGE              CHANNEL     HEAD
multicluster-engine  stable-2.0  multicluster-engine.v2.0.9
multicluster-engine  stable-2.1  multicluster-engine.v2.1.9
multicluster-engine  stable-2.2  multicluster-engine.v2.2.9
multicluster-engine  stable-2.3  multicluster-engine.v2.3.3
NAME                 DISPLAY NAME                        DEFAULT CHANNEL
multicluster-engine  multicluster engine for Kubernetes  stable-2.3

List all the issues related to this PR

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

Checklist

  • Title and description added to both, commit and PR.
  • Relevant issues have been associated (see CONTRIBUTING guide)
  • This change does not require a documentation update (docstring, docs, README, etc)
  • Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

  • Are the title and description (in both PR and commit) meaningful and clear?
  • Is there a bug required (and linked) for this change?
  • Should this PR be backported?

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 openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 28, 2023
@danmanor
Copy link
Contributor Author

/test edge-e2e-metal-assisted-mce-4-11 edge-e2e-metal-assisted-mce-4-12 edge-e2e-metal-assisted-mce-4-13 edge-e2e-metal-assisted-mce-4-14 edge-e2e-metal-assisted-mce-4-15

@danmanor
Copy link
Contributor Author

@gamli75 I don't get the thread, I will hold and reconfigure it until tomorrow.

@danmanor
Copy link
Contributor Author

/hold

@danmanor
Copy link
Contributor Author

/test edge-e2e-metal-assisted-ipv4v6

@danmanor
Copy link
Contributor Author

/test edge-e2e-metal-assisted-mce-4-11 edge-e2e-metal-assisted-mce-4-12 edge-e2e-metal-assisted-mce-4-13 edge-e2e-metal-assisted-mce-4-14 edge-e2e-metal-assisted-mce-4-15

@eifrach
Copy link
Contributor

eifrach commented Nov 30, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 30, 2023
Copy link

openshift-ci bot commented Nov 30, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adriengentil, danmanor, eifrach

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:
  • OWNERS [adriengentil,danmanor,eifrach]

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

@danmanor
Copy link
Contributor Author

/test e2e-agent-compact-ipv4

@danmanor
Copy link
Contributor Author

/test edge-e2e-metal-assisted-day2

@danmanor
Copy link
Contributor Author

/test e2e-agent-compact-ipv4

@danmanor
Copy link
Contributor Author

/test edge-e2e-metal-assisted-day2

Copy link

openshift-ci bot commented Nov 30, 2023

@danmanor: The following tests 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/edge-e2e-metal-assisted-mce-4.13 a9d16bd link false /test edge-e2e-metal-assisted-mce-4.13
ci/prow/edge-e2e-metal-assisted-mce-4.14 a9d16bd link false /test edge-e2e-metal-assisted-mce-4.14
ci/prow/edge-e2e-metal-assisted-mce-4.12 a9d16bd link false /test edge-e2e-metal-assisted-mce-4.12
ci/prow/edge-e2e-metal-assisted-mce-4.11 a9d16bd link false /test edge-e2e-metal-assisted-mce-4.11
ci/prow/edge-e2e-metal-assisted-mce-4.15 a9d16bd link false /test edge-e2e-metal-assisted-mce-4.15
ci/prow/edge-e2e-metal-assisted-day2 dda4e7d link false /test edge-e2e-metal-assisted-day2

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.

@danmanor
Copy link
Contributor Author

danmanor commented Dec 3, 2023

/test e2e-agent-compact-ipv4

@danmanor
Copy link
Contributor Author

danmanor commented Dec 3, 2023

/unhold

@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 Dec 3, 2023
@openshift-merge-bot openshift-merge-bot bot merged commit 01b8b23 into openshift:master Dec 3, 2023
27 of 28 checks passed
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-agent-installer-api-server-container-v4.15.0-202312040732.p0.g01b8b23.assembly.stream for distgit ose-agent-installer-api-server.
All builds following this will include this PR.

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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants