Skip to content

Update deployment for 1.24 and 1.25 #989

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

Merged
merged 1 commit into from
May 18, 2022

Conversation

mattcary
Copy link
Contributor

@mattcary mattcary commented May 18, 2022

/kind cleanup

What this PR does / why we need it:
Update overlay to work for 1.25 master, and make 1.24 overlay.

As part of this change, the PSP is removed from the master deployment, and for the 1.21-1.23 clusters added via customize. The noauth, debug and dev overlays do not have the PSP deployment as they are supposed to be tracking master.

Tested by doing deploy-driver with stable-1-24 on a e2e-up from a 1.24 head, and stable-master from k/k head (two weeks after 1.24 cut, so basically 1.25). (tests for the other versions are in-progress).

Remove PodSecurityPolicy from deployment for 1.25+ clusters.

/assign @saikat-royc

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 18, 2022
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 18, 2022
- psp_linux.yaml
- psp_windows.yaml
transformers:
- ../../images/stable-master
Copy link
Member

Choose a reason for hiding this comment

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

../../images/stable-1-24

# Don't change stable image without changing pdImagePlaceholder in
# test/k8s-integration/main.go
newName: k8s.gcr.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver
newTag: "v1.4.0"
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 use the updated image?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah.. good point. But which version? Go back to 1.3.6 or up to 1.6.0 which still has the node death problem?

Copy link
Member

Choose a reason for hiding this comment

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

Maybe we can keep it as is. We will soon cut a new release with fix (1.7)

@@ -5,5 +5,4 @@ namespace:
resources:
- cluster_setup.yaml
- controller.yaml
- psp.yaml
Copy link
Member

Choose a reason for hiding this comment

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

this change in base also means stable-1.23, stable-1.22, stable-1.21 wont have the psp. in this PR we are adding psp to the 1.24 overlay. should we consistent (i.e either remove psp from all 1.21 and beyond or keep psp in 1.21, 1.22, 1.23, 1.24 and removed from 1.25) ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Arg, you're absolutely right, good catch.

I think we should add it to the old ones so that stable-master is most simple.

Change-Id: I694842d570567faf879897d35c4516b2bfd74759
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 18, 2022
@saikat-royc
Copy link
Member

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mattcary, saikat-royc

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:
  • OWNERS [mattcary,saikat-royc]

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 merged commit 841df2e into kubernetes-sigs:master May 18, 2022
@mattcary
Copy link
Contributor Author

/hold

Until I test this on 1.21 & 1.22 clusters. @saikat-royc if you want to remove the hold and lgtm so we can get the other fix out, please go ahead.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 18, 2022
@mattcary
Copy link
Contributor 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 May 18, 2022
@mattcary
Copy link
Contributor Author

Tested working on 1.21

ffilippopoulos added a commit to utilitywarehouse/system-manifests that referenced this pull request Jan 12, 2023
Moving to Kubernetes 1.25 means that everything using policy/v1beta1 api will
fail. The upstream works is done here:
kubernetes-sigs/gcp-compute-persistent-disk-csi-driver#989
but it looks like only the "stable-master" base is actually dropping PSPs.
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants