Skip to content

install yq in upi installer image #6006

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

Closed
jianlinliu wants to merge 1 commit into from
Closed

install yq in upi installer image #6006

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
1 change: 1 addition & 0 deletions images/installer/Dockerfile.upi.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ RUN python -m pip install pyopenssl
ENV CLOUDSDK_PYTHON=/usr/bin/python

RUN python3 -m pip install yq
RUN curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /bin/yq-3.3.0 && chmod +x /bin/yq-3.3.0
Copy link
Copy Markdown
Contributor

@rna-afk rna-afk Jun 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: isn't it better to just set it to yq instead of yq-3.3.0? We call this version of yq everywhere anyway

Suggested change
RUN curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /bin/yq-3.3.0 && chmod +x /bin/yq-3.3.0
RUN curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /bin/yq-3.3.0 && chmod +x /bin/yq

Copy link
Copy Markdown
Contributor

@barbacbd barbacbd Jun 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also change the output file to /bin/yq

Copy link
Copy Markdown
Contributor Author

@jianlinliu jianlinliu Jun 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. In release repo, there is some place downloading v4.13.5, to avoid future conflicts, I named the yq tools with version number.
$ grep -r "yq/releases/download" |grep -v 3.3.0
ci-operator/jobs/openshift/release/openshift-release-release-4.3-periodics.yaml:        curl -L https://github.com/mikefarah/yq/releases/download/2.4.0/yq_linux_amd64 2>/dev/null >/tmp/bin/yq
ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml:        curl -L https://github.com/mikefarah/yq/releases/download/2.4.0/yq_linux_amd64 2>/dev/null >/tmp/bin/yq
ci-operator/jobs/openshift/release/openshift-release-release-4.5-periodics.yaml:        curl -L https://github.com/mikefarah/yq/releases/download/2.4.0/yq_linux_amd64 2>/dev/null >/tmp/bin/yq
ci-operator/step-registry/assisted/baremetal/operator/publish/assisted-baremetal-operator-publish-commands.sh:curl -L https://github.com/mikefarah/yq/releases/download/v4.13.5/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
ci-operator/config/redhat-developer/service-binding-operator/redhat-developer-service-binding-operator-master.yaml:      RUN curl -Lk -o /usr/bin/yq https://github.com/mikefarah/yq/releases/download/v4.18.1/yq_linux_amd64 && chmod +x /usr/bin/yq
  1. On the line 46, another yq is installed from pip, to avoid confusion, I named it with version number. E.g: in ci-operator/step-registry/ipi/conf/azurestack/rhcos/ipi-conf-azurestack-rhcos-commands.sh
yq --arg url "${vhd_blob_url}" -i -y '.platform.azure.ClusterOSImage=$url' "${SHARED_DIR}/install-config.yaml"

It is using yq installed from pip

Copy link
Copy Markdown
Contributor Author

@jianlinliu jianlinliu Jun 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rna-afk @barbacbd Any suggestion?


ENV TERRAFORM_VERSION=1.0.11
RUN curl -O https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip && \
Expand Down
2 changes: 2 additions & 0 deletions images/installer/Dockerfile.upi.ci.rhel8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ RUN yum update -y && \
rm -rf /var/cache/yum/* && \
chmod g+w /etc/passwd

RUN curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /bin/yq-3.3.0 && chmod +x /bin/yq-3.3.0
Copy link
Copy Markdown
Contributor

@barbacbd barbacbd Jun 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Above comments should be applied here.


# Not packaged for Python 2, but required by gcloud. See https://cloud.google.com/sdk/crypto
RUN pip-2 install pyopenssl
ENV CLOUDSDK_PYTHON=/usr/bin/python
Expand Down