Simplify driver copy and unify across architectures

stackrox · May 10, 2024 · 26ff782 · 26ff782
1 parent 7239fb8
commit 26ff782
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 26 deletions.
diff --git a/.github/workflows/collector.yml b/.github/workflows/collector.yml
@@ -44,7 +44,7 @@ jobs:
 
     env:
       PLATFORM: linux/${{ matrix.arch }}
-      CONTEXT_DRIVERS_DIR: ${{ github.workspace }}/kernel-modules/container/kernel-modules
+      CONTEXT_DRIVERS_DIR: ${{ github.workspace }}/collector/kernel-modules
 
     steps:
       - uses: actions/checkout@v4
@@ -77,7 +77,6 @@ jobs:
           collector_tag: ${{ inputs.collector-tag }}
           debug_mode: ${{ github.event_name == 'pull_request' }}
           driver_version: ${DRIVER_VERSION}
-          context_path: ${{ github.workspace }}/kernel-modules/container
           EOF
 
       - name: Download drivers

diff --git a/ansible/ci-build-collector.yml b/ansible/ci-build-collector.yml
@@ -40,29 +40,6 @@
       # ensure this action is printed
       tags: [print_action]
 
-    - block:
-      - name: Add drivers
-        community.docker.docker_image:
-          name: "{{ collector_image }}-full"
-          build:
-            platform: "linux/{{ arch }}"
-            target: probe-layer-1
-            args:
-              collector_repo: quay.io/stackrox-io/collector
-              collector_version: "{{ collector_tag }}"
-              module_version: "{{ driver_version }}"
-              max_layer_size: 300
-              required_layers: 0
-            path: "{{ context_path }}"
-
-      - name: Retag image
-        community.docker.docker_image:
-          name: "{{ collector_image }}-full"
-          repository: "{{ collector_image }}"
-          source: local
-
-      when: arch == "ppc64le"
-
     - name: Retag collector image to arch specific
       community.docker.docker_image:
         name: "{{ collector_image }}"

diff --git a/collector/container/Dockerfile b/collector/container/Dockerfile
@@ -26,7 +26,7 @@ RUN ./install.sh && rm -f install.sh
 COPY container/scripts/collector-wrapper.sh /usr/local/bin
 COPY container/scripts/bootstrap.sh /
 COPY container/THIRD_PARTY_NOTICES/ /THIRD_PARTY_NOTICES/
-COPY LICENSE-kernel-modules.txt /kernel-modules/LICENSE
+COPY kernel-modules /kernel-modules
 COPY container/bin/collector /usr/local/bin/
 COPY container/bin/self-checks /usr/local/bin/self-checks
 COPY container/status-check.sh /usr/local/bin/status-check.sh

diff --git a/collector/LICENSE-kernel-modules.txt → collector/kernel-modules/LICENSE b/collector/LICENSE-kernel-modules.txt → collector/kernel-modules/LICENSE