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

Fix irsa for k8s < 1.20 #13212

Merged
merged 3 commits into from
Feb 9, 2022
Merged

Fix irsa for k8s < 1.20 #13212

merged 3 commits into from
Feb 9, 2022

Conversation

olemarkus
Copy link
Member

IRSA on 1.19 segfaults because we are not setting the feature gate that the aws model expects.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 7, 2022
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 8, 2022
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 8, 2022
@hakman
Copy link
Member

hakman commented Feb 9, 2022

@olemarkus Could you split this into 2 commits so that at least the main one would be easy to track in various branches?

}
}
}
if said.EnableAWSOIDCProvider {
Copy link
Member

Choose a reason for hiding this comment

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

Let's just add this a as separate block, if you don't mind.

Suggested change
if said.EnableAWSOIDCProvider {
if said != nil && said.EnableAWSOIDCProvider {

Copy link
Member Author

Choose a reason for hiding this comment

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

The said stuff was getting too big. Moved to a dedicated function.

@olemarkus
Copy link
Member Author

/test pull-kops-e2e-kubernetes-aws

@olemarkus
Copy link
Member Author

/retest

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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 Feb 9, 2022
@k8s-ci-robot k8s-ci-robot merged commit 95fc0ac into kubernetes:master Feb 9, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.24 milestone Feb 9, 2022
k8s-ci-robot added a commit that referenced this pull request Feb 10, 2022
…212-origin-release-1.22

Automated cherry pick of #13212: Fix irsa for k8s < 1.20
k8s-ci-robot added a commit that referenced this pull request Feb 10, 2022
…212-origin-release-1.23

Automated cherry pick of #13212: Fix irsa for k8s < 1.20
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 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants