Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
*
!.git
!.goreleaser*
!.golangci*
!.mockery.yaml
!build/scripts
!cmd
!examples
!go.*
!integration
!LICENSE
!Makefile*
!pkg
!tools.go
.editorconfig
.dockerignore
.github
.gitignore
*.md
*.toml
docs
eksctl
examples
logo
userdocs
CNAME
DCO
LICENSE
49 changes: 0 additions & 49 deletions .github/workflows/build-all-distros-nightly.yaml

This file was deleted.

37 changes: 0 additions & 37 deletions .github/workflows/ecr-publish-build.yaml

This file was deleted.

11 changes: 7 additions & 4 deletions .github/workflows/test-and-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
with:
fetch-depth: 0
- name: Setup build environment
uses: ./.github/actions/setup-build
- name: build
run: make -f Makefile.docker check-build-image-manifest-up-to-date
- name: Build image
id: push
uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc #v6.11.0
with:
context: .
file: ./Dockerfile
push: false
5 changes: 0 additions & 5 deletions .requirements

This file was deleted.

15 changes: 1 addition & 14 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ then head to the [main docs](https://eksctl.io/) for more information.

This project is written in Go. To be able to contribute you will need:

1. A working Go installation of Go >= 1.12. You can check the
1. A working Go installation of Go >= 1.24. You can check the
[official installation guide](https://golang.org/doc/install).

2. Make sure that `$(go env GOPATH)/bin` is in your shell's `PATH`. You can do so by
Expand Down Expand Up @@ -344,19 +344,6 @@ To run the tests simply run the following after `install-build-deps`:
make test
```

If you prefer to use Docker, the same way it is used in CI, you can use the
following command:

```bash
make -f Makefile.docker test
```

> NOTE: It is not the most convenient way of working on the project, as
> binaries are built inside the container and cannot be tested manually,
> also majority of end-users consume binaries and not Docker images.
> It is recommended to use `make build` etc, unless there is an issue in CI
> that need troubleshooting.

#### Running the integration tests

> NOTE: Some parts of the integration tests are not configurable and therefore
Expand Down
15 changes: 7 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
include Makefile.common
include Makefile.docs
include Makefile.docker

version_pkg := github.com/weaveworks/eksctl/pkg/version

Expand Down Expand Up @@ -36,8 +35,12 @@ endif
install-all-deps: install-build-deps install-site-deps ## Install all dependencies for building both binary and user docs)

.PHONY: install-build-deps
install-build-deps: ## Install dependencies (packages and tools)
build/scripts/install-build-deps.sh
install-build-deps: ## Install dependencies for code generation and test execution
go install github.com/golangci/golangci-lint/cmd/golangci-lint
go install github.com/cloudflare/cfssl/cmd/...@latest
go install github.com/maxbrunsfeld/counterfeiter/v6
go install github.com/vektra/mockery/v2
go install github.com/vburenin/ifacemaker

##@ Build

Expand Down Expand Up @@ -102,7 +105,7 @@ build-integration-test: $(all_generated_code) ## Ensure integration tests compil
@# Compile integration test binary without running any.
@# Required as build failure aren't listed when running go build below. See also: https://github.com/golang/go/issues/15513
go test -tags integration -run=^$$ ./integration/...
@# Build integration test binary:
@# Build integration test binary:
go build -tags integration -o ./eksctl-integration-test ./integration/main.go

.PHONY: integration-test
Expand Down Expand Up @@ -189,10 +192,6 @@ generate-kube-reserved: ## Update instance list with respective specs
@cd ./pkg/nodebootstrap/ && go run reserved_generate.go

##@ Release
# .PHONY: eksctl-image
# eksctl-image: ## Build the eksctl image that has release artefacts and no build dependencies
# $(MAKE) -f Makefile.docker $@

.PHONY: prepare-release
prepare-release: ## Create release
build/scripts/tag-release.sh
Expand Down
2 changes: 0 additions & 2 deletions Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,3 @@ git_org := $(shell dirname $(full_repo_name))
eksctl_version := $(shell go run pkg/version/generate/release_generate.go print-version)

unique_tag = $(shell printf "%s-%s-%s" `git rev-parse @` $(build_image_tag) $(built_at))

eksctl_image_name ?= weaveworks/eksctl:latest
87 changes: 0 additions & 87 deletions Makefile.docker

This file was deleted.

4 changes: 0 additions & 4 deletions build/build_image_manifest

This file was deleted.

56 changes: 0 additions & 56 deletions build/docker/Dockerfile

This file was deleted.

15 changes: 0 additions & 15 deletions build/docker/build_image_manifest

This file was deleted.

1 change: 0 additions & 1 deletion build/docker/image_tag

This file was deleted.

Loading