Skip to content

removed ansible pinned version when installing #3241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2022
Merged

removed ansible pinned version when installing #3241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

# Default values if not already set
ANSIBLE_VERSION ?= 2.12.*
PGOROOT ?= $(CURDIR)
PGO_BASEOS ?= ubi8
BASE_IMAGE_OS ?= $(PGO_BASEOS)
Expand Down Expand Up @@ -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)
Expand Down
9 changes: 4 additions & 5 deletions build/pgo-deployer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ ARG PREFIX
FROM ${PREFIX}/pgo-base:${BASEOS}-${BASEVER}

ARG BASEOS
ARG ANSIBLE_VERSION
ARG PACKAGER
ARG DFSET

Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion installers/image/conf/kubernetes.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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