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.

Sign up for GitHub

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

Jump to bottom

Bug 1974603: UPSTREAM: <carry>: crd: add ClusterOperator condition message table column #810

Merged

openshift-merge-robot merged 2 commits into openshift:master from sttts:sttts-cluster-operator-columns

Jun 18, 2021

sttts commented Jun 16, 2021

The logic is not exressible via JSONPath. Hence, if we want this, we have to help a little with this custom column writer.

openshift-ci-robot added the backports/unvalidated-commits label

openshift-ci-robot commented Jun 16, 2021

@sttts: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

4bedfa8|UPSTREAM: : crd: add ClusterOperator condition message table column: does not specify an upstream backport in the commit message

sttts force-pushed the sttts-cluster-operator-columns branch from 4bedfa8 to 02faa24 Compare

June 16, 2021 13:26

openshift-ci-robot commented Jun 16, 2021

@sttts: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

02faa24|UPSTREAM: : crd: add ClusterOperator condition message table column: does not specify an upstream backport in the commit message

openshift-ci bot added the vendor-update label

openshift-ci bot requested review from marun and mfojtik

June 16, 2021 13:26

openshift-ci bot added the approved label

sttts force-pushed the sttts-cluster-operator-columns branch from 02faa24 to f7d9c22 Compare

June 16, 2021 15:20

openshift-ci-robot commented Jun 16, 2021

@sttts: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

f7d9c22|UPSTREAM: : crd: add ClusterOperator condition message table column: does not specify an upstream backport in the commit message


          UPSTREAM: <carry>: crd: add ClusterOperator condition message table c…

2c4f39b

…olumn

The logic is not exressible via JSONPath. Hence, if we want this, we have to help a little with this custom column writer.

sttts force-pushed the sttts-cluster-operator-columns branch from f7d9c22 to 2c4f39b Compare

June 17, 2021 09:41

openshift-ci-robot commented Jun 17, 2021

@sttts: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

2c4f39b|UPSTREAM: : crd: add ClusterOperator condition message table column: does not specify an upstream backport in the commit message

Author

sttts commented Jun 17, 2021

/retest


          UPSTREAM: <carry>: hack/update-vendor.sh

54cdbc3

openshift-ci-robot commented Jun 17, 2021

@sttts: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

2c4f39b|UPSTREAM: : crd: add ClusterOperator condition message table column: does not specify an upstream backport in the commit message
54cdbc3|UPSTREAM: : hack/update-vendor.sh: does not specify an upstream backport in the commit message

Member

mfojtik commented Jun 17, 2021

/retest

sttts removed the backports/unvalidated-commits label

Author

sttts commented Jun 18, 2021

/retest

soltysh approved these changes

View reviewed changes

Member

soltysh left a comment

/lgtm

openshift-ci bot assigned soltysh

openshift-ci bot added the lgtm label

openshift-ci bot commented Jun 18, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: soltysh, sttts

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:

~~DOWNSTREAM_OWNERS~~ [soltysh,sttts]

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

openshift-merge-robot merged commit eb86af7 into openshift:master

Author

sttts commented Jun 22, 2021

/cherry-pick release-4.8

openshift-cherrypick-robot commented Jun 22, 2021

@sttts: new pull request created: #821

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.

openshift-cherrypick-robot mentioned this pull request

Bug 1974604: [release-4.8] UPSTREAM: <carry>: crd: add ClusterOperator condition message table column #821

Closed

sttts changed the title ~~UPSTREAM: <carry>: crd: add ClusterOperator condition message table column~~ Bug 1974603: UPSTREAM: <carry>: crd: add ClusterOperator condition message table column

openshift-ci bot commented Jun 22, 2021

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

Bugzilla bug 1974603 has been moved to the MODIFIED state.

In response to this:

Bug 1974603: UPSTREAM: : crd: add ClusterOperator condition message table column

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.

Author

sttts commented Jun 22, 2021

/cherry-pick release-4.7

openshift-cherrypick-robot commented Jun 22, 2021

@sttts: #810 failed to apply on top of branch "release-4.7":

Applying: UPSTREAM: <carry>: crd: add ClusterOperator condition message table column
Applying: UPSTREAM: <carry>: hack/update-vendor.sh
Using index info to reconstruct a base tree...
M	go.mod
M	staging/src/k8s.io/api/go.mod
M	staging/src/k8s.io/api/go.sum
M	staging/src/k8s.io/apiextensions-apiserver/go.mod
M	staging/src/k8s.io/apiextensions-apiserver/go.sum
M	staging/src/k8s.io/apiserver/go.mod
M	staging/src/k8s.io/apiserver/go.sum
M	staging/src/k8s.io/cli-runtime/go.mod
M	staging/src/k8s.io/cli-runtime/go.sum
M	staging/src/k8s.io/cloud-provider/go.mod
M	staging/src/k8s.io/cloud-provider/go.sum
M	staging/src/k8s.io/controller-manager/go.mod
M	staging/src/k8s.io/controller-manager/go.sum
M	staging/src/k8s.io/kube-aggregator/go.mod
M	staging/src/k8s.io/kube-aggregator/go.sum
M	staging/src/k8s.io/kube-controller-manager/go.mod
M	staging/src/k8s.io/kube-controller-manager/go.sum
M	staging/src/k8s.io/kubectl/go.mod
M	staging/src/k8s.io/kubectl/go.sum
M	staging/src/k8s.io/legacy-cloud-providers/go.mod
M	staging/src/k8s.io/legacy-cloud-providers/go.sum
M	staging/src/k8s.io/sample-apiserver/go.mod
M	staging/src/k8s.io/sample-apiserver/go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging staging/src/k8s.io/sample-apiserver/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/sample-apiserver/go.sum
Auto-merging staging/src/k8s.io/sample-apiserver/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/sample-apiserver/go.mod
Auto-merging staging/src/k8s.io/legacy-cloud-providers/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/legacy-cloud-providers/go.sum
Auto-merging staging/src/k8s.io/legacy-cloud-providers/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/legacy-cloud-providers/go.mod
Auto-merging staging/src/k8s.io/kubectl/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/kubectl/go.sum
Auto-merging staging/src/k8s.io/kubectl/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/kubectl/go.mod
Auto-merging staging/src/k8s.io/kube-controller-manager/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/kube-controller-manager/go.sum
Auto-merging staging/src/k8s.io/kube-controller-manager/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/kube-controller-manager/go.mod
Auto-merging staging/src/k8s.io/kube-aggregator/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/kube-aggregator/go.sum
Auto-merging staging/src/k8s.io/kube-aggregator/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/kube-aggregator/go.mod
Auto-merging staging/src/k8s.io/controller-manager/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/controller-manager/go.sum
Auto-merging staging/src/k8s.io/controller-manager/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/controller-manager/go.mod
Auto-merging staging/src/k8s.io/cloud-provider/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/cloud-provider/go.sum
Auto-merging staging/src/k8s.io/cloud-provider/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/cloud-provider/go.mod
Auto-merging staging/src/k8s.io/cli-runtime/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/cli-runtime/go.sum
Auto-merging staging/src/k8s.io/cli-runtime/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/cli-runtime/go.mod
Auto-merging staging/src/k8s.io/apiserver/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/apiserver/go.sum
Auto-merging staging/src/k8s.io/apiserver/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/apiserver/go.mod
Auto-merging staging/src/k8s.io/apiextensions-apiserver/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/apiextensions-apiserver/go.sum
Auto-merging staging/src/k8s.io/apiextensions-apiserver/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/apiextensions-apiserver/go.mod
Auto-merging staging/src/k8s.io/api/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/api/go.sum
Auto-merging staging/src/k8s.io/api/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/api/go.mod
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 0002 UPSTREAM: <carry>: hack/update-vendor.sh
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.7

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