Skip to content

Commit 10a2a64

Browse files
committed
Remove use of intermediate build image
1 parent d8e9633 commit 10a2a64

21 files changed

+55
-429
lines changed

.dockerignore

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
*
2-
!.git
3-
!.goreleaser*
4-
!.golangci*
5-
!.mockery.yaml
6-
!build/scripts
7-
!cmd
8-
!examples
9-
!go.*
10-
!integration
11-
!LICENSE
12-
!Makefile*
13-
!pkg
14-
!tools.go
1+
.editorconfig
2+
.dockerignore
3+
.github
4+
.gitignore
5+
*.md
6+
*.toml
7+
docs
8+
eksctl
9+
examples
10+
logo
11+
userdocs
12+
CNAME
13+
DCO
14+
LICENSE

.github/actions/setup-build/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ runs:
2222
- name: Setup deps
2323
shell: bash
2424
run: |
25-
make install-build-deps
25+
make install-tools

.github/workflows/build-all-distros-nightly.yaml

Lines changed: 0 additions & 49 deletions
This file was deleted.

.github/workflows/cache-dependencies.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/ecr-publish-build.yaml

Lines changed: 0 additions & 38 deletions
This file was deleted.

.github/workflows/release-candidate.yaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,14 @@ jobs:
77
rc:
88
name: Push release candidate tag
99
runs-on: ubuntu-latest
10-
container: public.ecr.aws/eksctl/eksctl-build:9b9ac54ee74f36fa22be8c7ec24f695dbd4c0d72
1110
steps:
1211
- name: Checkout
1312
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
1413
with:
1514
token: ${{ secrets.EKSCTLBOT_TOKEN }}
1615
fetch-depth: 0
17-
- name: Cache go-build and mod
18-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 #v4.2.0
19-
with:
20-
path: |
21-
~/.cache/go-build/
22-
~/go/pkg/mod/
23-
key: go-${{ hashFiles('go.sum') }}
24-
restore-keys: |
25-
go-
16+
- name: Setup build environment
17+
uses: ./.github/actions/setup-build
2618
- name: Setup identity as eksctl-bot
2719
uses: ./.github/actions/setup-identity
2820
with:

.github/workflows/release.yaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,14 @@ jobs:
77
rc:
88
name: Push release tag
99
runs-on: ubuntu-latest
10-
container: public.ecr.aws/eksctl/eksctl-build:9b9ac54ee74f36fa22be8c7ec24f695dbd4c0d72
1110
steps:
1211
- name: Checkout
1312
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
1413
with:
1514
token: ${{ secrets.EKSCTLBOT_TOKEN }}
1615
fetch-depth: 0
17-
- name: Cache go-build and mod
18-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 #v4.2.0
19-
with:
20-
path: |
21-
~/.cache/go-build/
22-
~/go/pkg/mod/
23-
key: go-${{ hashFiles('go.sum') }}
24-
restore-keys: |
25-
go-
16+
- name: Setup build environment
17+
uses: ./.github/actions/setup-build
2618
- name: Setup identity as eksctl-bot
2719
uses: ./.github/actions/setup-identity
2820
with:

.github/workflows/test-and-build.yaml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
uses: ./.github/actions/setup-build
1818
- name: Unit test
1919
run: |
20-
PATH=$PATH:$(go env GOPATH)/bin make build
21-
PATH=$PATH:$(go env GOPATH)/bin make unit-test-no-generate
20+
make build
21+
make unit-test-no-generate
2222
lint:
2323
name: Lint
2424
runs-on: ubuntu-latest
@@ -30,8 +30,7 @@ jobs:
3030
- name: Setup build environment
3131
uses: ./.github/actions/setup-build
3232
- name: Lint
33-
run: |
34-
PATH=$PATH:$(go env GOPATH)/bin make lint
33+
run: make lint
3534
image:
3635
name: Build and check image
3736
runs-on: ubuntu-latest
@@ -40,8 +39,10 @@ jobs:
4039
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
4140
with:
4241
fetch-depth: 0
43-
- name: Setup build environment
44-
uses: ./.github/actions/setup-build
45-
- name: build
46-
run: |
47-
PATH=$PATH:$(go env GOPATH)/bin make -f Makefile.docker check-build-image-manifest-up-to-date
42+
- name: Build image
43+
id: push
44+
uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc #v6.11.0
45+
with:
46+
context: .
47+
file: ./Dockerfile
48+
push: false

.github/workflows/update-generated.yaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
resource: ["coredns", "aws-node", "nvidia-device-plugin"]
1919
name: Update ${{ matrix.resource }} and open PR
2020
runs-on: ubuntu-latest
21-
container: public.ecr.aws/eksctl/eksctl-build:9b9ac54ee74f36fa22be8c7ec24f695dbd4c0d72
2221
env:
2322
GOPRIVATE: ""
2423
steps:
@@ -39,15 +38,8 @@ jobs:
3938
uses: ./.github/actions/setup-identity
4039
with:
4140
token: "${{ secrets.EKSCTLBOT_TOKEN }}"
42-
- name: Cache go-build and mod
43-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 #v4.2.0
44-
with:
45-
path: |
46-
~/.cache/go-build/
47-
~/go/pkg/mod/
48-
key: go-${{ hashFiles('go.sum') }}
49-
restore-keys: |
50-
go-
41+
- name: Setup build environment
42+
uses: ./.github/actions/setup-build
5143
- name: Update ${{ matrix.resource }}
5244
run: make update-${{ matrix.resource }}
5345
- name: Upsert pull request

.requirements

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)