Skip to content

Commit 7ef3c94

Browse files
authored
removed ansible pinned version when installing, will now (#3241)
just pull latest avail. [sc-14721]
1 parent 3210fbc commit 7ef3c94

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11

22
# Default values if not already set
3-
ANSIBLE_VERSION ?= 2.12.*
43
PGOROOT ?= $(CURDIR)
54
PGO_BASEOS ?= ubi8
65
BASE_IMAGE_OS ?= $(PGO_BASEOS)
@@ -165,7 +164,6 @@ $(PGOROOT)/build/%/Dockerfile:
165164
--build-arg PREFIX=$(PGO_IMAGE_PREFIX) \
166165
--build-arg PGVERSION=$(PGO_PG_VERSION) \
167166
--build-arg BACKREST_VERSION=$(PGO_BACKREST_VERSION) \
168-
--build-arg ANSIBLE_VERSION=$(ANSIBLE_VERSION) \
169167
--build-arg DFSET=$(DFSET) \
170168
--build-arg PACKAGER=$(PACKAGER) \
171169
$(PGOROOT)

build/pgo-deployer/Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ ARG PREFIX
44
FROM ${PREFIX}/pgo-base:${BASEOS}-${BASEVER}
55

66
ARG BASEOS
7-
ARG ANSIBLE_VERSION
87
ARG PACKAGER
98
ARG DFSET
109

@@ -19,7 +18,7 @@ RUN if [ "$DFSET" = "centos" ] ; then \
1918
&& ${PACKAGER} -y install \
2019
--setopt=skip_missing_names_on_install=False \
2120
kubectl \
22-
ansible-core-${ANSIBLE_VERSION} \
21+
ansible \
2322
which \
2423
gettext \
2524
nss_wrapper \
@@ -33,7 +32,7 @@ RUN if [ "$BASEOS" = "rhel7" ] ; then \
3332
--setopt=skip_missing_names_on_install=False \
3433
--enablerepo='rhel-7-server-ose-4.4-rpms' \
3534
openshift-clients \
36-
ansible-core-${ANSIBLE_VERSION} \
35+
ansible \
3736
which \
3837
gettext \
3938
nss_wrapper \
@@ -47,7 +46,7 @@ RUN if [ "$BASEOS" = "ubi7" ] ; then \
4746
--setopt=skip_missing_names_on_install=False \
4847
--enablerepo='rhel-7-server-ose-4.4-rpms' \
4948
openshift-clients \
50-
ansible-core-${ANSIBLE_VERSION} \
49+
ansible \
5150
which \
5251
gettext \
5352
nss_wrapper \
@@ -60,7 +59,7 @@ RUN if [ "$BASEOS" = "ubi8" ] ; then \
6059
&& ${PACKAGER} -y install \
6160
--enablerepo='rhocp-4.5-for-rhel-8-x86_64-rpms' \
6261
openshift-clients \
63-
ansible-core-${ANSIBLE_VERSION} \
62+
ansible \
6463
which \
6564
gettext \
6665
nss_wrapper \

installers/image/conf/kubernetes.repo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ name=Kubernetes
33
baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
44
enabled=1
55
gpgcheck=1
6-
repo_gpgcheck=1
6+
repo_gpgcheck=0
77
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg

0 commit comments

Comments
 (0)