Skip to content

Commit

Permalink
Fix cilium-agent image (#1489)
Browse files Browse the repository at this point in the history
* Fix cilium-agent image

Signed-off-by: Daichi Sakaue <[email protected]>
  • Loading branch information
yokaze authored Dec 25, 2024
1 parent eeaf60d commit de01a36
Show file tree
Hide file tree
Showing 12 changed files with 506 additions and 327 deletions.
66 changes: 0 additions & 66 deletions .github/actions/build_cilium-agent/action.yaml

This file was deleted.

75 changes: 0 additions & 75 deletions .github/actions/build_cilium-envoy/action.yaml

This file was deleted.

83 changes: 0 additions & 83 deletions .github/actions/build_cilium-image-tools/action.yaml

This file was deleted.

26 changes: 18 additions & 8 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -302,12 +302,22 @@ jobs:

build_cilium:
runs-on: neco-containers-ubuntu-22.04
env:
go-version: "1.23.3"
steps:
- uses: actions/checkout@v4
- name: Build cilium-agent image
uses: ./.github/actions/build_cilium-agent
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
yamory_token: ${{ secrets.YAMORY_ACCESS_TOKEN }}
cilium-proxy_version: 97edc2815e2c6a174d3d12e71731d54f5d32ea16
image-tools_version: de666b61919632fb1e91fcf6259531f6bee467ee
- uses: actions/checkout@v4
- name: Setup build environment
uses: ./.github/actions/setup
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
go-version: ${{ env.go-version }}
- name: Build container image
uses: ./.github/actions/build_push
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
yamory_token: ${{ secrets.YAMORY_ACCESS_TOKEN }}
dir: cilium
container-image: cilium
make-targets: "checkout status test-e2e-setup test-e2e-upgrade-inotify"
make-post-targets: "test test-e2e"
request-scan: "true"
3 changes: 3 additions & 0 deletions cilium/.dockerignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
*
!TAG
!src/cilium
!src/image-tools
!src/proxy
!src/workspace
!*.patch
2 changes: 2 additions & 0 deletions cilium/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
e2e/bin
src
Loading

0 comments on commit de01a36

Please sign in to comment.