Add community.okd collection due to ansible redirection (#41)

* Add community.okd collection due to ansible redirection * Update included software table in README --------- Co-authored-by: Martin Jackson <[email protected]>
validatedpatterns · Jul 22, 2024 · 693c9c4 · 693c9c4
1 parent cd67f87
commit 693c9c4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/Containerfile b/Containerfile
@@ -82,7 +82,7 @@ rm -rf /root/anaconda* /root/original-ks.cfg /usr/local/README
 
 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 --upgrade && \
 pip3 install --no-cache-dir git+https://github.com/validatedpatterns/vp-qe-test-common.git@development#egg=vp-qe-test-common --upgrade && \
-ansible-galaxy collection install --collections-path /usr/share/ansible/collections kubernetes.core redhat_cop.controller_configuration amazon.aws && \
+ansible-galaxy collection install --collections-path /usr/share/ansible/collections kubernetes.core community.okd redhat_cop.controller_configuration amazon.aws && \
 rm -rf /usr/local/lib/python3.9/site-packages/ansible_collections/$COLLECTIONS_TO_REMOVE && \
 curl -L -O https://raw.githubusercontent.com/clumio-code/azure-sdk-trim/main/azure_sdk_trim/azure_sdk_trim.py && \
 python azure_sdk_trim.py && rm azure_sdk_trim.py && pip3 uninstall -y humanize && \

diff --git a/Makefile b/Makefile
@@ -102,6 +102,7 @@ versions: ## Print all the versions of software in the locally-built container
 		echo -n \"|gcloud pip \"; pip show gcloud| grep ^Version: | cut -f2 -d\ |tr -d '\n';  echo \" \"; \
 		echo -n \"|vp-qe-test-common pip \"; pip show vp-qe-test-common | grep ^Version: | cut -f2 -d\ |tr -d '\n';  echo \" \"; \
 		echo -n \"|kubernetes.core collection \";  ansible-galaxy collection list kubernetes.core |grep ^kubernetes.core | cut -f2 -d\  |tr -d '\n';  echo \" \"; \
+		echo -n \"|community.okd collection \";  ansible-galaxy collection list community.okd |grep ^community.okd | cut -f2 -d\  |tr -d '\n';  echo \" \"; \
 		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 \" \";  \
     " | sort | column --table -o '|'
 

diff --git a/README.md b/README.md
@@ -7,19 +7,20 @@ utility container for simplified execution of imperative commands in each of the
 
 |               name                |  type    |   version    |
 |:---------------------------------:|:--------:|:------------:|
-|ansible                            |pip       |2.15.11       |
+|ansible                            |pip       |2.15.12       |
 |argocd                             |binary    |v2.9.7+fbb6b20|
-|awscli                             |pip       |1.32.104      |
-|azure-cli                          |pip       |2.60.0        |
-|boto3                              |pip       |1.34.104      |
-|botocore                           |pip       |1.34.104      |
+|awscli                             |pip       |1.33.27       |
+|azure-cli                          |pip       |2.62.0        |
+|boto3                              |pip       |1.34.145      |
+|botocore                           |pip       |1.34.145      |
+|community.okd                      |collection|4.0.0         |
 |gcloud                             |pip       |0.18.3        |
-|git-core                           |package   |2.43.0        |
+|git-core                           |package   |2.43.5        |
 |hcp                                |binary    |4.15.0        |
 |helm                               |binary    |v3.13.3       |
 |jq                                 |package   |1.6           |
-|kubernetes.core                    |collection|3.0.1         |
-|kubernetes                         |pip       |29.0.0        |
+|kubernetes.core                    |collection|5.0.0         |
+|kubernetes                         |pip       |30.1.0        |
 |kustomize                          |binary    |v5.0.1        |
 |make                               |package   |4.3           |
 |openshift                          |binary    |4.14.20       |