Skip to content

Commit 8c648ef

Browse files
mbaldessarimbaldessari
authored
Merge pull request #55 from mbaldessari/updates3
Updates
2 parents 5e89a06 + f910896 commit 8c648ef

3 files changed

Lines changed: 22 additions & 20 deletions

File tree

‎Containerfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ ARG MAINTAINER="Validated Patterns <team-validated-patterns@redhat.com>"
77
ARG LICENSE="Apache-2.0"
88
ARG URL="https://github.com/validatedpatterns"
99
ARG SOURCE="https://github.com/validatedpatterns/utility-container/blob/main/Containerfile"
10-
ARG HYPERSHIFT_URL="https://hcp-cli-download-multicluster-engine.apps.hyper2.aws.validatedpatterns.io/linux/amd64/hcp.tar.gz"
1110

1211
# https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys
1312
LABEL org.opencontainers.image.title="${TITLE}" \
@@ -49,6 +48,9 @@ ARG OPTTARGETARCH
4948
# Extra rpms for specific arches. Needed because on arm64 pip insists on rebuilding psutils
5049
ARG EXTRARPMS
5150

51+
ARG HYPERSHIFT_VER="2.7.2-1"
52+
ARG HYPERSHIFT_URL="https://developers.redhat.com/content-gateway/file/pub/mce/clients/hcp-cli/${HYPERSHIFT_VER}/hcp-cli-${HYPERSHIFT_VER}-linux-${TARGETARCH}.tar.gz"
53+
5254
USER root
5355

5456
# 'pip' is expected to be the pip resolved by 'python3 pip' AKA the one we install with PYTHON_VERSION
@@ -73,7 +75,7 @@ curl -sLfO https://github.com/tektoncd/cli/releases/download/v${TKN_CLI_VERSION}
7375
tar xf tkn_${TKN_CLI_VERSION}_Linux_${ALTTARGETARCH}.tar.gz -C /usr/local/bin --no-same-owner && chmod 755 /usr/local/bin/tkn && \
7476
rm -f tkn_${TKN_CLI_VERSION}_Linux_${ALTTARGETARCH}.tar.gz && \
7577
rm -f /usr/local/bin/README.md && rm -f /usr/local/bin/LICENSE && \
76-
curl -skLfO ${HYPERSHIFT_URL} && \
78+
curl -skLf -o hcp.tar.gz ${HYPERSHIFT_URL} && \
7779
tar xf hcp.tar.gz -C /usr/local/bin/ && \
7880
rm -f hcp.tar.gz && \
7981
curl -sLfO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OPENSHIFT_CLIENT_VERSION}/openshift-client-linux-${OPTTARGETARCH}${OPENSHIFT_CLIENT_VERSION}.tar.gz && \

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ versions: ## Print all the versions of software in the locally-built container
103103
echo -n \"|tekton binary \"; tkn version --component client | tr -d '\n'; echo \" \"; \
104104
echo -n \"|openshift binary \"; oc version --client -o json | jq -j '.releaseClientVersion'; echo \" \"; \
105105
echo -n \"|kustomize binary \"; oc version --client -o json | jq -j '.kustomizeVersion'; echo \" \"; \
106-
echo -n \"|hcp binary \"; hcp --version version | cut -d: -f3 | tr -d '\n'; echo \" \"; \
106+
echo -n \"|hcp binary \"; hcp version --client-only | cut -f4 -d: | tr -d '\n'; echo \" \"; \
107107
echo -n \"|pytest pip \"; pip show pytest | grep ^Version | cut -f2 -d\ |tr -d '\n'; echo \" \"; \
108108
echo -n \"|ansible pip \"; ansible --version -o json | grep core | cut -f3 -d\ | tr -d '\n]'; echo \" \"; \
109109
echo -n \"|kubernetes pip \"; pip show kubernetes |grep ^Version: | cut -f2 -d\ | tr -d '\n'; echo \" \"; \

‎README.md‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@ utility container for simplified execution of imperative commands in each of the
77

88
| name | type | version |
99
|:---------------------------------:|:--------:|:------------:|
10-
|ansible |pip |2.16.11 |
11-
|ansible.posix |collection|1.6.0 |
10+
|ansible |pip |2.16.14 |
11+
|ansible.posix |collection|2.0.0 |
1212
|ansible-runner |pip |2.4.0 |
13-
|ansible.utils |collection|5.1.1 |
13+
|ansible.utils |collection|5.1.2 |
1414
|argocd |binary |v2.9.7+fbb6b20|
15-
|awscli |pip |1.34.21 |
15+
|awscli |pip |1.36.34 |
1616
|awx.awx |collection|24.6.1 |
1717
|awxkit |pip |24.6.1 |
18-
|azure-cli |pip |2.64.0 |
19-
|boto3 |pip |1.35.21 |
20-
|botocore |pip |1.35.21 |
21-
|community.general |collection|9.4.0 |
22-
|community.okd |collection|4.0.0 |
18+
|azure-cli |pip |2.67.0 |
19+
|boto3 |pip |1.35.93 |
20+
|botocore |pip |1.35.93 |
21+
|community.general |collection|10.2.0 |
22+
|community.okd |collection|4.0.1 |
2323
|gcloud |pip |0.18.3 |
2424
|git-core |package |2.43.5 |
25-
|hcp |binary |4.15.0 |
25+
|hcp |binary |4.17.0 |
2626
|helm |binary |v3.13.3 |
27-
|infra.ah_configuration |collection|2.0.6 |
28-
|infra.controller_configuration |collection|2.9.0 |
27+
|infra.ah_configuration |collection|2.1.0 |
28+
|infra.controller_configuration |collection|2.11.0 |
2929
|infra.eda_configuration |collection|1.1.0 |
3030
|jmespath |pip |1.0.1 |
3131
|jq |package |1.6 |
3232
|kubernetes.core |collection|5.0.0 |
33-
|kubernetes |pip |30.1.0 |
33+
|kubernetes |pip |31.0.0 |
3434
|kustomize |binary |v5.0.1 |
3535
|make |package |4.3 |
3636
|openshift |binary |4.14.20 |
37-
|pytest |pip |8.3.3 |
38-
|python3-pip |package |21.2.3 |
39-
|python |package |3.11.7 |
37+
|pytest |pip |8.3.4 |
38+
|python3-pip |package |21.3.1 |
39+
|python |package |3.11.9 |
4040
|redhat_cop.controller_configuration|collection|2.3.1 |
41-
|rhvp.cluster_utils |collection|1.0.0 |
41+
|rhvp.cluster_utils |collection|1.0.2 |
4242
|sshpass |package |1.09 |
4343
|tar |package |1.34 |
4444
|tea |binary |0.9.2 |

0 commit comments

Comments
 (0)