Skip to content

Commit abd9d0d

Browse files
mbaldessarimbaldessari
authored
Merge pull request #85 from mbaldessari/linter-fixes
Fix some linting issues
2 parents cb8ce0b + 2a872b5 commit abd9d0d

5 files changed

Lines changed: 52 additions & 49 deletions

File tree

‎.github/linters/.hadolint.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ ignored:
1111
- DL3041
1212
# Pin versions in pip. Instead of `pip install <package>` use `pip install
1313
- DL3013
14+
# Disable pipefail shell
15+
- DL4006

‎.hadolint.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
.github/linters/.hadolint.yml
1+
.github/linters/.hadolint.yaml

‎Containerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ ARG COLLECTIONS_TO_REMOVE="fortinet cisco dellemc f5networks junipernetworks mel
2424
ARG DNF_TO_REMOVE="dejavu-sans-fonts langpacks-core-font-en langpacks-core-en langpacks-en"
2525
ARG RPM_TO_FORCEFULLY_REMOVE="cracklib-dicts"
2626
# Versions
27-
ARG OPENSHIFT_CLIENT_VERSION="4.14.20"
27+
ARG OPENSHIFT_CLIENT_VERSION="4.20.14"
2828
ARG HYPERSHIFT_VERSION="2.7.2-1"
29-
ARG HELM_VERSION="3.13.3"
30-
ARG ARGOCD_VERSION="2.9.7"
29+
ARG HELM_VERSION="3.19.5"
30+
ARG ARGOCD_VERSION="3.1.12"
3131
ARG TKN_CLI_VERSION="0.35.2"
3232
ARG YQ_VERSION="4.40.7"
3333
ARG TEA_VERSION="0.9.2"

‎Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,10 @@ versions: ## Print all the versions of software in the locally-built container
102102
echo -n \"|python package \"; /usr/bin/python3 --version | sed -e s'/Python //' | tr -d '\n'; echo \" \"; \
103103
echo -n \"|jq package \"; rpm -q --qf '%{VERSION}' jq; echo \" \"; \
104104
echo -n \"|gh package \"; rpm -q --qf '%{VERSION}' gh; echo \" \"; \
105+
echo -n \"|age binary \"; age --version |tr -d '\n'; echo \" \"; \
105106
echo -n \"|argocd binary \"; argocd version --client -o json | jq -j '.client.Version'; echo \" \"; \
106107
echo -n \"|helm binary \"; helm version --template '{{ .Version }}'; echo \" \"; \
108+
echo -n \"|helmsecrets binary \"; helm plugin list |grep ^secrets | tr '[:blank:]' ' '| cut -f2 -d\ | tr -d '\n'; echo \" \"; \
107109
echo -n \"|tea binary \"; tea --version | sed -e 's/Version: //' | sed -e 's/golang.*//' | tr -d '\t' | tr -d '\n'; echo \" \"; \
108110
echo -n \"|tekton binary \"; tkn version --component client | tr -d '\n'; echo \" \"; \
109111
echo -n \"|openshift binary \"; oc version --client -o json | jq -j '.releaseClientVersion'; echo \" \"; \

‎README.md‎

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -14,51 +14,50 @@ This container provides a pre-configured environment with all the necessary tool
1414

1515
<!-- textlint-disable -->
1616

17-
| name | type | version |
18-
| :---------------------------------: | :---------: | :------------: |
19-
| age | binary | 1.3.1 |
20-
| ansible | pip | 2.16.14 |
21-
| ansible.posix | collection | 2.1.0 |
22-
| ansible-runner | pip | 2.4.2 |
23-
| ansible.utils | collection | 6.0.0 |
24-
| argocd | binary | v2.9.7+fbb6b20 |
25-
| awscli | pip | 1.42.65 |
26-
| awx.awx | collection | 24.6.1 |
27-
| awxkit | pip | 24.6.1 |
28-
| azure-cli | pip | 2.79.0 |
29-
| boto3 | pip | 1.40.65 |
30-
| botocore | pip | 1.40.65 |
31-
| community.general | collection | 12.0.0 |
32-
| community.okd | collection | 5.0.0 |
33-
| gcloud | pip | 0.18.3 |
34-
| gh | package | 2.82.1 |
35-
| git-core | package | 2.47.3 |
36-
| gzip | package | 1.12 |
37-
| hcp | binary | 4.17.0 |
38-
| helm | binary | v3.13.3 |
39-
| helm-secrets | helm plugin | 4.7.5 |
40-
| infra.ah_configuration | collection | 2.1.0 |
41-
| infra.controller_configuration | collection | 3.2.0 |
42-
| infra.eda_configuration | collection | 1.1.0 |
43-
| jmespath | pip | 1.0.1 |
44-
| jq | package | 1.6 |
45-
| kubernetes.core | collection | 6.2.0 |
46-
| kubernetes | pip | 34.1.0 |
47-
| kustomize | binary | v5.0.1 |
48-
| make | package | 4.3 |
49-
| openshift | binary | 4.14.20 |
50-
| pytest | pip | 8.4.2 |
51-
| python3-pip | package | 21.3.1 |
52-
| python | package | 3.11.11 |
53-
| redhat_cop.controller_configuration | collection | 2.3.1 |
54-
| rhvp.cluster_utils | collection | 1.1.0 |
55-
| sops | binary | 3.11.0 |
56-
| sshpass | package | 1.09 |
57-
| tar | package | 1.34 |
58-
| tea | binary | 0.9.2 |
59-
| tekton | binary | 0.35.2 |
60-
| vi | package | 8.2.2637 |
61-
| vp-qe-test-common | pip | 0.1.0 |
17+
| name | type | version |
18+
| :---------------------------------: | :---------: | :-------------: |
19+
| age | binary | 1.3.1 |
20+
| ansible | pip | 2.19.6 |
21+
| ansible.posix | collection | 2.1.0 |
22+
| ansible-runner | pip | 2.4.2 |
23+
| ansible.utils | collection | 6.0.1 |
24+
| argocd | binary | v3.1.12+a46152e |
25+
| awscli | pip | 1.44.39 |
26+
| awx.awx | collection | 24.6.1 |
27+
| awxkit | pip | 24.6.1 |
28+
| azure-cli | pip | 2.83.0 |
29+
| boto3 | pip | 1.42.49 |
30+
| botocore | pip | 1.42.49 |
31+
| community.general | collection | 12.3.0 |
32+
| community.okd | collection | 5.0.0 |
33+
| gcloud | pip | 0.18.3 |
34+
| gh | package | 2.86.0 |
35+
| git-core | package | 2.47.3 |
36+
| gzip | package | 1.12 |
37+
| hcp | binary | 4.17.0 |
38+
| helm | binary | v3.19.5 |
39+
| helm-secrets | helm plugin | 4.7.5 |
40+
| infra.ah_configuration | collection | 2.1.0 |
41+
| infra.controller_configuration | collection | 3.2.2 |
42+
| infra.eda_configuration | collection | 1.1.0 |
43+
| jmespath | pip | 1.1.0 |
44+
| jq | package | 1.6 |
45+
| kubernetes.core | collection | 6.3.0 |
46+
| kubernetes | pip | 35.0.0 |
47+
| kustomize | binary | v5.6.0 |
48+
| make | package | 4.3 |
49+
| openshift | binary | 4.20.14 |
50+
| pytest | pip | 9.0.2 |
51+
| python3-pip | package | 21.3.1 |
52+
| python | package | 3.11.13 |
53+
| redhat_cop.controller_configuration | collection | 2.3.1 |
54+
| rhvp.cluster_utils | collection | 1.1.0 |
55+
| sshpass | package | 1.09 |
56+
| tar | package | 1.34 |
57+
| tea | binary | 0.9.2 |
58+
| tekton | binary | 0.35.2 |
59+
| vi | package | 8.2.2637 |
60+
| vp-qe-test-common | pip | 0.0.1 |
6261

6362
<!-- textlint-enable -->
6463

0 commit comments

Comments
 (0)