diff --git a/Makefile b/Makefile index bc091a46b9b0..f10593e89e2b 100644 --- a/Makefile +++ b/Makefile @@ -480,10 +480,6 @@ verify-shellcheck: ## Verify shell files verify-tiltfile: ## Verify Tiltfile format ./hack/verify-starlark.sh -.PHONY: verify-docker-provider -verify-capd: - cd $(CAPD_DIR); ./hack/verify-all.sh - ## -------------------------------------- ## Binaries ## -------------------------------------- @@ -494,7 +490,7 @@ verify-capd: clusterctl: ## Build the clusterctl binary go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/clusterctl sigs.k8s.io/cluster-api/cmd/clusterctl -ALL_MANAGERS = core kubeadm-bootstrap kubeadm-control-plane +ALL_MANAGERS = core kubeadm-bootstrap kubeadm-control-plane capd .PHONY: managers managers: $(addprefix manager-,$(ALL_MANAGERS)) ## Run all manager-* targets @@ -555,6 +551,9 @@ docker-build-kubeadm-control-plane: ## Build the docker image for kubeadm contro docker-build-clusterctl: ## Build the docker image for clusterctl with output binary name as 'clusterctl' DOCKER_BUILDKIT=1 docker build --build-arg builder_image=$(GO_CONTAINER_IMAGE) --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) --build-arg package=./cmd/clusterctl --build-arg ldflags="$(LDFLAGS)" -f ./cmd/clusterctl/Dockerfile . -t $(CLUSTERCTL_IMG)-$(ARCH):$(TAG) +.PHONY: docker-capd-build-all +docker-capd-build-all: $(addprefix docker-capd-build-,$(ALL_ARCH)) ## Build capd docker images for all architectures + .PHONY: e2e-framework e2e-framework: ## Builds the CAPI e2e framework cd $(E2E_FRAMEWORK_DIR); go build ./... @@ -567,9 +566,6 @@ build-book: ## Build the book serve-book: ## Build and serve the book (with live-reload) $(MAKE) -C docs/book serve -.PHONY: docker-capd-build-all -docker-capd-build-all: $(addprefix docker-capd-build-,$(ALL_ARCH)) ## Build capd docker images for all architectures - docker-capd-build-%: $(MAKE) ARCH=$* docker-capd-build diff --git a/docs/book/src/developer/providers/v1.1-to-v1.2.md b/docs/book/src/developer/providers/v1.1-to-v1.2.md index 4ae7fdac65d2..e638cef8c1b1 100644 --- a/docs/book/src/developer/providers/v1.1-to-v1.2.md +++ b/docs/book/src/developer/providers/v1.1-to-v1.2.md @@ -92,35 +92,3 @@ in ClusterAPI are kept in sync with the versions used by `sigs.k8s.io/controller - The check for `cluster.status.infrastructureReady=true` usually existing at the beginning of the reconcile loop for control-plane providers is implemented after setting external objects ref; - The check for `cluster.status.infrastructureReady=true` usually existing at the beginning of the reconcile loop for infrastructure provider does not prevent the object to be deleted rif. [PR #6183](https://github.com/kubernetes-sigs/cluster-api/pull/6183) - -- Makefile - - migrate all targets of `./test/infrastructure/docker/Makefile` to the top-level `Makefile`: - - | old Makefile target | new Makefile target | - |-----------------------------|-------------------------------| - | `test` | `test-capd` | - | `test-verbose` | `test-capd-verbose` | - | `test-junit` | `test-capd-junit` | - | `manager` | `manager-capd` | - | `generate` | `generate` | - | `generate-go` | `generate-go-deepcopy-capd` | - | | `generate-go-conversion-capd` | - | `generate-manifests` | `generate-manifests-capd` | - | `docker-pull-prerequisites` | `docker-pull-prerequisites` | - | `docker-build` | `docker-capd-build` | - | `docker-push` | `docker-capd-push` | - | `docker-build-all` | `docker-capd-build-all` | - | `docker-build-%` | `docker-capd-build-%` | - | `docker-push-all` | `docker-capd-push-all` | - | `docker-push-%` | `docker-capd-push-%` | - | `docker-push-manifest` | `docker-capd-push-manifest` | - | `release` | `release` | - | `manifest-modification` | `manifest-modification` | - | `release-manifests` | `release-manifests-dev` | - | `release-staging` | `release-capd-staging` | - | `release-staging-nigtly` | `release-capd-staging-nigtly` | - | `release-alias-tag` | `release-capd-alias-tag` | - | `clean-bin` | `clean-bin` | - | `clean-release` | `clean-release` | - | `verify` | `verify / verify-capd` | - | `verify-gen` | `verify-gen` | \ No newline at end of file diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index c7694598acec..86c08dc99ac6 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -20,9 +20,5 @@ set -o pipefail REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. -# Core Cluster API +# Core Cluster API and Docker provider cd "${REPO_ROOT}" && make managers clusterctl e2e-framework build-book - -echo "*** Building Cluster API Provider Docker ***" -# Docker provider -cd "${REPO_ROOT}" && make manager-capd diff --git a/test/infrastructure/docker/hack/verify-all.sh b/test/infrastructure/docker/hack/verify-all.sh deleted file mode 100755 index 07c6d71814a4..000000000000 --- a/test/infrastructure/docker/hack/verify-all.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2019 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -o nounset -set -o pipefail - -# shellcheck source=./hack/utils.sh -source "$(git rev-parse --show-toplevel)/hack/utils.sh" - -# set REPO_PATH -readonly REPO_PATH=$(get_capd_root_path) -cd "${REPO_PATH}" || exit - -failure() { - if [[ "${1}" != 0 ]]; then - res=1 - failed+=("${2}") - outputs+=("${3}") - fi -} - -# exit code, if a script fails we'll set this to 1 -res=0 -failed=() -outputs=() - -# run all verify scripts, optionally skipping any of them -if [[ "${VERIFY_BUILD:-true}" == "true" ]]; then - echo "[*] Verifying build..." - out=$(hack/verify-build.sh 2>&1) - failure $? "verify-build.sh" "${out}" - cd "${REPO_PATH}" || exit -fi - -# exit based on verify scripts -if [[ "${res}" = 0 ]]; then - echo "" - echo "All verify checks passed, congrats!" -else - echo "" - echo "Some of the verify scripts failed:" - for i in "${!failed[@]}"; do - echo "- ${failed[$i]}:" - echo "${outputs[$i]}" - echo - done -fi -exit "${res}" diff --git a/test/infrastructure/docker/hack/verify-build.sh b/test/infrastructure/docker/hack/verify-build.sh deleted file mode 100755 index a61915e032fd..000000000000 --- a/test/infrastructure/docker/hack/verify-build.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2019 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -o errexit -set -o nounset -set -o pipefail - -# shellcheck source=./hack/utils.sh -source "$(git rev-parse --show-toplevel)/hack/utils.sh" - -# check if the code builds -cd_capd_root_path -export GO111MODULE=on -go build ./...