Skip to content

Commit 6f84e0d

Browse files
author
Martin Jackson
committed
Swap redhat_cop.controller_configuration for infra.controller_configuration (it moved)
1 parent 97431c1 commit 6f84e0d

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

‎Containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ rm -rf /root/anaconda* /root/original-ks.cfg /usr/local/README
8282

8383
RUN pip3 install --no-cache-dir "ansible-core>=2.9" kubernetes openshift "boto3>=1.21" "botocore>=1.24" "awscli>=1.22" "azure-cli>=2.34" gcloud humanize jmespath awxkit --upgrade && \
8484
pip3 install --no-cache-dir git+https://github.com/validatedpatterns/vp-qe-test-common.git@development#egg=vp-qe-test-common --upgrade && \
85-
ansible-galaxy collection install --collections-path /usr/share/ansible/collections ansible.posix ansible.utils kubernetes.core community.okd redhat_cop.controller_configuration community.general awx.awx amazon.aws && \
85+
ansible-galaxy collection install --collections-path /usr/share/ansible/collections ansible.posix ansible.utils kubernetes.core community.okd infra.controller_configuration community.general awx.awx amazon.aws && \
8686
rm -rf /usr/local/lib/python3.9/site-packages/ansible_collections/$COLLECTIONS_TO_REMOVE && \
8787
curl -L -O https://raw.githubusercontent.com/clumio-code/azure-sdk-trim/main/azure_sdk_trim/azure_sdk_trim.py && \
8888
python azure_sdk_trim.py && rm azure_sdk_trim.py && pip3 uninstall -y humanize && \

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ TESTCOMMAND := "set -e; echo '* Helm: '; helm version; \
1212
echo '* Python: '; python --version ; \
1313
echo '* Ansible: '; ansible --version ; \
1414
echo '* kubernetes.core: '; ansible-galaxy collection list | grep kubernetes.core ; \
15-
echo '* redhat_cop.controller_configuration: '; ansible-galaxy collection list | grep redhat_cop.controller_configuration ; \
15+
echo '* infra.controller_configuration: '; ansible-galaxy collection list | grep infra.controller_configuration ; \
1616
echo '* awx.awx: '; ansible-galaxy collection list | grep awx.awx ; \
1717
echo '* community.general: '; ansible-galaxy collection list | grep community.general ; \
1818
echo '* ansible.posix: '; ansible-galaxy collection list | grep ansible.posix ; \
@@ -113,7 +113,7 @@ versions: ## Print all the versions of software in the locally-built container
113113
echo -n \"|awx.awx collection \"; ansible-galaxy collection list awx.awx |grep ^awx.awx | tr -s ' ' | cut -f2 -d ' ' |tr -d '\n'; echo \" \"; \
114114
echo -n \"|ansible.posix collection \"; ansible-galaxy collection list ansible.posix |grep ^ansible.posix | cut -f2 -d\ |tr -d '\n'; echo \" \"; \
115115
echo -n \"|ansible.utils collection \"; ansible-galaxy collection list ansible.utils |grep ^ansible.utils | cut -f2 -d\ |tr -d '\n'; echo \" \"; \
116-
echo -n \"|redhat_cop.controller_configuration collection \"; ansible-galaxy collection list redhat_cop.controller_configuration |grep ^redhat_cop.controller_configuration | cut -f2 -d\ | tr -d '\n'; echo \" \"; \
116+
echo -n \"|infra.controller_configuration collection \"; ansible-galaxy collection list infra.controller_configuration |grep ^infra.controller_configuration | cut -f2 -d\ | tr -d '\n'; echo \" \"; \
117117
" | sort | column --table -o '|'
118118

119119
.PHONY: run

‎README.md

Lines changed: 32 additions & 32 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.15.12 |
11-
|ansible.posix |collection|1.5.4 |
12-
|ansible.utils |collection|5.0.0 |
13-
|argocd |binary |v2.9.7+fbb6b20|
14-
|awscli |pip |1.33.31 |
15-
|awx.awx |collection|24.6.1 |
16-
|awxkit |pip |24.6.1 |
17-
|azure-cli |pip |2.62.0 |
18-
|boto3 |pip |1.34.149 |
19-
|botocore |pip |1.34.149 |
20-
|community.general |collection|9.2.0 |
21-
|community.okd |collection|4.0.0 |
22-
|gcloud |pip |0.18.3 |
23-
|git-core |package |2.43.5 |
24-
|hcp |binary |4.15.0 |
25-
|helm |binary |v3.13.3 |
26-
|jmespath |pip |1.0.1 |
27-
|jq |package |1.6 |
28-
|kubernetes.core |collection|5.0.0 |
29-
|kubernetes |pip |30.1.0 |
30-
|kustomize |binary |v5.0.1 |
31-
|make |package |4.3 |
32-
|openshift |binary |4.14.20 |
33-
|python3-pip |package |21.2.3 |
34-
|python3-pytest |package |6.2.2 |
35-
|python |package |3.9.18 |
36-
|redhat_cop.controller_configuration|collection|2.3.1 |
37-
|sshpass |package |1.09 |
38-
|tar |package |1.34 |
39-
|tekton |binary |0.35.2 |
40-
|vi |package |8.2.2637 |
41-
|vp-qe-test-common |pip |0.1.0 |
10+
|ansible |pip |2.15.12 |
11+
|ansible.posix |collection|1.5.4 |
12+
|ansible.utils |collection|5.0.0 |
13+
|argocd |binary |v2.9.7+fbb6b20|
14+
|awscli |pip |1.33.32 |
15+
|awx.awx |collection|24.6.1 |
16+
|awxkit |pip |24.6.1 |
17+
|azure-cli |pip |2.62.0 |
18+
|boto3 |pip |1.34.150 |
19+
|botocore |pip |1.34.150 |
20+
|community.general |collection|9.2.0 |
21+
|community.okd |collection|4.0.0 |
22+
|gcloud |pip |0.18.3 |
23+
|git-core |package |2.43.5 |
24+
|hcp |binary |4.15.0 |
25+
|helm |binary |v3.13.3 |
26+
|infra.controller_configuration|collection|2.9.0 |
27+
|jmespath |pip |1.0.1 |
28+
|jq |package |1.6 |
29+
|kubernetes.core |collection|5.0.0 |
30+
|kubernetes |pip |30.1.0 |
31+
|kustomize |binary |v5.0.1 |
32+
|make |package |4.3 |
33+
|openshift |binary |4.14.20 |
34+
|python3-pip |package |21.2.3 |
35+
|python3-pytest |package |6.2.2 |
36+
|python |package |3.9.18 |
37+
|sshpass |package |1.09 |
38+
|tar |package |1.34 |
39+
|tekton |binary |0.35.2 |
40+
|vi |package |8.2.2637 |
41+
|vp-qe-test-common |pip |0.1.0 |
4242

4343
## Usage
4444
**Pull the image**

0 commit comments

Comments
 (0)