Bug 2005242: MaxUnhealthy should not be a string type #919

JoelSpeed · 2021-09-17T08:19:01Z

Manual cherry-pick of #909

This field is an int or string and as such should not specify the type to be a string, this can cause errors in the CRD conversion when upgrading as we have changed the underlying type. Removing type: string should resolve these upgrade errors.

openshift-ci · 2021-09-17T08:19:09Z

@JoelSpeed: This pull request references Bugzilla bug 2005242, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.9.0) matches configured target release for branch (4.9.0)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1999425 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Bugzilla bug 1999425 targets the "4.10.0" release, which is one of the valid target releases: 4.10.0
bug has dependents

Requesting review from QA contact:
/cc @sunzhaohua2

In response to this:

Bug 2005242: MaxUnhealthy should not be a string type

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.

Fedosin

/approve

Fedosin

/lgtm

alexander-demicev

/approve

openshift-ci · 2021-10-14T10:50:53Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alexander-demichev, Fedosin

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~~ [alexander-demichev]

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

openshift-bot · 2021-10-14T10:52:33Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-14T12:51:47Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-14T13:52:51Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-14T14:53:52Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-14T15:53:51Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-14T16:05:51Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-14T20:35:52Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-14T22:59:13Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T00:29:53Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T00:43:18Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T02:13:54Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T02:26:50Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T02:39:54Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T02:52:07Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T03:05:07Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T03:31:06Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T04:10:06Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T04:23:04Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T04:36:03Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T05:02:07Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T05:15:05Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T05:28:05Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T05:41:03Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T05:54:06Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T06:20:04Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T07:12:14Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T07:25:03Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T07:38:04Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T07:51:04Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T08:17:06Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T08:30:09Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

JoelSpeed · 2021-10-15T08:49:23Z

/skip

openshift-bot · 2021-10-15T09:09:06Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

sdodson · 2021-10-15T18:06:28Z

/bugzilla refresh

openshift-ci · 2021-10-15T18:06:32Z

@sdodson: This pull request references Bugzilla bug 2005242, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.9.z) matches configured target release for branch (4.9.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1999425 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
dependent Bugzilla bug 1999425 targets the "4.10.0" release, which is one of the valid target releases: 4.10.0
bug has dependents

Requesting review from QA contact:
/cc @sunzhaohua2

In response to this:

/bugzilla refresh

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 · 2021-10-15T21:38:42Z

@JoelSpeed: 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
ci/prow/e2e-vsphere	`6ff1be7`	link	`/test e2e-vsphere`
ci/prow/e2e-libvirt	`6ff1be7`	link	`/test e2e-libvirt`
ci/prow/e2e-vsphere-upgrade	`6ff1be7`	link	`/test e2e-vsphere-upgrade`
ci/prow/e2e-aws-disruptive	`6ff1be7`	link	`/test e2e-aws-disruptive`
ci/prow/e2e-gcp	`6ff1be7`	link	`/test e2e-gcp`
ci/prow/e2e-azure	`6ff1be7`	link	`/test e2e-azure`
ci/prow/e2e-gcp-operator	`6ff1be7`	link	`/test e2e-gcp-operator`
ci/prow/e2e-metal-ipi-ovn-ipv6	`6ff1be7`	link	`/test e2e-metal-ipi-ovn-ipv6`

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-bot · 2021-10-15T21:40:22Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-10-15T22:17:03Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-ci · 2021-10-15T23:49:02Z

@JoelSpeed: All pull requests linked via external trackers have merged:

openshift/machine-api-operator#919

Bugzilla bug 2005242 has been moved to the MODIFIED state.

In response to this:

Bug 2005242: MaxUnhealthy should not be a string type

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.

JoelSpeed · 2021-11-25T10:19:40Z

/cherry-pick release-4.8

openshift-cherrypick-robot · 2021-11-25T10:21:01Z

@JoelSpeed: #919 failed to apply on top of branch "release-4.8":

Applying: Bump controller-tools to allow pattern on IntOrString
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/golang.org/x/sys/unix/ztypes_linux.go
M	vendor/golang.org/x/sys/windows/types_windows.go
M	vendor/modules.txt
M	vendor/sigs.k8s.io/controller-runtime/go.mod
M	vendor/sigs.k8s.io/controller-runtime/go.sum
M	vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/informers_map.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/controller/controllerutil/controllerutil.go
A	vendor/sigs.k8s.io/controller-runtime/pkg/internal/flock/flock_unix.go
A	vendor/sigs.k8s.io/controller-runtime/pkg/internal/testing/addr/manager.go
A	vendor/sigs.k8s.io/controller-runtime/pkg/internal/testing/controlplane/etcd.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/webhook/server.go
M	vendor/sigs.k8s.io/controller-tools/pkg/crd/markers/validation.go
M	vendor/sigs.k8s.io/controller-tools/pkg/crd/markers/zz_generated.markerhelp.go
M	vendor/sigs.k8s.io/controller-tools/pkg/crd/schema.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/sigs.k8s.io/controller-tools/pkg/crd/schema.go
Auto-merging vendor/sigs.k8s.io/controller-tools/pkg/crd/markers/zz_generated.markerhelp.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-tools/pkg/crd/markers/zz_generated.markerhelp.go
Auto-merging vendor/sigs.k8s.io/controller-tools/pkg/crd/markers/validation.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-tools/pkg/crd/markers/validation.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/webhook/server.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/webhook/server.go
CONFLICT (modify/delete): vendor/sigs.k8s.io/controller-runtime/pkg/internal/testing/controlplane/etcd.go deleted in HEAD and modified in Bump controller-tools to allow pattern on IntOrString. Version Bump controller-tools to allow pattern on IntOrString of vendor/sigs.k8s.io/controller-runtime/pkg/internal/testing/controlplane/etcd.go left in tree.
CONFLICT (modify/delete): vendor/sigs.k8s.io/controller-runtime/pkg/internal/testing/addr/manager.go deleted in HEAD and modified in Bump controller-tools to allow pattern on IntOrString. Version Bump controller-tools to allow pattern on IntOrString of vendor/sigs.k8s.io/controller-runtime/pkg/internal/testing/addr/manager.go left in tree.
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/controller/controllerutil/controllerutil.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/controller/controllerutil/controllerutil.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/informers_map.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/go.sum
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/go.sum
Auto-merging vendor/sigs.k8s.io/controller-runtime/go.mod
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/go.mod
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/tags.go
CONFLICT (content): Merge conflict in vendor/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/tags.go
Auto-merging vendor/golang.org/x/sys/windows/types_windows.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump controller-tools to allow pattern on IntOrString
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-4.8

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.

JoelSpeed added 2 commits September 17, 2021 09:15

Bump controller-tools to allow pattern on IntOrString

fbbdba2

MaxUnhealthy should not be a string type

6ff1be7

openshift-ci bot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Sep 17, 2021

openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Sep 17, 2021

openshift-ci bot requested review from sunzhaohua2, enxebre and michaelgugino September 17, 2021 08:19

Fedosin approved these changes Oct 14, 2021

View reviewed changes

JoelSpeed added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Oct 14, 2021

Fedosin approved these changes Oct 14, 2021

View reviewed changes

openshift-ci bot assigned Fedosin Oct 14, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 14, 2021

alexander-demicev approved these changes Oct 14, 2021

View reviewed changes

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 14, 2021

sdodson added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Oct 15, 2021

openshift-merge-robot merged commit f85d027 into openshift:release-4.9 Oct 15, 2021

Bug 2005242: MaxUnhealthy should not be a string type #919

Bug 2005242: MaxUnhealthy should not be a string type #919

Conversation

JoelSpeed commented Sep 17, 2021

openshift-ci bot commented Sep 17, 2021

Fedosin left a comment

Choose a reason for hiding this comment

Fedosin left a comment

Choose a reason for hiding this comment

alexander-demicev left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Oct 14, 2021

openshift-bot commented Oct 14, 2021

openshift-bot commented Oct 14, 2021

openshift-bot commented Oct 14, 2021

openshift-bot commented Oct 14, 2021

openshift-bot commented Oct 14, 2021

openshift-bot commented Oct 14, 2021

openshift-bot commented Oct 14, 2021

openshift-bot commented Oct 14, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

JoelSpeed commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

sdodson commented Oct 15, 2021

openshift-ci bot commented Oct 15, 2021

openshift-ci bot commented Oct 15, 2021 • edited

openshift-bot commented Oct 15, 2021

openshift-bot commented Oct 15, 2021

openshift-ci bot commented Oct 15, 2021

JoelSpeed commented Nov 25, 2021

openshift-cherrypick-robot commented Nov 25, 2021

openshift-ci bot commented Oct 15, 2021 •

edited