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

[release-ocm-2.6] OCPBUGS-1482: Don't override schedulableMasters unnecessarily #4445

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #4414

/assign filanov

When generating the Ignition files, the installer already sets
schdulableMasters to true when there are no worker nodes (i.e. in the
SNO and compact cluster topologies. (See
openshift/installer#2004) Therefore it is
unnecessary to override it here (though it may be preferred to avoid a
warning log from the installer).

Since openshift/installer#6247, attempting to
override the schedulableMasters setting causes installation to fail,
because there are two manifests of the same type and name that conflict.

Since we don't need to set this override when the installer would
already do it, avoid doing so and triggering the error when the value is
determined by the number of hosts rather than explicitly set by the
user.

The conflict still needs to be resolved so that the user can enable
schedulableMasters, but this at least allows the SNO and compact
topologies to install OpenShift 4.12 again.

This partially reverts commit c45f369.
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: An error was encountered updating cherry-pick bug in Jira: Created cherrypick Jira Issue OCPBUGS-1778, but encountered error updating target version for bug OCPBUGS-1778 on the Jira server at https://issues.redhat.com/. No known errors were detected, please see the full error message for details.

Full error message. customfield_12319940 - Version name 'rhacm-2.6' is not valid: request failed. Please analyze the request body for more details. Status code: 400:

Please contact an administrator to resolve this issue, then request a bug refresh with /jira refresh.

In response to this:

This is an automated cherry-pick of #4414

/assign filanov

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 size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 28, 2022
@openshift-ci
Copy link

openshift-ci bot commented Sep 28, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: filanov, openshift-cherrypick-robot

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:

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

@openshift-ci openshift-ci bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. labels Sep 28, 2022
@codecov
Copy link

codecov bot commented Sep 28, 2022

Codecov Report

Merging #4445 (b258ed8) into release-ocm-2.6 (6bcafaa) will not change coverage.
The diff coverage is 100.00%.

Additional details and impacted files

Impacted file tree graph

@@               Coverage Diff                @@
##           release-ocm-2.6    #4445   +/-   ##
================================================
  Coverage            65.65%   65.65%           
================================================
  Files                  189      189           
  Lines                26566    26566           
================================================
  Hits                 17442    17442           
  Misses                7521     7521           
  Partials              1603     1603           
Impacted Files Coverage Δ
internal/common/common.go 33.51% <100.00%> (ø)
internal/cluster/validations/validations.go 44.44% <0.00%> (-0.75%) ⬇️
internal/oc/release.go 71.79% <0.00%> (+1.28%) ⬆️

@mkowalski
Copy link
Contributor

/test e2e-ai-operator-ztp

@filanov
Copy link
Contributor

filanov commented Sep 29, 2022

/override ci/prow/e2e-ai-operator-ztp-disconnected
job is broken

@openshift-ci
Copy link

openshift-ci bot commented Sep 29, 2022

@filanov: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

  • ``

Only the following failed contexts/checkruns were expected:

  • ci/prow/ci-index
  • ci/prow/e2e-ai-operator-ztp
  • ci/prow/e2e-ai-operator-ztp-capi
  • ci/prow/e2e-ai-operator-ztp-disconnected
  • ci/prow/images
  • ci/prow/lint
  • ci/prow/mce-images
  • ci/prow/subsystem-aws
  • ci/prow/subsystem-kubeapi-aws
  • ci/prow/unit-test
  • ci/prow/verify-generated-code
  • pull-ci-openshift-assisted-service-cloud_hotfix_releases-images
  • pull-ci-openshift-assisted-service-cloud_hotfix_releases-lint
  • pull-ci-openshift-assisted-service-cloud_hotfix_releases-subsystem-aws
  • pull-ci-openshift-assisted-service-cloud_hotfix_releases-unit-test
  • pull-ci-openshift-assisted-service-cloud_hotfix_releases-verify-generated-code
  • pull-ci-openshift-assisted-service-master-mce-images
  • pull-ci-openshift-assisted-service-release-ocm-2.4-ci-index
  • pull-ci-openshift-assisted-service-release-ocm-2.4-e2e-ai-operator-ztp
  • pull-ci-openshift-assisted-service-release-ocm-2.4-subsystem-kubeapi-aws
  • pull-ci-openshift-assisted-service-release-ocm-2.5-e2e-ai-operator-ztp-capi
  • pull-ci-openshift-assisted-service-release-ocm-2.5-e2e-ai-operator-ztp-disconnected
  • tide

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

In response to this:

/override ci/prow/e2e-ai-operator-ztp-disconnected
job is broken

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.

@filanov
Copy link
Contributor

filanov commented Sep 29, 2022

/override ci/prow/e2e-ai-operator-ztp-disconnected

@openshift-ci
Copy link

openshift-ci bot commented Sep 29, 2022

@filanov: Overrode contexts on behalf of filanov: ci/prow/e2e-ai-operator-ztp-disconnected

In response to this:

/override ci/prow/e2e-ai-operator-ztp-disconnected

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

openshift-ci bot commented Sep 29, 2022

@openshift-cherrypick-robot: 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-ai-operator-ztp-disconnected b258ed8 link true /test e2e-ai-operator-ztp-disconnected

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.

@filanov filanov added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Sep 29, 2022
@openshift-merge-robot openshift-merge-robot merged commit 99b3c7f into openshift:release-ocm-2.6 Sep 29, 2022
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-1482 has been moved to the MODIFIED state.

In response to this:

This is an automated cherry-pick of #4414

/assign filanov

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.

@flaper87
Copy link
Contributor

/cherry-pick release-ocm-2.5

@openshift-cherrypick-robot
Copy link
Author

@flaper87: #4445 failed to apply on top of branch "release-ocm-2.5":

Applying: OCPBUGS-1482: Don't override schedulableMasters unnecessarily
Using index info to reconstruct a base tree...
M	internal/common/common.go
M	internal/common/common_test.go
Falling back to patching base and 3-way merge...
Auto-merging internal/common/common_test.go
CONFLICT (content): Merge conflict in internal/common/common_test.go
Auto-merging internal/common/common.go
CONFLICT (content): Merge conflict in internal/common/common.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-1482: Don't override schedulableMasters unnecessarily
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-ocm-2.5

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.

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. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants