Merge pull request #2484 from bertinatto/rebase-1.34

OCPSTRAT-2371: Update to Kubernetes v1.34.1

Author: openshift-merge-bot[bot]

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.24-openshift-4.20
+  tag: rhel-9-release-golang-1.24-openshift-4.21

.github/OWNERS

@@ -13,6 +13,7 @@ reviewers:
   - palnabarun
   - kaslin
   - MadhavJivrajani
+  - mfahlandt
   - Priyankasaggu11929
 approvers:
   - sig-contributor-experience-approvers

.github/PULL_REQUEST_TEMPLATE.md

@@ -27,13 +27,23 @@ Optionally add one or more of the following kinds if applicable:
 
 #### What this PR does / why we need it:
 
-#### Which issue(s) this PR fixes:
+#### Which issue(s) this PR is related to:
 <!--
-*Automatically closes linked issue when PR is merged.
-Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-_If PR is about `failing-tests or flakes`, please post the related issues/tests in a comment and do not use `Fixes`_*
+Please link relevant issues to help with tracking.
+
+To automatically close the linked issue(s) when this PR is merged,
+add the word "Fixes" before the issue number or link.
+Do not use "Fixes" if the PR is of kind `failing-test` or `flake`.
+
+Reference KEPs when applicable in addition to specific issues.
+
+Examples:
+Fixes #<issue number>
+<issue link> (issue in a different repository)
+KEP: https://github.com/kubernetes/enhancements/issues/<kep-issue-number>
+
+If there is no associated issue, then write "N/A".
 -->
-Fixes #
 
 #### Special notes for your reviewer:
 

CHANGELOG/CHANGELOG-1.33.md

@@ -1,5 +1,6 @@
 # CHANGELOGs
 
+- [CHANGELOG-1.34.md](./CHANGELOG-1.34.md)
 - [CHANGELOG-1.33.md](./CHANGELOG-1.33.md)
 - [CHANGELOG-1.32.md](./CHANGELOG-1.32.md)
 - [CHANGELOG-1.31.md](./CHANGELOG-1.31.md)