Bugfix-release 2023-04-04.2.1c8acf5 (#929)

## Description
<!-- Please include a summary of the change and a link to the JIRA
ticket. Please add any additional motivation and context as needed.
Screenshots are also welcome -->

This release includes two additional cherry-pick commits:
* use HEAD commit in dp terraform script to ensure the image exists.
* import rpm gpg keys to work around CoreOS issue.

.openshift-ci/e2e-runtime/Dockerfile

@@ -1,5 +1,8 @@
 FROM quay.io/centos/centos:stream9
 
+# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2184640
+RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
 RUN dnf update -y --disablerepo=\* --enablerepo=baseos,appstream && dnf -y install make which git gettext jq gcc && dnf clean all && rm -rf /var/cache/dnf
 
 COPY --from=registry.ci.openshift.org/openshift/release:golang-1.19 /usr/local/go /usr/local/go

dp-terraform/helm/rhacs-terraform/terraform_cluster.sh

@@ -61,9 +61,8 @@ fi
 
 FLEETSHARD_SYNC_ORG="app-sre"
 FLEETSHARD_SYNC_IMAGE="acs-fleet-manager"
-# Get the first non-merge commit, starting with HEAD.
-# On main this should be HEAD, on production, the latest merged main commit.
-FLEETSHARD_SYNC_TAG="$(git rev-list --no-merges --max-count 1 --abbrev-commit --abbrev=7 HEAD)"
+# Get HEAD for both main and production. This is the latest merged commit.
+FLEETSHARD_SYNC_TAG="$(git rev-parse --short=7 HEAD)"
 
 if [[ "${HELM_PRINT_ONLY:-}" == "true" ]]; then
     HELM_DEBUG_FLAGS="--debug --dry-run"