UPSTREAM-SYNC: Sync release-4.22 with upstream release-1.35

[stephenfin]

Sync release-4.22 with the equivalent upstream release branch, release-1.35.

❯ git diff upstream/release-1.35 -- \
    ':!vendor' ':!DOWNSTREAM_OWNERS' ':!DOWNSTREAM_OWNERS_ALIASES' \
    ':!.ci-operator.yaml' ':!.snyk' ':!images/*/Dockerfile'

diff --git a/.gitignore b/.gitignore
index 26ab96757..857cf61fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,9 @@

-*.json
 *.sublime-project
 *.sublime-workspace
 *.swp
 .idea
 .DS_Store
-vendor

 # OSX leaves these everywhere on SMB shares
 ._*
@@ -111,9 +109,6 @@ network_closure.sh
 # Downloaded Kubernetes binary release
 /kubernetes/

-# direnv .envrc files
-.envrc
-
 # Downloaded kubernetes binary release tar ball
 kubernetes.tar.gz

[openshift-ci-robot]

@stephenfin: This pull request is an upstream sync and explicitly references no jira issue.

Details

In response to this:

Sync release-4.22 with the equivalent upstream release branch, release-1.35.

❯ git diff upstream/release-1.35 -- \
   ':!vendor' ':!DOWNSTREAM_OWNERS' ':!DOWNSTREAM_OWNERS_ALIASES' \
   ':!.ci-operator.yaml' ':!.snyk' ':!images/*/Dockerfile'

diff --git a/.gitignore b/.gitignore
index 26ab96757..857cf61fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,9 @@

-*.json
*.sublime-project
*.sublime-workspace
*.swp
.idea
.DS_Store
-vendor

# OSX leaves these everywhere on SMB shares
._*
@@ -111,9 +109,6 @@ network_closure.sh
# Downloaded Kubernetes binary release
/kubernetes/

-# direnv .envrc files
-.envrc
-
# Downloaded kubernetes binary release tar ball
kubernetes.tar.gz

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: e142e450-687a-4957-b66b-f2e1cf7392ed

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[stephenfin]

/assign @mandre

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: stephenfin

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• DOWNSTREAM_OWNERS [stephenfin]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-ci]

@stephenfin: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/verify-deps	aea4bad	link	true	/test verify-deps
ci/prow/security	aea4bad	link	false	/test security
ci/prow/unit	aea4bad	link	true	/test unit
ci/prow/images	aea4bad	link	true	/test images
ci/prow/e2e-openstack	aea4bad	link	true	/test e2e-openstack

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

[stephenfin]

This depends on the following ART backports:

• [release-4.22] OCPBUGS-85239: Updating ose-openstack-cinder-csi-driver-container image to be consistent with ART for 4.22 #390
• [release-4.22] OCPBUGS-85240: Updating csi-driver-manila-container image to be consistent with ART for 4.22 #391
• [release-4.22] OCPBUGS-85241: Updating ose-openstack-cloud-controller-manager-container image to be consistent with ART for 4.22 #392

We can retest once those merge.

[mandre]

There were a few changes related to manila, let's make sure the manila csi test suite runs on this PR.