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

[v2.9] Remove PSP checks from SUC charts and it's upgrade process #45427

Open
wants to merge 1 commit into
base: release/v2.9
Choose a base branch
from

Conversation

chiukapoor
Copy link
Contributor

@chiukapoor chiukapoor commented May 9, 2024

Issue

Problem

  • PSP is completely removed from k8s 1.29 onwards

TODO

Solution

  • Remove PSP checks from SUC charts and it's upgrade process

Engineering Testing

Manual Testing

  • Created a rancher server with v2.8.3. Deployed rke2 1.28 k8s downstream cluster.
  • Upgraded rancher server to custom image with the PSP checks removed.
  • Rancher server and SUC chart upgrade went successful, PSP was removed from the values.yaml of SUC chart.
    Screenshot from 2024-05-08 18-04-31

@chiukapoor chiukapoor marked this pull request as ready for review May 30, 2024 18:41
@Sahota1225 Sahota1225 requested review from a team and kinarashah and removed request for a team May 30, 2024 18:43
@@ -179,10 +178,12 @@ func (h *handler) deployK3sBasedUpgradeController(clusterName, updateVersion str
}
}

desiredApp := app.DeepCopy()
if desiredApp.Spec.Answers == nil {
Copy link
Member

Choose a reason for hiding this comment

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

@chiukapoor Why are we removing Answers field check here? I first thought it's cuz it won't be nil as we initialized map in app spec but looks like we removed it there too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Context of this removal is lost after rebasing with the latest changes pushed by 1.29 PR where some extent of PSP removal was done. This commit from the 1.29 PR is the other part of this PR.

The Answers field was only being used to cater the PSPAnswersField in it. Now as the PSPAnswersField is removed we may safely remove the Answers field as well.

We are kind of reverting #40445 PR which add PSP checks and Answers field.

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

2 participants