Add new requirements and collections to tealc-ee ansible executor (#252)

skodjob · Oct 23, 2023 · f6fdf63 · f6fdf63
1 parent fe965b9
commit f6fdf63
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/install/collections/requirements.yml b/install/collections/requirements.yml
@@ -1,2 +1,3 @@
 collections:
-  - name: kubernetes.core
+  - name: kubernetes.core
+  - name: community.hashi_vault
diff --git a/tealc-ee/context/Dockerfile b/tealc-ee/context/Dockerfile
@@ -15,8 +15,9 @@ FROM $EE_BUILDER_IMAGE as builder
 
 COPY --from=galaxy /usr/share/ansible /usr/share/ansible
 
+ADD _build/requirements.txt requirements.txt
 ADD _build/bindep.txt bindep.txt
-RUN ansible-builder introspect --sanitize --user-bindep=bindep.txt --write-bindep=/tmp/src/bindep.txt --write-pip=/tmp/src/requirements.txt
+RUN ansible-builder introspect --sanitize --user-pip=requirements.txt --user-bindep=bindep.txt --write-bindep=/tmp/src/bindep.txt --write-pip=/tmp/src/requirements.txt
 RUN assemble
 
 FROM $EE_BASE_IMAGE
@@ -30,3 +31,4 @@ RUN /output/install-from-bindep && rm -rf /output/wheels
 RUN echo This is a post-install command!
 RUN curl https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/openshift-client-linux.tar.gz -o openshift-client-linux.tar.gz && tar xzf openshift-client-linux.tar.gz && rm -f openshift-client-linux.tar.gz && mv oc /usr/bin/oc && mv kubectl /usr/bin/kubectl
 RUN /usr/bin/dnf install -y https://kojipkgs.fedoraproject.org//packages/git-crypt/0.6.0/7.el8/x86_64/git-crypt-0.6.0-7.el8.x86_64.rpm
+RUN curl -O https://mirror.openshift.com/pub/rhacs/assets/4.2.0/bin/Linux/roxctl && chmod +x roxctl && mv roxctl /usr/bin/roxctl
diff --git a/tealc-ee/context/_build/requirements.txt b/tealc-ee/context/_build/requirements.txt
@@ -0,0 +1,2 @@
+python-openstackclient
+awscli
diff --git a/tealc-ee/context/_build/requirements.yml b/tealc-ee/context/_build/requirements.yml
@@ -1,2 +1,3 @@
 collections:
-  - name: kubernetes.core
+  - name: kubernetes.core
+  - name: community.hashi_vault
diff --git a/tealc-ee/execution-environment.yml b/tealc-ee/execution-environment.yml
@@ -1,8 +1,9 @@
-version: 1
+version: 3
 
 dependencies:
   galaxy: ../install/collections/requirements.yml
   system: bindep.txt
+  python: requirements.txt
 
 additional_build_steps:
   prepend: |
@@ -11,3 +12,4 @@ additional_build_steps:
     - RUN echo This is a post-install command!
     - RUN curl https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/openshift-client-linux.tar.gz -o openshift-client-linux.tar.gz && tar xzf openshift-client-linux.tar.gz && rm -f openshift-client-linux.tar.gz && mv oc /usr/bin/oc && mv kubectl /usr/bin/kubectl
     - RUN /usr/bin/dnf install -y https://kojipkgs.fedoraproject.org//packages/git-crypt/0.6.0/7.el8/x86_64/git-crypt-0.6.0-7.el8.x86_64.rpm
+    - RUN curl -O https://mirror.openshift.com/pub/rhacs/assets/4.2.0/bin/Linux/roxctl && chmod +x roxctl && mv roxctl /usr/bin/roxctl
diff --git a/tealc-ee/requirements.txt b/tealc-ee/requirements.txt
@@ -0,0 +1,2 @@
+python-openstackclient
+awscli