From 5ec39f1b27925941bf1c8127eb051c48378cf888 Mon Sep 17 00:00:00 2001
From: ValClarkson <valerie0149@gmail.com>
Date: Thu, 2 Jun 2022 12:13:42 -0400
Subject: [PATCH] removed ansible pinned version when installing, will now just
 pull latest avail.

[sc-14721]
---
 Makefile                              | 2 --
 build/pgo-deployer/Dockerfile         | 9 ++++-----
 installers/image/conf/kubernetes.repo | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index e92f497e81..f46b0cf031 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 
 # Default values if not already set
-ANSIBLE_VERSION ?= 2.12.*
 PGOROOT ?= $(CURDIR)
 PGO_BASEOS ?= ubi8
 BASE_IMAGE_OS ?= $(PGO_BASEOS)
@@ -165,7 +164,6 @@ $(PGOROOT)/build/%/Dockerfile:
 		--build-arg PREFIX=$(PGO_IMAGE_PREFIX) \
 		--build-arg PGVERSION=$(PGO_PG_VERSION) \
 		--build-arg BACKREST_VERSION=$(PGO_BACKREST_VERSION) \
-		--build-arg ANSIBLE_VERSION=$(ANSIBLE_VERSION) \
 		--build-arg DFSET=$(DFSET) \
 		--build-arg PACKAGER=$(PACKAGER) \
 		$(PGOROOT)
diff --git a/build/pgo-deployer/Dockerfile b/build/pgo-deployer/Dockerfile
index 82e9fde2ff..18d786eccc 100644
--- a/build/pgo-deployer/Dockerfile
+++ b/build/pgo-deployer/Dockerfile
@@ -4,7 +4,6 @@ ARG PREFIX
 FROM ${PREFIX}/pgo-base:${BASEOS}-${BASEVER}
 
 ARG BASEOS
-ARG ANSIBLE_VERSION
 ARG PACKAGER
 ARG DFSET
 
@@ -19,7 +18,7 @@ RUN if [ "$DFSET" = "centos" ] ; then \
         && ${PACKAGER} -y install \
                 --setopt=skip_missing_names_on_install=False \
                 kubectl \
-                ansible-core-${ANSIBLE_VERSION} \
+                ansible \
                 which \
                 gettext \
                 nss_wrapper \
@@ -33,7 +32,7 @@ RUN if [ "$BASEOS" = "rhel7" ] ; then \
                 --setopt=skip_missing_names_on_install=False \
                 --enablerepo='rhel-7-server-ose-4.4-rpms' \
                 openshift-clients \
-                ansible-core-${ANSIBLE_VERSION} \
+                ansible \
                 which \
                 gettext \
                 nss_wrapper \
@@ -47,7 +46,7 @@ RUN if [ "$BASEOS" = "ubi7" ] ; then \
                 --setopt=skip_missing_names_on_install=False \
                 --enablerepo='rhel-7-server-ose-4.4-rpms' \
                 openshift-clients \
-                ansible-core-${ANSIBLE_VERSION} \
+                ansible \
                 which \
                 gettext \
                 nss_wrapper \
@@ -60,7 +59,7 @@ RUN if [ "$BASEOS" = "ubi8" ] ; then \
         && ${PACKAGER} -y install \
                 --enablerepo='rhocp-4.5-for-rhel-8-x86_64-rpms' \
                 openshift-clients \
-                ansible-core-${ANSIBLE_VERSION} \
+                ansible \
                 which \
                 gettext \
                 nss_wrapper \
diff --git a/installers/image/conf/kubernetes.repo b/installers/image/conf/kubernetes.repo
index 0a8b4cf2bf..8830e53746 100644
--- a/installers/image/conf/kubernetes.repo
+++ b/installers/image/conf/kubernetes.repo
@@ -3,5 +3,5 @@ name=Kubernetes
 baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
 enabled=1
 gpgcheck=1
-repo_gpgcheck=1
+repo_gpgcheck=0
 gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
\ No newline at end of file