Merge pull request #43 from msherif1234/dev-ui

.dockerignore

@@ -0,0 +1 @@
+bin

.github/workflows/image-build.yaml

@@ -1,4 +1,4 @@
-name: bpfman-image-build
+name: operator-image-build
 
 on: # yamllint disable-line rule:truthy
   push:
@@ -7,7 +7,10 @@ on: # yamllint disable-line rule:truthy
       - v*
 
   pull_request:
-    paths: [.github/workflows/image-build.yaml]
+    paths:
+      - .github/workflows/image-build.yaml
+      - Containerfile.bpfman-agent
+      - Containerfile.bpfman-operator
 
 jobs:
   build-and-push-images:
@@ -16,7 +19,7 @@ jobs:
       packages: write
       id-token: write # needed for signing the images with GitHub OIDC Token
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -94,7 +97,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           file: ${{ matrix.image.dockerfile }}
-          build-args: ${{ matrix.image.build_args }}
+          build-args: BUILDPLATFORM=linux/amd64
           context: ${{ matrix.image.context }}
 
       - name: Sign the images with GitHub OIDC Token
@@ -111,7 +114,7 @@ jobs:
       packages: write
       id-token: write # needed for signing the images with GitHub OIDC Token
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -120,7 +123,7 @@ jobs:
             repository: bpfman
             image: bpfman-operator-bundle
             context: .
-            dockerfile: ./Containerfile.bundle
+            dockerfile: ./bundle.Dockerfile
             tags: |
               type=ref,event=branch
               type=ref,event=tag
@@ -160,7 +163,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           containerfiles: ${{ matrix.image.dockerfile }}
-          build-args: ${{ matrix.image.build_args }}
+          build-args: BUILDPLATFORM=linux/amd64
           context: ${{ matrix.image.context }}
 
       - name: Push to registry

.github/workflows/integration_test.yml

@@ -0,0 +1,82 @@
+name: Kubernetes Integration Tests
+
+on:
+  pull_request:
+    branches: ['*']
+  workflow_dispatch:
+  schedule:
+    - cron: '0 5 * * *'  # Runs every day at 5 AM UTC
+
+jobs:
+
+  kubernetes-integration-tests:
+    name: Kubernetes Integration Tests (Go ${{ matrix.go }} - amd64 - ${{ matrix.oci_bin }})
+    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        go: ['1.23']
+        oci_bin: ['docker', 'podman']
+    env:
+      BPFMAN_AGENT_IMG: quay.io/bpfman/bpfman-agent:int-test
+      BPFMAN_OPERATOR_IMG: quay.io/bpfman/bpfman-operator:int-test
+      XDP_PASS_PRIVATE_IMAGE_CREDS: ${{ secrets.XDP_PASS_PRIVATE_IMAGE_CREDS }}
+    steps:
+      - name: Check disk space
+        run: df -h
+
+      - name: Free up space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf "/usr/local/share/boost"
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          sudo rm -rf /usr/local/lib/android
+
+      - name: Check disk space again
+        run: df -h
+
+      - name: Install go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go }}
+
+      - name: cache go modules
+        uses: actions/cache@v4
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-build-codegen-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-build-codegen-
+
+      - name: Checkout bpfman-operator
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install OCI runtime (Docker or Podman)
+        run: |
+          if [ "${{ matrix.oci_bin }}" = "podman" ]; then
+            sudo apt-get update && sudo apt-get install -y podman
+          fi
+
+      - name: Build Operator and Agent images with ${{ matrix.oci_bin }}
+        run: |
+          make OCI_BIN=${{ matrix.oci_bin }} build-images
+
+      # Run integration tests only if OCI_BIN is Docker.
+      - name: Run integration tests
+        if: ${{ matrix.oci_bin == 'docker' }}
+        run: |
+          make test-integration
+
+      - name: Check disk space
+        run: df -h
+
+      ## Upload diagnostics if integration test step failed.
+      - name: Upload diagnostics
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: kubernetes-integration-test-diag
+          path: /tmp/ktf-diag*
+          if-no-files-found: ignore

.github/workflows/pull_request.yml

@@ -7,7 +7,7 @@ on:
 jobs:
 
   check-license:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: 3
 
     steps:
@@ -17,11 +17,11 @@ jobs:
 
   build-lint-test:
     name: Build (Go ${{ matrix.go }} - ${{ matrix.arch.arch }})
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
-        go: ['1.22']
+        go: ['1.23']
         arch:
           - arch: amd64
             filename: linux-x86_64
@@ -60,7 +60,7 @@ jobs:
       run: make test
 
     - name: Archive Go code coverage results
-      if: ${{ matrix.arch.arch == 'amd64' && matrix.go == '1.22' }}
+      if: ${{ matrix.arch.arch == 'amd64' && matrix.go == '1.23' }}
       uses: actions/upload-artifact@v4
       with:
         name: coverage-go
@@ -77,72 +77,9 @@ jobs:
         make bundle
         git diff --exit-code -I'^    createdAt: ' bundle
 
-  kubernetes-integration-tests:
-    name: Kubernetes Integration Tests (Go ${{ matrix.go }} - amd64)
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        go: ['1.22']
-    env:
-      BPFMAN_AGENT_IMG: quay.io/bpfman/bpfman-agent:int-test
-      BPFMAN_OPERATOR_IMG: quay.io/bpfman/bpfman-operator:int-test
-      XDP_PASS_PRIVATE_IMAGE_CREDS: ${{ secrets.XDP_PASS_PRIVATE_IMAGE_CREDS }}
-    steps:
-      - name: Check disk space
-        run: df -h
-
-      - name: Free up space
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
-          sudo rm -rf "/usr/local/share/boost"
-          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-          sudo rm -rf /usr/local/lib/android
-
-      - name: Check disk space again
-        run: df -h
-
-      - name: Install go
-        uses: actions/setup-go@v5
-        with:
-          go-version: ${{ matrix.go }}
-
-      - name: cache go modules
-        uses: actions/cache@v4
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-build-codegen-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-build-codegen-
-
-      - name: Checkout bpfman-operator
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Build Operator and Agent images
-        run: |
-          make build-images
-
-      - name: Run integration tests
-        run: |
-          make test-integration
-
-      - name: Check disk space
-        run: df -h
-
-      ## Upload diagnostics if integration test step failed.
-      - name: Upload diagnostics
-        if: ${{ failure() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: kubernetes-integration-test-diag
-          path: /tmp/ktf-diag*
-          if-no-files-found: ignore
-
   coverage:
     needs: [build-lint-test]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Download golang coverage artifacts
         uses: actions/download-artifact@v4
@@ -165,9 +102,8 @@ jobs:
         check-license,
         build-lint-test,
         coverage,
-        kubernetes-integration-tests,
       ]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Build Complete
         run: echo "Build Complete"

.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
   # Creates Release with just the changelog
   release:
     if: startsWith(github.ref, 'refs/tags/v')
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout bpfman
         uses: actions/checkout@v4

.github/workflows/scorecard.yml

@@ -0,0 +1,74 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: Scorecard supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '30 19 * * 4'
+  push:
+    branches: [ "main" ]
+  workflow_dispatch:
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-24.04
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+      # Uncomment the permissions below if installing in a private repository.
+      # contents: read
+      # actions: read
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.4.0
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
+          # - you want to enable the Branch-Protection check on a *public* repository, or
+          # - you are installing Scorecard on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action?tab=readme-ov-file#authentication-with-fine-grained-pat-optional.
+          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
+
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories:
+          #   - `publish_results` will always be set to `false`, regardless
+          #     of the value entered here.
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@v4
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard (optional).
+      # Commenting out will disable upload of results to your repo's Code Scanning dashboard
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: results.sarif

.snyk

@@ -0,0 +1,8 @@
+# References:
+# https://docs.snyk.io/scan-applications/snyk-code/using-snyk-code-from-the-cli/excluding-directories-and-files-from-the-snyk-code-cli-test
+# https://docs.snyk.io/snyk-cli/commands/ignore
+exclude:
+  global:
+    - vendor/**
+    - "**/*_test.go"
+    - "test/**"