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

Introduce changes from master to sig-auth-acceptance branch #300

Open
wants to merge 8 commits into
base: sig-auth-acceptance
Choose a base branch
from

Conversation

ibihim
Copy link
Collaborator

@ibihim ibihim commented Jun 28, 2024

What

  • Version bump sig-auth-acceptance branch.
  • Introduce important changes from master to sig-auth-acceptance branch.
  • Make e2e-tests work on arm64 machines.

Why

  • For some of the change request a newer version of k8s is required, like the wrapper around token audiences.
  • The http/2 disablement is important from master for one of the change requests.
  • Reduce differences in the Makefile to have a smaller context change.
  • Enable e2e tests on ARM64, in particular for MacOS M-Chip users.

@ibihim ibihim requested a review from stlaz June 28, 2024 14:23
@ibihim ibihim force-pushed the sig-auth-acceptance-bump branch 4 times, most recently from f1f64b6 to ee29cc5 Compare June 28, 2024 14:40
@ibihim ibihim force-pushed the sig-auth-acceptance-bump branch 6 times, most recently from 7c1476a to 5c0c8bc Compare July 2, 2024 09:32
.github/workflows/build.yml Outdated Show resolved Hide resolved
README.md Show resolved Hide resolved
@liouk
Copy link

liouk commented Jul 2, 2024

/lgtm

Copy link
Collaborator

@stlaz stlaz left a comment

Choose a reason for hiding this comment

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

much smaller change than I thought it would be 👍

@@ -232,7 +232,7 @@ func Run(cfg *server.KubeRBACProxyConfig) error {

handler := identityheaders.WithAuthHeaders(proxy, cfg.KubeRBACProxyInfo.UpstreamHeaders)
handler = kubefilters.WithAuthorization(handler, authz, scheme.Codecs)
handler = kubefilters.WithAuthentication(handler, authenticator, http.HandlerFunc(filters.UnauthorizedHandler), cfg.DelegatingAuthentication.APIAudiences)
handler = kubefilters.WithAuthentication(handler, authenticator, http.HandlerFunc(filters.UnauthorizedHandler), cfg.DelegatingAuthentication.APIAudiences, nil)
Copy link
Collaborator

Choose a reason for hiding this comment

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

What happens when you supply the request header nil here? It won't get autodetected from the cluster, right?

IssuerURL: config.IssuerURL,
ClientID: config.ClientID,
tokenAuthenticator, err := oidc.New(ctx, oidc.Options{
JWTAuthenticator: apiserver.JWTAuthenticator{
Copy link
Collaborator

Choose a reason for hiding this comment

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

can we remove the old options and just wire the new config, since we have the chance?

@@ -116,29 +120,30 @@ func (o *ProxyOptions) Validate() []error {
return errs
}

func (o *ProxyOptions) ApplyTo(c *server.KubeRBACProxyInfo, a *serverconfig.AuthenticationInfo) error {
func (o *ProxyOptions) ApplyTo(config *server.KubeRBACProxyConfig) error {
Copy link
Collaborator

Choose a reason for hiding this comment

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

The previous was better in terms of isolation.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, I know, but I need it to set up HTTP/2 disablement. We can revert it in k8s 1.31.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants