[release-1.31] Use s2i GA image and update buildah image to latest released

[openshift-cherrypick-robot]

This is an automated cherry-pick of #2366

/assign Kaustubh-pande

[mgencur]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mgencur, openshift-cherrypick-robot

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 [mgencur,openshift-cherrypick-robot]

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

[openshift-ci]

@openshift-cherrypick-robot: 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/4.11-upgrade-kitchensink-ocp-411	ebb5a6a	link	false	/test 4.11-upgrade-kitchensink-ocp-411
ci/prow/4.13-upgrade-kitchensink-ocp-413	ebb5a6a	link	false	/test 4.13-upgrade-kitchensink-ocp-413

Full PR test history. Your PR dashboard.

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/test-infra repository. I understand the commands that are listed here.

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD 09eb0bd and 2 for PR HEAD ebb5a6a in total