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.

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

OCPBUGS-36809: Add missing auth config fields #1955

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OCPBUGS-36809: Add missing auth config fields #1955

wants to merge 1 commit into from

Conversation

jonesbr17
Copy link

The uid and extra fields were added to Kubernetes in 1.29.
These fields should be included in OpenShift as well.

@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Jul 10, 2024
@openshift-ci-robot
Copy link

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

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

In response to this:

The uid and extra fields were added to Kubernetes in 1.29.
These fields should be included in OpenShift as well.

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-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jul 10, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jul 10, 2024

Hello @jonesbr17! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 10, 2024
@openshift-ci openshift-ci bot requested review from bparees and sjenning July 10, 2024 12:38
@jonesbr17 jonesbr17 force-pushed the extra-token-claim-mappings branch 2 times, most recently from a288b0d to f15cf5e Compare July 10, 2024 15:21
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 10, 2024
@jonesbr17 jonesbr17 force-pushed the extra-token-claim-mappings branch 5 times, most recently from 2127ea7 to 20e4158 Compare July 11, 2024 14:28
@csrwng
Copy link
Contributor

csrwng commented Jul 11, 2024

cc @openshift/api-reviewers

@csrwng
Copy link
Contributor

csrwng commented Jul 11, 2024

cc @ibihim

rtheis
rtheis approved these changes Jul 12, 2024
View reviewed changes
Copy link

@rtheis rtheis left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jul 12, 2024

@rtheis: changing LGTM is restricted to collaborators

In response to this:

/lgtm

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.

@rtheis
Copy link

rtheis commented Jul 12, 2024

/retest-required

1 similar comment
@rtheis
Copy link

rtheis commented Jul 13, 2024

/retest-required

@liouk
Copy link
Member

liouk commented Aug 6, 2024

@jonesbr17 could you please adapt/add tests in config/v1/tests/authentications.config.openshift.io/ExternalOIDC.yaml?

@jonesbr17
Copy link
Author

/retest-required

rtheis
rtheis approved these changes Aug 6, 2024
View reviewed changes
Copy link

@rtheis rtheis left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Aug 6, 2024

@rtheis: changing LGTM is restricted to collaborators

In response to this:

/lgtm

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.

liouk
liouk suggested changes Aug 7, 2024
View reviewed changes
config/v1/tests/authentications.config.openshift.io/ExternalOIDC.yaml Outdated
@@ -120,6 +120,35 @@ tests:
username:
claim: "preferred_username"
prefixPolicy: NoPrefix
- name: Can set OIDC providers with extra mappings
Copy link
Member

Choose a reason for hiding this comment

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

How about testing setting the uid field?

liouk
liouk suggested changes Aug 7, 2024
View reviewed changes
config/v1/tests/authentications.config.openshift.io/ExternalOIDC.yaml
audiences: ['openshift-aud']
claimMappings:
uid:
claim: claim
Copy link
Member

Choose a reason for hiding this comment

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

According to the definition, claim is mutually exclusive with expression so we should add a separate test case for that, too.

@jonesbr17
Copy link
Author

/retest required

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Aug 7, 2024

@jonesbr17: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

  • /test build
  • /test e2e-aws-ovn
  • /test e2e-aws-ovn-hypershift
  • /test e2e-aws-ovn-techpreview
  • /test e2e-aws-serial
  • /test e2e-aws-serial-techpreview
  • /test e2e-upgrade
  • /test e2e-upgrade-minor
  • /test images
  • /test integration
  • /test unit
  • /test verify
  • /test verify-client-go
  • /test verify-crd-schema
  • /test verify-deps

The following commands are available to trigger optional jobs:

  • /test e2e-azure
  • /test e2e-gcp
  • /test okd-scos-images

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-api-master-build
  • pull-ci-openshift-api-master-e2e-aws-ovn
  • pull-ci-openshift-api-master-e2e-aws-ovn-hypershift
  • pull-ci-openshift-api-master-e2e-aws-ovn-techpreview
  • pull-ci-openshift-api-master-e2e-aws-serial
  • pull-ci-openshift-api-master-e2e-aws-serial-techpreview
  • pull-ci-openshift-api-master-e2e-azure
  • pull-ci-openshift-api-master-e2e-gcp
  • pull-ci-openshift-api-master-e2e-upgrade
  • pull-ci-openshift-api-master-e2e-upgrade-minor
  • pull-ci-openshift-api-master-images
  • pull-ci-openshift-api-master-integration
  • pull-ci-openshift-api-master-unit
  • pull-ci-openshift-api-master-verify
  • pull-ci-openshift-api-master-verify-client-go
  • pull-ci-openshift-api-master-verify-crd-schema
  • pull-ci-openshift-api-master-verify-deps

In response to this:

/retest required

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.

@jonesbr17
Copy link
Author

/retest-required

@jonesbr17
OCPBUGS-36809: Add missing auth config fields
1cb4e17 
The `uid` and `extra` fields were added to Kubernetes in 1.29.
These fields should be included in OpenShift as well.
@jonesbr17
Copy link
Author

/retest-required

rtheis
rtheis approved these changes Aug 9, 2024
View reviewed changes
Copy link

@rtheis rtheis left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Aug 9, 2024

@rtheis: changing LGTM is restricted to collaborators

In response to this:

/lgtm

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.

@rtheis
Copy link

rtheis commented Aug 12, 2024

/test e2e-gcp

@rtheis
Copy link

rtheis commented Aug 12, 2024

/test e2e-azure

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Aug 12, 2024

@jonesbr17: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-gcp 1cb4e17 link false /test e2e-gcp

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.

@liouk
Copy link
Member

liouk commented Aug 13, 2024 •
edited
Loading

/lgtm

Assigning to @deads2k for approval as he approved the OIDC API changes in the first place.

/assign @deads2k

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 13, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Aug 13, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: jonesbr17, liouk, rtheis
Once this PR has been reviewed and has the lgtm label, please assign bparees for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@deads2k
Copy link
Contributor

deads2k commented Aug 13, 2024

Assigning to @deads2k for approval as he approved the OIDC API changes in the first place.

/hold

New fields require a new gate to ensure that our implementation and testing are complete prior to bringing new fields into the API. I also haven't seen an explanation of when, if, and how these fields will be made functional and tested on HCP or OCP. We need to get those explained prior to merging.

@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 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liouk liouk liouk requested changes

@rtheis rtheis rtheis approved these changes

@bparees bparees Awaiting requested review from bparees

@sjenning sjenning Awaiting requested review from sjenning

Assignees

@liouk liouk

@deads2k deads2k

Labels
do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/severity-moderate Referenced Jira bug's severity is moderate 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jonesbr17 @openshift-ci-robot @csrwng @rtheis @liouk @deads2k