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

Configure aws oidc provider #11361

Merged
merged 3 commits into from
Apr 30, 2021
Merged

Configure aws oidc provider #11361

merged 3 commits into from
Apr 30, 2021

Conversation

olemarkus
Copy link
Member

Move VFS path and create flag for enabling AWS OIDC provider

/hold for #11359

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 30, 2021
@k8s-ci-robot k8s-ci-robot added area/api area/provider/aws Issues or PRs related to aws provider labels Apr 30, 2021
@olemarkus olemarkus force-pushed the oidc-awsidcprovider branch from ad0279d to 00939fa Compare April 30, 2021 16:24
@olemarkus
Copy link
Member Author

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 30, 2021
johngmyers
johngmyers requested changes Apr 30, 2021
View reviewed changes
pkg/apis/kops/cluster.go Outdated
@@ -207,6 +205,17 @@ type ClusterSpec struct {
ClusterAutoscaler *ClusterAutoscalerConfig `json:"clusterAutoscaler,omitempty"`
// WarmPool defines the default warm pool settings for instance groups (AWS only).
WarmPool *WarmPoolSpec `json:"warmPool,omitempty"`

// ServiceAccountIssuerDiscovery configures the OIDC Issuer for ServiceAccounts.
ServiceAccountIssuerDiscovery *OIDCIssuerConfig `json:"serviceAccountIssuerDiscovery,omitempty"`
Copy link
Member

Choose a reason for hiding this comment

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

I think the type should have the field name as a prefix.

Copy link
Member Author

Choose a reason for hiding this comment

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

I was wondering if we'd use this type for other properties too. But I guess not. I'll amend.

Copy link
Member

Choose a reason for hiding this comment

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

If we'd use the type for other properties then the name of the field shouldn't have "Discovery" in it.

Copy link
Member Author

Choose a reason for hiding this comment

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

It should. Anyways, amended now.

@olemarkus olemarkus force-pushed the oidc-awsidcprovider branch from 00939fa to 7593368 Compare April 30, 2021 17:19
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 30, 2021
johngmyers
johngmyers requested changes Apr 30, 2021
View reviewed changes
pkg/apis/kops/cluster.go
type OIDCIssuerConfig struct {
// DiscoveryStore is the VFS path to where OIDC Issuer Discovery metadata is stored.
DiscoveryStore string `json:"discoveryStore,omitempty"`
// EnableAWSOIDCProvider will provision an AWS OIDC provider that trusts the ServiceAccount Issuer
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// EnableAWSOIDCProvider will provision an AWS OIDC provider that trusts the ServiceAccount Issuer
// EnableAWSOIDCProvider will provision an AWS OIDC provider that trusts the ServiceAccount Issuer.

pkg/model/iam/subject.go Show resolved Hide resolved
@johngmyers
Copy link
Member

Could one of the two integration tests with the PublicJWKS feature flag have it removed? Perhaps a followup PR.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 30, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: johngmyers

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 30, 2021
@k8s-ci-robot k8s-ci-robot merged commit 1da39a3 into kubernetes:master Apr 30, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Apr 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johngmyers johngmyers johngmyers approved these changes

@joshbranham joshbranham Awaiting requested review from joshbranham

@zetaab zetaab Awaiting requested review from zetaab

@rifelpet rifelpet Awaiting requested review from rifelpet

@justinsb justinsb Awaiting requested review from justinsb

Assignees

@johngmyers johngmyers

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/api area/provider/aws Issues or PRs related to aws provider cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.21
Development

Successfully merging this pull request may close these issues.
3 participants
@olemarkus @johngmyers @k8s-ci-robot