Skip to content

Conversation

@kevinrizza
Copy link
Member

What this PR does / why we need it:

Supersedes #5840

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 23, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 23, 2025

@kevinrizza: This pull request references CNTRLPLANE-334 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

What this PR does / why we need it:

Supersedes #5840

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

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 added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/needs-area labels Apr 23, 2025
@openshift-ci openshift-ci bot requested review from enxebre and rtheis April 23, 2025 19:58
@openshift-ci openshift-ci bot added area/api Indicates the PR includes changes for the API area/cli Indicates the PR includes changes for CLI area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release and removed do-not-merge/needs-area labels Apr 23, 2025
@cwbotbot
Copy link

cwbotbot commented Apr 23, 2025

Test Results

e2e-aws

e2e-aks

@sjenning
Copy link
Contributor

sjenning commented Apr 28, 2025

/retest

verify still need gofmt fixes

support/validations/authentication.go:7:1: File is not properly formatted (gci)
	configv1 "github.com/openshift/api/config/v1"
^
support/validations/authentication.go:9:1: File is not properly formatted (gci)
	"github.com/openshift/hypershift/support/supportedversion"
^
support/validations/authentication.go:13:1: File is not properly formatted (gci)
	"k8s.io/apiserver/pkg/cel/environment"
^

@kevinrizza
Copy link
Member Author

/payload 4.19 ci blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 28, 2025

@kevinrizza: trigger 4 job(s) of type blocking for the ci release of OCP 4.19

  • periodic-ci-openshift-release-master-ci-4.19-upgrade-from-stable-4.18-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.19-upgrade-from-stable-4.18-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.19-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-hypershift-release-4.19-periodics-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/902896e0-2478-11f0-9d0b-ba180530f3cf-0

@everettraven
Copy link
Contributor

/payload-job periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-aws-ipi-ovn-hypershift-guest-ext-oidc-f7

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 30, 2025

@everettraven: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-aws-ipi-ovn-hypershift-guest-ext-oidc-f7

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/c9e60520-25c7-11f0-8afd-a29a931efa76-0

@everettraven
Copy link
Contributor

/payload-job periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-aws-ipi-ovn-hypershift-guest-ext-oidc-f7

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 30, 2025

@everettraven: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-aws-ipi-ovn-hypershift-guest-ext-oidc-f7

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/09f2c1b0-25e8-11f0-97aa-7d7e9f265bcc-0

@sjenning
Copy link
Contributor

verify and unit are failing

# [github.com/openshift/hypershift/support/validations]
vet: support/validations/authentication_test.go:115:40: t.Context undefined (type *testing.T has no field or method Context, but does have unexported field context)

@everettraven
Copy link
Contributor

/retest

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 5, 2025
@everettraven everettraven force-pushed the rebase-auth-config-changes branch from c514129 to 7456acb Compare May 5, 2025 11:54
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 5, 2025
@everettraven everettraven force-pushed the rebase-auth-config-changes branch from 7456acb to 4915b59 Compare May 5, 2025 11:56
@everettraven
Copy link
Contributor

Verify passes when run locally and looks like it timed out in CI. Kicking.

/test verify

@everettraven
Copy link
Contributor

/retest

@sjenning
Copy link
Contributor

sjenning commented May 5, 2025

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 5, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 5, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kevinrizza, sjenning

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 5, 2025
@everettraven
Copy link
Contributor

everettraven commented May 5, 2025

/retitle CNTRLPLANE-334: Update KAS structured authentication configuration generation logic to use new uid and extra field

@openshift-ci openshift-ci bot changed the title WIP: CNTRLPLANE-334: Update KAS structured authentication configuration generation logic to use new uid and extra field CNTRLPLANE-334: Update KAS structured authentication configuration generation logic to use new uid and extra field May 5, 2025
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 5, 2025
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 109dbe3 and 2 for PR HEAD 4915b59 in total

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 6, 2025

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

@openshift-merge-bot openshift-merge-bot bot merged commit d2f8e41 into openshift:main May 6, 2025
12 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: hypershift
This PR has been included in build ose-hypershift-container-v4.20.0-202505060743.p0.gd2f8e41.assembly.stream.el9.
All builds following this will include this PR.

@everettraven
Copy link
Contributor

/cherry-pick release-4.19

@openshift-cherrypick-robot

@everettraven: #6073 failed to apply on top of branch "release-4.19":

Applying: byooidc: add support for specifying uid and extra claim mappings
Applying: improve validation logic for OIDC authentication mode
Applying: supportedversion: add ocp-to-kube version mapping utilities
Using index info to reconstruct a base tree...
M	support/supportedversion/version.go
Falling back to patching base and 3-way merge...
Auto-merging support/supportedversion/version.go
CONFLICT (content): Merge conflict in support/supportedversion/version.go
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 0003 supportedversion: add ocp-to-kube version mapping utilities

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.

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. area/api Indicates the PR includes changes for the API area/cli Indicates the PR includes changes for CLI area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release 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.

8 participants