Skip to content
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

Jump to bottom

updates #31

Merged
merged 3 commits into from
Dec 18, 2023
Merged

updates #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34f94c0
Upgrade OCP client to 4.13.27
mbaldessari Dec 18, 2023
18b7e94
Fix hypershift URL
mbaldessari Dec 18, 2023
519530e
Update makefile for latest hcp and update versions
mbaldessari Dec 18, 2023
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
8 changes: 4 additions & 4 deletions Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG MAINTAINER="Validated Patterns <[email protected]>"
ARG LICENSE="Apache-2.0"
ARG URL="https://github.com/hybrid-cloud-patterns"
ARG SOURCE="https://github.com/hybrid-cloud-patterns/utility-container/blob/main/Containerfile"
ARG HYPERSHIFT_URL="https://hypershift-cli-download-multicluster-engine.apps.hcp.aws.validatedpatterns.io/linux/amd64/hypershift.tar.gz"
ARG HYPERSHIFT_URL="https://hcp-cli-download-multicluster-engine.apps.hcp.aws.validatedpatterns.io/linux/amd64/hcp.tar.gz"

# https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys
LABEL org.opencontainers.image.title="${TITLE}" \
Expand All @@ -25,7 +25,7 @@ ARG COLLECTIONS_TO_REMOVE="fortinet cisco dellemc f5networks junipernetworks mel
ARG DNF_TO_REMOVE="dejavu-sans-fonts langpacks-core-font-en langpacks-core-en langpacks-en"
ARG RPM_TO_FORCEFULLY_REMOVE="cracklib-dicts"
# Versions
ARG OPENSHIFT_CLIENT_VERSION="4.13.9"
ARG OPENSHIFT_CLIENT_VERSION="4.13.27"
ARG HELM_VERSION="3.12.3"
ARG ARGOCD_VERSION="2.8.0"
ARG TKN_CLI_VERSION="0.31.2"
Expand Down Expand Up @@ -58,8 +58,8 @@ tar xf tkn_${TKN_CLI_VERSION}_Linux_${ALTTARGETARCH}.tar.gz -C /usr/local/bin --
rm -f tkn_${TKN_CLI_VERSION}_Linux_${ALTTARGETARCH}.tar.gz && \
rm -f /usr/local/bin/README.md && rm -f /usr/local/bin/LICENSE && \
curl -skLfO ${HYPERSHIFT_URL} && \
tar xf hypershift.tar.gz -C /usr/local/bin/ && \
rm -f hypershift.tar.gz && \
tar xf hcp.tar.gz -C /usr/local/bin/ && \
rm -f hcp.tar.gz && \
curl -sLfO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OPENSHIFT_CLIENT_VERSION}/openshift-client-linux-${OPTTARGETARCH}${OPENSHIFT_CLIENT_VERSION}.tar.gz && \
tar xvf openshift-client-linux-${OPTTARGETARCH}${OPENSHIFT_CLIENT_VERSION}.tar.gz -C /usr/local/bin && \
rm -rf openshift-client-linux-${OPTTARGETARCH}${OPENSHIFT_CLIENT_VERSION}.tar.gz && rm -f /usr/local/bin/kubectl && ln -sf /usr/local/bin/oc /usr/local/bin/kubectl && \
Expand Down
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ versions: ## Print all the versions of software in the locally-built container
"set -e; \
echo -n \"|sshpass package \"; rpm -q --queryformat '%{VERSION}' sshpass; echo \" \"; \
echo -n \"|python3-pip package \"; rpm -q --queryformat '%{VERSION}' python3-pip; echo \" \"; \
echo -n \"|python3-pytest package \"; rpm -q --queryformat '%{VERSION}' python3-pytest; echo \" \"; \
echo -n \"|git-core package \"; rpm -q --qf '%{VERSION}' git-core; echo \" \"; \
echo -n \"|vi package \"; rpm -q --qf '%{VERSION}' vim-minimal; echo \" \"; \
echo -n \"|tar package \"; rpm -q --qf '%{VERSION}' tar; echo \" \"; \
Expand All @@ -91,7 +92,7 @@ versions: ## Print all the versions of software in the locally-built container
echo -n \"|tekton binary \"; tkn version --component client | tr -d '\n'; echo \" \"; \
echo -n \"|openshift binary \"; oc version --client -o json | jq -j '.releaseClientVersion'; echo \" \"; \
echo -n \"|kustomize binary \"; oc version --client -o json | jq -j '.kustomizeVersion'; echo \" \"; \
echo -n \"|hypershift binary \"; hypershift version --commit-only | cut -c1-12 | tr -d '\n'; echo \" \"; \
echo -n \"|hcp binary \"; hcp --version version | cut -d: -f3 | tr -d '\n'; echo \" \"; \
echo -n \"|ansible pip \"; ansible --version -o json | grep core | cut -f3 -d\ | tr -d '\n]'; echo \" \"; \
echo -n \"|kubernetes pip \"; pip show kubernetes |grep ^Version: | cut -f2 -d\ | tr -d '\n'; echo \" \"; \
echo -n \"|boto3 pip \"; pip show boto3 | grep ^Version: | cut -f2 -d\ |tr -d '\n'; echo \" \"; \
Expand Down
22 changes: 11 additions & 11 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@ utility container for simplified execution of imperative commands in each of the

| name | type | version |
|:---------------------------------:|:--------:|:------------:|
|ansible |pip |2.15.3 |
|ansible |pip |2.15.8 |
|argocd |binary |v2.8.0+804d4b8|
|awscli |pip |1.29.40 |
|azure-cli |pip |2.51.0 |
|boto3 |pip |1.28.40 |
|botocore |pip |1.31.40 |
|awscli |pip |1.32.2 |
|azure-cli |pip |2.55.0 |
|boto3 |pip |1.34.2 |
|botocore |pip |1.34.2 |
|gcloud |pip |0.18.3 |
|git-core |package |2.39.3 |
|hcp |binary |4.14.0 |
|helm |binary |v3.12.3 |
|hypershift |binary |2e77f3e23328 |
|jq |package |1.6 |
|kubernetes.core |collection|2.4.0 |
|kubernetes |pip |27.2.0 |
|kubernetes.core |collection|3.0.0 |
|kubernetes |pip |28.1.0 |
|kustomize |binary |v4.5.7 |
|make |package |4.3 |
|openshift |binary |4.13.9 |
|openshift |binary |4.13.27 |
|python3-pip |package |21.2.3 |
|python3-pytest |package |6.2.2-6 |
|python |package |3.9.16 |
|python3-pytest |package |6.2.2 |
|python |package |3.9.18 |
|redhat_cop.controller_configuration|collection|2.3.1 |
|sshpass |package |1.09 |
|tar |package |1.34 |
Expand Down