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

OCPBUGS-25403: go.mod update k8s.io/api* to v0.29.0 #2205

Merged
merged 1 commit into from Dec 20, 2023

Conversation

jan--f
Copy link
Contributor

@jan--f jan--f commented Dec 14, 2023

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Dec 14, 2023
@openshift-ci-robot
Copy link
Contributor

@jan--f: This pull request references Jira Issue OCPBUGS-25403, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @juzhao

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 14, 2023
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 14, 2023
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 20, 2023
@danielmellado
Copy link
Contributor

/lgtm

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

openshift-ci bot commented Dec 20, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danielmellado, jan--f

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 [danielmellado,jan--f]

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

Copy link
Contributor

openshift-ci bot commented Dec 20, 2023

@jan--f: all tests passed!

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-merge-bot openshift-merge-bot bot merged commit 1dd80b8 into openshift:master Dec 20, 2023
17 checks passed
@openshift-ci-robot
Copy link
Contributor

@jan--f: Jira Issue OCPBUGS-25403: All pull requests linked via external trackers have merged:

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

In response to this:

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

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.

@jan--f
Copy link
Contributor Author

jan--f commented Dec 20, 2023

/cherrypick release-4.15

@openshift-cherrypick-robot

@jan--f: #2205 failed to apply on top of branch "release-4.15":

Applying: go.mod update k8s.io/api* to v0.29.0
.git/rebase-apply/patch:10560: trailing whitespace.
    deps = [    
.git/rebase-apply/patch:10577: trailing whitespace.
    deps = [    
.git/rebase-apply/patch:17215: trailing whitespace.
    srcs = [ 
.git/rebase-apply/patch:45291: space before tab in indent.
		    	description:
.git/rebase-apply/patch:62039: trailing whitespace.
    // ciphertext must satisfy the following constraints:  
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	Documentation/api.md
M	go.mod
M	go.sum
M	vendor/k8s.io/apiserver/pkg/features/kube_features.go
M	vendor/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go
M	vendor/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go
M	vendor/k8s.io/kube-openapi/pkg/builder3/openapi.go
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
Removing vendor/k8s.io/kube-openapi/pkg/validation/spec/fuzz.go
Removing vendor/k8s.io/kube-openapi/pkg/openapiconv/convert.go
Auto-merging vendor/k8s.io/kube-openapi/pkg/builder3/openapi.go
Removing vendor/k8s.io/client-go/listers/policy/v1beta1/podsecuritypolicy.go
Removing vendor/k8s.io/client-go/kubernetes/typed/policy/v1beta1/podsecuritypolicy.go
Removing vendor/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_podsecuritypolicy.go
Removing vendor/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/fake/fake_clustercidr.go
Removing vendor/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/clustercidr.go
Removing vendor/k8s.io/client-go/informers/policy/v1beta1/podsecuritypolicy.go
Removing vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/supplementalgroupsstrategyoptions.go
Removing vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/selinuxstrategyoptions.go
Removing vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/runtimeclassstrategyoptions.go
Removing vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/runasuserstrategyoptions.go
Removing vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/runasgroupstrategyoptions.go
Removing vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/podsecuritypolicyspec.go
Removing vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/idrange.go
Removing vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/hostportrange.go
Removing vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/fsgroupstrategyoptions.go
Removing vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/allowedhostpath.go
Removing vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/allowedflexvolume.go
Removing vendor/k8s.io/client-go/applyconfigurations/networking/v1alpha1/clustercidrspec.go
Auto-merging vendor/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go
Auto-merging vendor/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go
CONFLICT (content): Merge conflict in vendor/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go
Auto-merging vendor/k8s.io/apiserver/pkg/features/kube_features.go
CONFLICT (content): Merge conflict in vendor/k8s.io/apiserver/pkg/features/kube_features.go
Removing vendor/k8s.io/api/flowcontrol/v1alpha1/zz_generated.prerelease-lifecycle.go
Removing vendor/github.com/google/cel-go/interpreter/functions/standard.go
Removing vendor/github.com/google/cel-go/common/types/type.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging Documentation/api.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 go.mod update k8s.io/api* to v0.29.0
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:

/cherrypick release-4.15

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

[ART PR BUILD NOTIFIER]

This PR has been included in build cluster-monitoring-operator-container-v4.16.0-202312201352.p0.g1dd80b8.assembly.stream for distgit cluster-monitoring-operator.
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-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants