Merge pull request #1483 from NVIDIA/consolidate-images

Consolidate operator and validator into one image

Author: cdesiniotis

.common-ci.yml

@@ -81,7 +81,7 @@ trigger-pipeline:
 
     -  '[[ -n "${SKIP_QEMU_SETUP}" ]] || docker run --rm --privileged multiarch/qemu-user-static --reset -p yes'
 
-# Define targets for the gpu-operator and gpu-operator-validator images
+# Define targets for the gpu-operator image
 .dist-ubi9:
   variables:
     DIST: ubi9
@@ -93,14 +93,6 @@ trigger-pipeline:
     IN_IMAGE_NAME: "gpu-operator"
     IMAGE_ARCHIVE: "gpu-operator.tar"
 
-.target-gpu-operator-validator:
-  variables:
-    SUBCOMPONENT: "validator"
-    IMAGE_NAME: "${CI_REGISTRY_IMAGE}/gpu-operator-validator"
-    IN_IMAGE_NAME: "gpu-operator-validator"
-    IMAGE_ARCHIVE: "gpu-operator-validator.tar"
-    IN_REGISTRY: "${STAGING_REGISTRY}/gpu-operator"
-
 # .release forms the base of the deployment jobs which push images to the CI registry.
 # This is extended with the version to be deployed (e.g. the SHA or TAG) and the
 # target os.
@@ -187,14 +179,6 @@ release:staging-gpu-operator:
   variables:
     OUT_IMAGE_NAME: "${CI_REGISTRY_IMAGE}/staging/gpu-operator"
 
-release:staging-gpu-operator-validator:
-  extends:
-    - .release:staging
-    - .dist-ubi9
-    - .target-gpu-operator-validator
-  variables:
-    OUT_IMAGE_NAME: "${CI_REGISTRY_IMAGE}/staging/gpu-operator-validator"
-
 release:staging-latest-gpu-operator:
   extends:
     - .release:staging
@@ -206,17 +190,6 @@ release:staging-latest-gpu-operator:
   rules:
     - if: $CI_COMMIT_BRANCH
 
-release:staging-latest-gpu-operator-validator:
-  extends:
-    - .release:staging
-    - .dist-ubi9
-    - .target-gpu-operator-validator
-  variables:
-    OUT_IMAGE_NAME: "${CI_REGISTRY_IMAGE}/staging/gpu-operator-validator"
-    OUT_IMAGE_VERSION: ${CI_COMMIT_BRANCH}-latest
-  rules:
-    - if: $CI_COMMIT_BRANCH
-
 release:gpu-operator-bundle-image:
   extends:
     - .release-bundle

.github/workflows/ci.yaml

@@ -173,49 +173,6 @@ jobs:
         run: |
           echo "${VERSION}"
           make build-${{ matrix.dist }}
-  build-gpu-operator-validator-arm64:
-    needs: [go-check, go-test, go-build]
-    runs-on: ubuntu-24.04-arm
-    strategy:
-      matrix:
-        dist: [ubi9]
-    steps:
-      - uses: actions/checkout@v4
-        name: Check out code
-      - name: Calculate build vars
-        id: vars
-        run: |
-          echo "COMMIT_SHORT_SHA=${GITHUB_SHA:0:8}" >> $GITHUB_ENV
-          echo "LOWERCASE_REPO_OWNER=$(echo "${GITHUB_REPOSITORY_OWNER}" | awk '{print tolower($0)}')" >> $GITHUB_ENV
-
-          GENERATE_ARTIFACTS="false"
-          if [[ "${{ github.actor }}" == "dependabot[bot]" ]]; then
-            GENERATE_ARTIFACTS="false"
-          elif [[ "${{ github.event_name }}" == "pull_request" && "${{ github.event.pull_request.head.repo.full_name }}" == "${{ github.repository }}" ]]; then
-            GENERATE_ARTIFACTS="true"
-          elif [[ "${{ github.event_name }}" == "push" ]]; then
-            GENERATE_ARTIFACTS="true"
-          fi
-          echo "PUSH_ON_BUILD=${GENERATE_ARTIFACTS}" >> $GITHUB_ENV
-          echo "DOCKER_BUILD_PLATFORM_OPTIONS=--platform=linux/arm64" >> $GITHUB_ENV
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build image
-        env:
-          IMAGE_NAME: ghcr.io/${LOWERCASE_REPO_OWNER}/gpu-operator/gpu-operator-validator
-          VERSION: ${COMMIT_SHORT_SHA}-arm64
-          SUBCOMPONENT: validator
-        run: |
-          echo "${VERSION}"
-          make build-${{ matrix.dist }}
-
-  ### Image builds ###
   build-gpu-operator-amd64:
     needs: [go-check, go-test, go-build]
     runs-on: ubuntu-latest
@@ -260,50 +217,8 @@ jobs:
           echo "${VERSION}"
           make build-${{ matrix.dist }}
 
-  build-gpu-operator-validator-amd64:
-    needs: [go-check, go-test, go-build]
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        dist: [ubi9]
-    steps:
-      - uses: actions/checkout@v4
-        name: Check out code
-      - name: Calculate build vars
-        id: vars
-        run: |
-          echo "COMMIT_SHORT_SHA=${GITHUB_SHA:0:8}" >> $GITHUB_ENV
-          echo "LOWERCASE_REPO_OWNER=$(echo "${GITHUB_REPOSITORY_OWNER}" | awk '{print tolower($0)}')" >> $GITHUB_ENV
-
-          GENERATE_ARTIFACTS="false"
-          if [[ "${{ github.actor }}" == "dependabot[bot]" ]]; then
-            GENERATE_ARTIFACTS="false"
-          elif [[ "${{ github.event_name }}" == "pull_request" && "${{ github.event.pull_request.head.repo.full_name }}" == "${{ github.repository }}" ]]; then
-            GENERATE_ARTIFACTS="true"
-          elif [[ "${{ github.event_name }}" == "push" ]]; then
-            GENERATE_ARTIFACTS="true"
-          fi
-          echo "PUSH_ON_BUILD=${GENERATE_ARTIFACTS}" >> $GITHUB_ENV
-          echo "DOCKER_BUILD_PLATFORM_OPTIONS=--platform=linux/amd64" >> $GITHUB_ENV
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build image
-        env:
-          IMAGE_NAME: ghcr.io/${LOWERCASE_REPO_OWNER}/gpu-operator/gpu-operator-validator
-          VERSION: ${COMMIT_SHORT_SHA}-amd64
-          SUBCOMPONENT: validator
-        run: |
-          echo "${VERSION}"
-          make build-${{ matrix.dist }}
-
   build-multi-arch-images:
-    needs: [build-gpu-operator-arm64, build-gpu-operator-validator-arm64, build-gpu-operator-amd64, build-gpu-operator-validator-amd64]
+    needs: [build-gpu-operator-arm64, build-gpu-operator-amd64]
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -326,21 +241,13 @@ jobs:
         env:
           OPERATOR_IMAGE_ARM: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/gpu-operator:${{ env.COMMIT_SHORT_SHA }}-arm64
           OPERATOR_IMAGE_AMD: ghcr.io/${{ env.LOWERCASE_REPO_OWNER}}/gpu-operator:${{ env.COMMIT_SHORT_SHA }}-amd64
-          VALIDATOR_IMAGE_ARM: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/gpu-operator/gpu-operator-validator:${{ env.COMMIT_SHORT_SHA }}-arm64
-          VALIDATOR_IMAGE_AMD: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/gpu-operator/gpu-operator-validator:${{ env.COMMIT_SHORT_SHA }}-amd64
           OPERATOR_MULTIARCH_IMAGE: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/gpu-operator:${{ env.COMMIT_SHORT_SHA }}
-          VALIDATOR_MULTIARCH_IMAGE: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/gpu-operator/gpu-operator-validator:${{ env.COMMIT_SHORT_SHA }}
         run: |
           docker manifest create \
             ${OPERATOR_MULTIARCH_IMAGE} \
             ${OPERATOR_IMAGE_AMD} \
             ${OPERATOR_IMAGE_ARM}
           docker manifest push ${OPERATOR_MULTIARCH_IMAGE}
-          docker manifest create \
-            ${VALIDATOR_MULTIARCH_IMAGE} \
-            ${VALIDATOR_IMAGE_AMD} \
-            ${VALIDATOR_IMAGE_ARM}
-          docker manifest push ${VALIDATOR_MULTIARCH_IMAGE}
 
   ### e2e tests ###
   e2e-tests-containerd:
@@ -371,8 +278,6 @@ jobs:
 
           echo "OPERATOR_VERSION=${COMMIT_SHORT_SHA}" >> $GITHUB_ENV
           echo "OPERATOR_IMAGE=ghcr.io/${LOWERCASE_REPO_OWNER}/gpu-operator" >> $GITHUB_ENV
-          echo "VALIDATOR_VERSION=${COMMIT_SHORT_SHA}" >> $GITHUB_ENV
-          echo "VALIDATOR_IMAGE=ghcr.io/${LOWERCASE_REPO_OWNER}/gpu-operator/gpu-operator-validator"  >> $GITHUB_ENV
 
           echo "instance_hostname=ubuntu@${{ steps.get_public_dns_name.outputs.result }}" >> $GITHUB_ENV
           echo "private_key=${{ github.workspace }}/key.pem" >> $GITHUB_ENV
@@ -384,7 +289,7 @@ jobs:
           TEST_CASE: "./tests/cases/defaults.sh"
         run: |
           echo "${{ secrets.AWS_SSH_KEY }}" > ${private_key} && chmod 400 ${private_key}
-          ./tests/ci-run-e2e.sh ${OPERATOR_IMAGE} ${OPERATOR_VERSION} ${VALIDATOR_IMAGE} ${VALIDATOR_VERSION} ${GPU_PRODUCT_NAME} ${TEST_CASE} || rc=$?
+          ./tests/ci-run-e2e.sh ${OPERATOR_IMAGE} ${OPERATOR_VERSION} ${GPU_PRODUCT_NAME} ${TEST_CASE} || rc=$?
           ./tests/scripts/pull.sh /tmp/logs logs
           exit $rc
       - name: Archive test logs
@@ -423,8 +328,6 @@ jobs:
 
           echo "OPERATOR_VERSION=${COMMIT_SHORT_SHA}" >> $GITHUB_ENV
           echo "OPERATOR_IMAGE=ghcr.io/${LOWERCASE_REPO_OWNER}/gpu-operator" >> $GITHUB_ENV
-          echo "VALIDATOR_VERSION=${COMMIT_SHORT_SHA}" >> $GITHUB_ENV
-          echo "VALIDATOR_IMAGE=ghcr.io/${LOWERCASE_REPO_OWNER}/gpu-operator/gpu-operator-validator"  >> $GITHUB_ENV
 
           echo "instance_hostname=ubuntu@${{ steps.get_public_dns_name.outputs.result }}" >> $GITHUB_ENV
           echo "private_key=${{ github.workspace }}/key.pem" >> $GITHUB_ENV
@@ -436,7 +339,7 @@ jobs:
           TEST_CASE: "./tests/cases/nvidia-driver.sh"
         run: |
           echo "${{ secrets.AWS_SSH_KEY }}" > ${private_key} && chmod 400 ${private_key}
-          ./tests/ci-run-e2e.sh ${OPERATOR_IMAGE} ${OPERATOR_VERSION} ${VALIDATOR_IMAGE} ${VALIDATOR_VERSION} ${GPU_PRODUCT_NAME} ${TEST_CASE} || rc=$?
+          ./tests/ci-run-e2e.sh ${OPERATOR_IMAGE} ${OPERATOR_VERSION} ${GPU_PRODUCT_NAME} ${TEST_CASE} || rc=$?
           ./tests/scripts/pull.sh /tmp/logs logs
           exit $rc
       - name: Archive test logs
@@ -447,7 +350,7 @@ jobs:
           path: ./logs/
           retention-days: 15
 
-  release-latest-gpu-operator-and-validator-image:
+  release-latest-gpu-operator-image:
     if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} # Runs only if the event is a push to the main branch
     needs: [e2e-tests-containerd, e2e-tests-nvidiadriver]
     runs-on: linux-amd64-cpu4
@@ -468,17 +371,14 @@ jobs:
           LOWERCASE_REPO_OWNER=$(echo "${GITHUB_REPOSITORY_OWNER}" | awk '{print tolower($0)}')
           echo "OPERATOR_VERSION=${COMMIT_SHORT_SHA}" >> $GITHUB_ENV
           echo "OPERATOR_IMAGE=ghcr.io/${LOWERCASE_REPO_OWNER}/gpu-operator" >> $GITHUB_ENV
-          echo "VALIDATOR_VERSION=${COMMIT_SHORT_SHA}" >> $GITHUB_ENV
-          echo "VALIDATOR_IMAGE=ghcr.io/${LOWERCASE_REPO_OWNER}/gpu-operator/gpu-operator-validator"  >> $GITHUB_ENV
-      - name: Retag gpu-operator and gpu-operator-validator
+      - name: Retag gpu-operator
         run: |
           regctl registry login ghcr.io -u $GITHUB_ACTOR -p ${{ secrets.GITHUB_TOKEN }}
           regctl image copy ${OPERATOR_IMAGE}:${OPERATOR_VERSION} ${OPERATOR_IMAGE}:main-latest
-          regctl image copy ${VALIDATOR_IMAGE}:${VALIDATOR_VERSION} ${VALIDATOR_IMAGE}:main-latest
 
   push-gpu-operator-bundle-image:
     if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} # Runs only if the event is a push to the main branch
-    needs: [release-latest-gpu-operator-and-validator-image]
+    needs: [release-latest-gpu-operator-image]
     runs-on: linux-amd64-cpu4
     steps:
       - uses: actions/checkout@v4

.gitlab-ci.yml

@@ -98,12 +98,6 @@ build:gpu-operator:
     - .dist-ubi9
     - .target-gpu-operator
 
-build:gpu-operator-validator:
-  extends:
-    - .image-build
-    - .dist-ubi9
-    - .target-gpu-operator-validator
-
 .e2e_defaults:
   variables:
     TF_VAR_project_name: "gpu-operator"
@@ -113,8 +107,6 @@ build:gpu-operator-validator:
     # TODO: Should these use the staging release instead?
     OPERATOR_VERSION: "${CI_COMMIT_SHORT_SHA}"
     OPERATOR_IMAGE: "${CI_REGISTRY_IMAGE}"
-    VALIDATOR_VERSION: "${CI_COMMIT_SHORT_SHA}"
-    VALIDATOR_IMAGE: "${CI_REGISTRY_IMAGE}/gpu-operator-validator"
     GPU_PRODUCT_NAME: "Tesla-T4"
   extends:
     - .dist-ubi9
@@ -139,7 +131,7 @@ build:gpu-operator-validator:
     - export instance_hostname="${instance_hostname}"
     - export TEST_CASE="${TEST_CASE}"
     - rc=0
-    - ${CI_PROJECT_DIR}/tests/ci-run-e2e.sh ${OPERATOR_IMAGE} ${OPERATOR_VERSION} ${VALIDATOR_IMAGE} ${VALIDATOR_VERSION} ${GPU_PRODUCT_NAME} ${TEST_CASE} || rc=$?
+    - ${CI_PROJECT_DIR}/tests/ci-run-e2e.sh ${OPERATOR_IMAGE} ${OPERATOR_VERSION} ${GPU_PRODUCT_NAME} ${TEST_CASE} || rc=$?
     - ${CI_PROJECT_DIR}/tests/scripts/pull.sh /tmp/logs logs
     - exit $rc
   artifacts:

.nvidia-ci.yml

@@ -58,14 +58,6 @@ image:gpu-operator:
     - .dist-ubi9
     - .target-gpu-operator
 
-image:gpu-operator-validator:
-  extends:
-    - .image-pull
-    - .dist-ubi9
-    - .target-gpu-operator-validator
-  variables:
-    OUT_IMAGE_NAME: "${CI_REGISTRY_IMAGE}/gpu-operator-validator"
-
 # We skip the integration tests for the internal CI:
 .integration:
   stage: test
@@ -126,50 +118,21 @@ scan:gpu-operator-arm64:
   needs:
     - scan:gpu-operator-amd64
 
-.scan:gpu-operator-validator:
-  extends:
-    - .scan
-    - .dist-ubi9
-    - .target-gpu-operator-validator
-  needs:
-    - image:gpu-operator-validator
-
-scan:gpu-operator-validator-amd64:
-  extends:
-    - .scan:gpu-operator-validator
-    - .platform-amd64
-
-scan:gpu-operator-validator-arm64:
-  extends:
-    - .scan:gpu-operator-validator
-    - .platform-arm64
-  needs:
-    - scan:gpu-operator-validator-amd64
-
 # Define the external release steps for NGC and Dockerhub
 .release:ngc:
   extends: .release:external
   variables:
     OUT_REGISTRY_USER: "${NGC_REGISTRY_USER}"
     OUT_REGISTRY_TOKEN: "${NGC_REGISTRY_TOKEN}"
     OUT_REGISTRY: "${NGC_REGISTRY}"
-    OUT_IMAGE_NAME: "${NGC_REGISTRY_IMAGE}" # This needs to change for the gpu-operator and gpu-operator-validator
+    OUT_IMAGE_NAME: "${NGC_REGISTRY_IMAGE}"
 
 release:ngc-gpu-operator:
   extends:
     - .release:ngc
     - .dist-ubi9
     - .target-gpu-operator
 
-release:ngc-gpu-operator-validator:
-  extends:
-    - .release:ngc
-    - .dist-ubi9
-    - .target-gpu-operator-validator
-  variables:
-    IN_IMAGE_NAME: "gpu-operator-validator"
-    OUT_IMAGE_NAME: "${NGC_PROD_VALIDATOR_IMAGE}"
-
 # Define the external image signing steps for NGC
 # Download the ngc cli binary for use in the sign steps
 .ngccli-setup:
@@ -216,15 +179,6 @@ sign:ngc-gpu-operator:
   variables:
     IMAGE_TAG: "${CI_COMMIT_TAG}"
 
-sign:ngc-gpu-operator-validator:
-  extends:
-    - .sign:ngc
-  needs:
-    - release:ngc-gpu-operator-validator
-  variables:
-    IMAGE_NAME: "${NGC_PROD_VALIDATOR_IMAGE}"
-    IMAGE_TAG: "${CI_COMMIT_TAG}"
-
 .schedule_defaults:
   rules:
   - if: $CI_PIPELINE_SOURCE == "schedule"
@@ -235,8 +189,6 @@ sign:ngc-gpu-operator-validator:
     # TODO: Should these use the staging release instead?
     OPERATOR_VERSION: "${CI_COMMIT_SHORT_SHA}"
     OPERATOR_IMAGE: "${STAGING_REGISTRY}/gpu-operator"
-    VALIDATOR_VERSION: "${CI_COMMIT_SHORT_SHA}"
-    VALIDATOR_IMAGE: "${STAGING_REGISTRY}/gpu-operator-validator"
     TARGET_DRIVER_VERSION: "550.163.01"
 
 .e2e_tests:
@@ -255,7 +207,7 @@ sign:ngc-gpu-operator-validator:
     - export private_key="${VSPHERE_SSH_PRIVATE_KEY}"
     - export instance_hostname="${instance_hostname}"
     - rc=0
-    - ${CI_PROJECT_DIR}/tests/ci-run-e2e.sh ${OPERATOR_IMAGE} ${OPERATOR_VERSION} ${VALIDATOR_IMAGE} ${VALIDATOR_VERSION} ${GPU_DEVICE} || rc=$?
+    - ${CI_PROJECT_DIR}/tests/ci-run-e2e.sh ${OPERATOR_IMAGE} ${OPERATOR_VERSION} ${GPU_DEVICE} || rc=$?
     - ${CI_PROJECT_DIR}/tests/scripts/pull.sh /tmp/logs logs
     - exit $rc
   artifacts: