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

Helm: Remove PSP if kubernetes doesn't support it #2870

Merged
merged 4 commits into from
Sep 6, 2022

Conversation

dimitarvdimitrov
Copy link
Contributor

@dimitarvdimitrov dimitarvdimitrov commented Aug 31, 2022

What this PR does

PodSecurityPolicy (PSP) was deprecated as part of kubernetes 1.25
This PR removed the PSP for versions higher than or equal to 1.25

Which issue(s) this PR fixes or relates to

Related to #2201
closes #2428

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

Copy link
Contributor

@krajorama krajorama left a comment

Choose a reason for hiding this comment

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

Please replace "ingress" with "rbac" as it is misleading a bit.

@dimitarvdimitrov
Copy link
Contributor Author

Please replace "ingress" with "rbac" as it is misleading a bit.

I should pay more attention when copy-pasting..

PodSecurityPolicy (PSP) was deprecated as part of kubernetes 1.25
This PR removed the PSP for versions higher than or equal to 1.25

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
@dimitarvdimitrov dimitarvdimitrov merged commit 34c61af into main Sep 6, 2022
@dimitarvdimitrov dimitarvdimitrov deleted the dimitar/helm-k8s-1.25-psp branch September 6, 2022 13:00
@grafanabot
Copy link
Contributor

The backport to release-2.3 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-2870-to-release-2.3 origin/release-2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 34c61afa318fec6f8a077057402896994bc66433
# Push it to GitHub
git push --set-upstream origin backport-2870-to-release-2.3
git switch main
# Remove the local backport branch
git branch -D backport-2870-to-release-2.3

Then, create a pull request where the base branch is release-2.3 and the compare/head branch is backport-2870-to-release-2.3.

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

Successfully merging this pull request may close these issues.

3 participants