Skip to content

Conversation

@rikatz
Copy link
Member

@rikatz rikatz commented Aug 14, 2025

No description provided.

@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. 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 Aug 14, 2025
@openshift-ci-robot
Copy link

@rikatz: This pull request references Jira Issue OCPBUGS-47773, 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.20.0) matches configured target version for branch (4.20.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @ShudiLi

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

Details

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested a review from ShudiLi August 14, 2025 16:37
@rikatz
Copy link
Member Author

rikatz commented Aug 14, 2025

/cc @Miciah

@openshift-ci openshift-ci bot requested review from Miciah, sanchezl and tkashem August 14, 2025 16:38
@rikatz
Copy link
Member Author

rikatz commented Aug 14, 2025

/hold

Running some local tests before unholding

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 14, 2025
@rikatz rikatz force-pushed the bump-library-go-for-route-validation branch from ab8dd24 to d5b5470 Compare August 14, 2025 16:45
@rikatz
Copy link
Member Author

rikatz commented Aug 14, 2025

/hold cancel

@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 Aug 14, 2025
@Miciah
Copy link
Contributor

Miciah commented Aug 14, 2025

Thanks!

/lgtm

}
return allErrs
}

Copy link
Contributor

@Miciah Miciah Aug 14, 2025

Choose a reason for hiding this comment

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

The changes in this file are the changes from openshift/library-go#1958 that motivated the library-go bump.

Comment on lines +472 to +473
// The router service account needs to be granted with read-only access to this secret,
// please refer to openshift docs for additional details.
Copy link
Contributor

Choose a reason for hiding this comment

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

FYI @chiragkyal, this vendors at last the changes from openshift/api#2159.

Copy link
Member

Choose a reason for hiding this comment

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

Thanks for the information.

Comment on lines +274 to +276
tls.TLS_AES_128_GCM_SHA256,
tls.TLS_AES_256_GCM_SHA384,
tls.TLS_CHACHA20_POLY1305_SHA256,
Copy link
Contributor

@Miciah Miciah Aug 14, 2025

Choose a reason for hiding this comment

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

@tiraboschi, this vendor bump pulls in the changes from openshift/library-go#1956. Is that going to impact the openshift-apiserver TLS configuration?

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 14, 2025
@rikatz
Copy link
Member Author

rikatz commented Aug 14, 2025

/retest

1 similar comment
@rikatz
Copy link
Member Author

rikatz commented Aug 15, 2025

/retest

@rikatz
Copy link
Member Author

rikatz commented Aug 15, 2025

the failing tests seems to be the same on both pipelines, and are related to metrics gathering.

Will try one more retest
/retest

@rikatz
Copy link
Member Author

rikatz commented Aug 18, 2025

/retest

@rikatz rikatz force-pushed the bump-library-go-for-route-validation branch from d5b5470 to 7a1cb55 Compare August 19, 2025 12:26
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 19, 2025
@rikatz
Copy link
Member Author

rikatz commented Aug 19, 2025

The metric gathering failure seems very much like kubernetes/kubernetes#131234 but I am not sure how to get this onto the job, so I will retest for now and come back to it later

/retest

@Miciah
Copy link
Contributor

Miciah commented Aug 19, 2025

Looks like kubernetes/kubernetes#131234 is being tracked as OCPBUGS-57477.

@Miciah
Copy link
Contributor

Miciah commented Aug 19, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 19, 2025
Copy link
Member

@dinhxuanvu dinhxuanvu left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@dinhxuanvu
Copy link
Member

dinhxuanvu commented Aug 19, 2025

I technically don’t have approval permission here but @sanchezl or @dgrisonnet can do it. Please do so. Thanks

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 19, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dinhxuanvu, Miciah, rikatz, sanchezl

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 19, 2025
@rikatz
Copy link
Member Author

rikatz commented Aug 19, 2025

This other test regression is being tracked at OCPBUGS-59836

@rikatz
Copy link
Member Author

rikatz commented Aug 19, 2025

/test e2e-aws-ovn-serial-2of2

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 6930049 and 2 for PR HEAD 7a1cb55 in total

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 20, 2025

@rikatz: all tests passed!

Full PR test history. Your PR dashboard.

Details

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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 38b935a into openshift:main Aug 20, 2025
13 checks passed
@openshift-ci-robot
Copy link

@rikatz: Jira Issue OCPBUGS-47773: All pull requests linked via external trackers have merged:

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

Details

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

@Thealisyed
Copy link

/cherry-pick release-4.19

@openshift-cherrypick-robot

@Thealisyed: #535 failed to apply on top of branch "release-4.19":

Applying: OCPBUGS-47773: Bump library-go to fix route validation
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	hack/openapi-violation.list
A	vendor/github.com/openshift/api/.golangci.yaml
M	vendor/github.com/openshift/api/Dockerfile.ocp
M	vendor/github.com/openshift/api/Makefile
M	vendor/github.com/openshift/api/apiserver/v1/types_apirequestcount.go
M	vendor/github.com/openshift/api/cloudnetwork/v1/generated.proto
M	vendor/github.com/openshift/api/cloudnetwork/v1/types.go
M	vendor/github.com/openshift/api/config/v1/types_authentication.go
M	vendor/github.com/openshift/api/config/v1/types_cluster_operator.go
M	vendor/github.com/openshift/api/config/v1/types_cluster_version.go
M	vendor/github.com/openshift/api/config/v1/types_feature.go
M	vendor/github.com/openshift/api/config/v1/types_image.go
M	vendor/github.com/openshift/api/config/v1/types_infrastructure.go
M	vendor/github.com/openshift/api/config/v1/types_network.go
M	vendor/github.com/openshift/api/config/v1/types_node.go
M	vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go
M	vendor/github.com/openshift/api/config/v1/zz_generated.featuregated-crd-manifests.yaml
M	vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/config/v1alpha1/types_cluster_image_policy.go
M	vendor/github.com/openshift/api/config/v1alpha1/types_image_policy.go
M	vendor/github.com/openshift/api/config/v1alpha1/types_insights.go
M	vendor/github.com/openshift/api/config/v1alpha1/zz_generated.deepcopy.go
M	vendor/github.com/openshift/api/config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml
M	vendor/github.com/openshift/api/config/v1alpha1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/console/v1/types_console_plugin.go
M	vendor/github.com/openshift/api/console/v1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/envtest-releases.yaml
M	vendor/github.com/openshift/api/features.md
M	vendor/github.com/openshift/api/features/features.go
M	vendor/github.com/openshift/api/helm/v1beta1/types_helm_chart_repository.go
M	vendor/github.com/openshift/api/machine/v1/types_alibabaprovider.go
M	vendor/github.com/openshift/api/machine/v1/types_controlplanemachineset.go
M	vendor/github.com/openshift/api/machine/v1/types_nutanixprovider.go
M	vendor/github.com/openshift/api/machine/v1/types_powervsprovider.go
M	vendor/github.com/openshift/api/machine/v1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/machine/v1alpha1/types_openstack.go
M	vendor/github.com/openshift/api/machine/v1alpha1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/machine/v1beta1/types_awsprovider.go
M	vendor/github.com/openshift/api/machine/v1beta1/types_azureprovider.go
M	vendor/github.com/openshift/api/machine/v1beta1/types_gcpprovider.go
M	vendor/github.com/openshift/api/machine/v1beta1/types_vsphereprovider.go
M	vendor/github.com/openshift/api/machine/v1beta1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/monitoring/v1/types.go
M	vendor/github.com/openshift/api/networkoperator/v1/generated.proto
M	vendor/github.com/openshift/api/networkoperator/v1/types_egressrouter.go
M	vendor/github.com/openshift/api/operator/v1/types.go
M	vendor/github.com/openshift/api/operator/v1/types_console.go
M	vendor/github.com/openshift/api/operator/v1/types_csi_cluster_driver.go
M	vendor/github.com/openshift/api/operator/v1/types_ingress.go
M	vendor/github.com/openshift/api/operator/v1/types_machineconfiguration.go
M	vendor/github.com/openshift/api/operator/v1/types_network.go
M	vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go
M	vendor/github.com/openshift/api/operator/v1/zz_generated.featuregated-crd-manifests.yaml
M	vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/operator/v1alpha1/types_etcdbackup.go
M	vendor/github.com/openshift/api/route/v1/generated.proto
M	vendor/github.com/openshift/api/route/v1/types.go
M	vendor/github.com/openshift/api/route/v1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/sharedresource/v1alpha1/types_shared_configmap.go
M	vendor/github.com/openshift/api/sharedresource/v1alpha1/types_shared_secret.go
M	vendor/github.com/openshift/library-go/pkg/crypto/crypto.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
Auto-merging vendor/github.com/openshift/library-go/pkg/crypto/crypto.go
Auto-merging vendor/github.com/openshift/api/sharedresource/v1alpha1/types_shared_secret.go
Auto-merging vendor/github.com/openshift/api/sharedresource/v1alpha1/types_shared_configmap.go
Auto-merging vendor/github.com/openshift/api/route/v1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/route/v1/types.go
Auto-merging vendor/github.com/openshift/api/route/v1/generated.proto
Auto-merging vendor/github.com/openshift/api/operator/v1alpha1/types_etcdbackup.go
Auto-merging vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/operator/v1/zz_generated.featuregated-crd-manifests.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types_network.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/types_network.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types_machineconfiguration.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types_ingress.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types_csi_cluster_driver.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types_console.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/types.go
Auto-merging vendor/github.com/openshift/api/networkoperator/v1/types_egressrouter.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/networkoperator/v1/types_egressrouter.go
Auto-merging vendor/github.com/openshift/api/networkoperator/v1/generated.proto
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/networkoperator/v1/generated.proto
Auto-merging vendor/github.com/openshift/api/monitoring/v1/types.go
Auto-merging vendor/github.com/openshift/api/machine/v1beta1/zz_generated.swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/machine/v1beta1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/machine/v1beta1/types_vsphereprovider.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/machine/v1beta1/types_vsphereprovider.go
Auto-merging vendor/github.com/openshift/api/machine/v1beta1/types_gcpprovider.go
Auto-merging vendor/github.com/openshift/api/machine/v1beta1/types_azureprovider.go
Auto-merging vendor/github.com/openshift/api/machine/v1beta1/types_awsprovider.go
Auto-merging vendor/github.com/openshift/api/machine/v1alpha1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/machine/v1alpha1/types_openstack.go
Auto-merging vendor/github.com/openshift/api/machine/v1/zz_generated.swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/machine/v1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/machine/v1/types_powervsprovider.go
Auto-merging vendor/github.com/openshift/api/machine/v1/types_nutanixprovider.go
Auto-merging vendor/github.com/openshift/api/machine/v1/types_controlplanemachineset.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/machine/v1/types_controlplanemachineset.go
Auto-merging vendor/github.com/openshift/api/machine/v1/types_alibabaprovider.go
Auto-merging vendor/github.com/openshift/api/helm/v1beta1/types_helm_chart_repository.go
Auto-merging vendor/github.com/openshift/api/features/features.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/features/features.go
Auto-merging vendor/github.com/openshift/api/features.md
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/features.md
Auto-merging vendor/github.com/openshift/api/envtest-releases.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/envtest-releases.yaml
Auto-merging vendor/github.com/openshift/api/console/v1/zz_generated.swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/console/v1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/console/v1/types_console_plugin.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/console/v1/types_console_plugin.go
Auto-merging vendor/github.com/openshift/api/config/v1alpha1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml
Auto-merging vendor/github.com/openshift/api/config/v1alpha1/zz_generated.deepcopy.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1alpha1/zz_generated.deepcopy.go
Auto-merging vendor/github.com/openshift/api/config/v1alpha1/types_insights.go
Auto-merging vendor/github.com/openshift/api/config/v1alpha1/types_image_policy.go
Auto-merging vendor/github.com/openshift/api/config/v1alpha1/types_cluster_image_policy.go
Auto-merging vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/config/v1/zz_generated.featuregated-crd-manifests.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_node.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_network.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_infrastructure.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/types_infrastructure.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_image.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_feature.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_cluster_version.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_cluster_operator.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_authentication.go
Auto-merging vendor/github.com/openshift/api/cloudnetwork/v1/types.go
Auto-merging vendor/github.com/openshift/api/cloudnetwork/v1/generated.proto
Auto-merging vendor/github.com/openshift/api/apiserver/v1/types_apirequestcount.go
Auto-merging vendor/github.com/openshift/api/Makefile
Auto-merging vendor/github.com/openshift/api/Dockerfile.ocp
CONFLICT (modify/delete): vendor/github.com/openshift/api/.golangci.yaml deleted in HEAD and modified in OCPBUGS-47773: Bump library-go to fix route validation. Version OCPBUGS-47773: Bump library-go to fix route validation of vendor/github.com/openshift/api/.golangci.yaml left in tree.
Auto-merging hack/openapi-violation.list
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
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OCPBUGS-47773: Bump library-go to fix route validation

Details

In response to this:

/cherry-pick release-4.19

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-sigs/prow repository.

@lihongan
Copy link

@Thealisyed we need firstly merge openshift/library-go#2012 then bump to 4.19. I think /cherry-pick release-4.19 is not applicable for this bug.

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/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. 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.

9 participants