WIP: kubetest

Signed-off-by: Naadir Jeewa <[email protected]>

.gitignore

@@ -63,3 +63,5 @@ clusterctl-settings.json
 
 # test results
 _artifacts
+
+*.sentinel

common.mk

@@ -0,0 +1,65 @@
+# Copyright 2020 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.
+
+include $(ROOT_DIR_RELATIVE)/versions.mk
+
+# Ensure Make is run with bash shell as some syntax below is bash-specific
+SHELL:=bash
+.ONESHELL:
+.SHELLFLAGS := -eu -o pipefail -c
+.DELETE_ON_ERROR:
+MAKEFLAGS += --warn-undefined-variables
+MAKEFLAGS += --no-builtin-rules
+
+TOOLS_DIR := $(ROOT_DIR_RELATIVE)/hack/tools
+TOOLS_DIR_DEPS := $(TOOLS_DIR)/go.sum $(TOOLS_DIR)/go.mod $(TOOLS_DIR)/Makefile
+TOOLS_BIN_DIR := $(TOOLS_DIR)/bin
+
+PATH := $(abspath $(TOOLS_BIN_DIR)):$(PATH)
+export PATH
+
+UID := $(shell id -u)
+GID := $(shell id -g)
+
+rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(subst *,%,$2),$d))
+
+# Hosts running SELinux need :z added to volume mounts
+SELINUX_ENABLED := $(shell cat /sys/fs/selinux/enforce 2> /dev/null || echo 0)
+
+ifeq ($(SELINUX_ENABLED),1)
+  DOCKER_VOL_OPTS?=:z
+endif
+
+# This option is for running docker manifest command
+export DOCKER_CLI_EXPERIMENTAL := enabled
+
+# Use GOPROXY environment variable if set
+GOPROXY := $(shell go env GOPROXY)
+ifeq ($(GOPROXY),)
+GOPROXY := https://proxy.golang.org
+endif
+export GOPROXY
+
+
+$(TOOLS_BIN_DIR)/%: $(TOOLS_DIR_DEPS)
+	make -C $(TOOLS_DIR) $(@:hack/tools/%=%)
+
+## --------------------------------------
+## Help
+## --------------------------------------
+
+.DEFAULT_GOAL:=help
+
+help:  ## Display this help
+	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)

hack/tools/Makefile

@@ -0,0 +1,115 @@
+# Copyright 2020 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.
+
+ROOT_DIR_RELATIVE := ../..
+include $(ROOT_DIR_RELATIVE)/common.mk
+
+UNAME := $(shell uname -s)
+
+# Directories.
+BIN_DIR := bin
+SHARE_DIR := share
+
+OS := $(shell go env GOOS)
+RUST_TARGET := unknown-$(OS)-gnu
+MDBOOK_EXTRACT_COMMAND := tar xfvz $(SHARE_DIR)/mdbook.tar.gz -C bin
+MDBOOK_ARCHIVE_EXT := .tar.gz
+
+ifeq ($(OS), windows)
+	RUST_TARGET := pc-windows-msvc
+	MDBOOK_ARCHIVE_EXT := .zip
+	MDBOOK_EXTRACT_COMMAND := unzip -d /tmp
+endif
+
+ifeq ($(OS), darwin)
+	RUST_TARGET := apple-darwin
+endif
+
+## --------------------------------------
+## Tooling Binaries
+## --------------------------------------
+
+.PHONY: modules
+modules: ## Runs go mod to ensure modules are up to date.
+	go mod tidy
+
+$(BIN_DIR):
+	mkdir -p $@
+
+$(SHARE_DIR):
+	mkdir -p $@
+
+CONTROLLER_GEN := $(BIN_DIR)/controller-gen
+$(CONTROLLER_GEN): $(BIN_DIR) go.mod go.sum # Build controller-gen from tools folder.
+	go build -tags=tools -o $@ sigs.k8s.io/controller-tools/cmd/controller-gen
+
+CONVERSION_GEN := $(BIN_DIR)/conversion-gen
+$(CONVERSION_GEN): $(BIN_DIR) go.mod go.sum
+	go build -tags=tools -o $@ k8s.io/code-generator/cmd/conversion-gen
+
+DEFAULTER_GEN := $(BIN_DIR)/defaulter-gen
+$(DEFAULTER_GEN): $(BIN_DIR) go.mod go.sum
+	go build -tags=tools -o $@ k8s.io/code-generator/cmd/defaulter-gen
+
+ENVSUBST := $(BIN_DIR)/envsubst
+$(ENVSUBST): $(BIN_DIR) go.mod go.sum # Build envsubst from tools folder.
+	go build -tags=tools -o $@ github.com/a8m/envsubst/cmd/envsubst
+
+GINKGO := $(BIN_DIR)/ginkgo
+$(GINKGO): $(BIN_DIR) go.mod go.sum
+	go build -tags=tools -o $@ github.com/onsi/ginkgo/ginkgo
+
+GOLANGCI_LINT := $(BIN_DIR)/golangci-lint
+$(GOLANGCI_LINT): $(BIN_DIR) go.mod go.sum # Build golangci-lint from tools folder.
+	go build -tags=tools -o $@ github.com/golangci/golangci-lint/cmd/golangci-lint
+
+KIND := $(BIN_DIR)/kind
+$(KIND): $(BIN_DIR) go.mod go.sum
+	go build -tags tools -o $@ sigs.k8s.io/kind
+
+KUSTOMIZE := $(BIN_DIR)/kustomize
+$(KUSTOMIZE): $(BIN_DIR) go.mod go.sum # Build kustomize from tools folder.
+	go build -tags=tools -o $@ sigs.k8s.io/kustomize/kustomize/v3
+
+MDBOOK_EMBED := $(BIN_DIR)/mdbook-embed
+$(MDBOOK_EMBED): $(BIN_DIR) go.mod go.sum
+	go build -tags=tools -o $(BIN_DIR)/mdbook-embed ./mdbook/embed
+
+MDBOOK_RELEASELINK := $(BIN_DIR)/mdbook-releaselink
+$(MDBOOK_RELEASELINK): $(BIN_DIR) go.mod go.sum
+	go build -tags=tools -o $(BIN_DIR)/mdbook-releaselink ./mdbook/releaselink
+
+MDBOOK_TABULATE := $(BIN_DIR)/mdbook-tabulate
+$(MDBOOK_TABULATE): $(BIN_DIR) go.mod go.sum
+	go build -tags=tools -o $(BIN_DIR)/mdbook-tabulate ./mdbook/tabulate
+
+MOCKGEN := $(BIN_DIR)/mockgen
+$(MOCKGEN): $(BIN_DIR) go.mod go.sum # Build mockgen from tools folder.
+	go build -tags=tools -o $@ github.com/golang/mock/mockgen
+
+RELEASE_NOTES := $(BIN_DIR)/release-notes
+$(RELEASE_NOTES): $(BIN_DIR) go.mod go.sum
+	go build -tags tools -o $@ ./release
+
+LINK_CHECKER := $(BIN_DIR)/link-checker
+$(LINK_CHECKER): $(BIN_DIR) go.mod go.sum
+	go build -tags tools -o $@ github.com/raviqqe/liche
+
+GOBINDATA := $(BIN_DIR)/go-bindata
+$(GOBINDATA): $(BIN_DIR) go.mod go.sum
+	go build -tags tools -o $@ github.com/go-bindata/go-bindata/go-bindata
+
+GOAPIDIFF := $(BIN_DIR)/go-apidiff
+$(GOAPIDIFF): $(BIN_DIR) go.mod go.sum
+	go build -tags tools -o $@ github.com/joelanford/go-apidiff

hack/tools/tools.mk

@@ -0,0 +1,12 @@
+# Binaries.
+KUSTOMIZE := $(TOOLS_BIN_DIR)/kustomize
+CONTROLLER_GEN:= $(TOOLS_BIN_DIR)/controller-gen
+GOLANGCI_LINT := $(TOOLS_BIN_DIR)/golangci-lint
+CONVERSION_GEN := $(TOOLS_BIN_DIR)/conversion-gen
+DEFAULTER_GEN := $(TOOLS_BIN_DIR)/defaulter-gen
+GINKGO := $(TOOLS_BIN_DIR)/ginkgo
+ENVSUBST := $(TOOLS_BIN_DIR)/envsubst
+GOBINDATA := $(TOOLS_BIN_DIR)/go-bindata
+RELEASE_NOTES := $(TOOLS_BIN_DIR)/release-notes
+GO_APIDIFF := $(TOOLS_BIN_DIR)/go-apidiff
+LINK_CHECKER := $(TOOLS_BIN_DIR)/link-checker

scripts/ci-conformance.sh

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+# Copyright 2018 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
+
+REPO_ROOT=$(git rev-parse --show-toplevel)
+cd "${REPO_ROOT}" || exit 1
+
+# shellcheck source=./hack/ensure-go.sh
+source "${REPO_ROOT}/hack/ensure-go.sh"
+# shellcheck source=./hack/ensure-kubectl.sh
+source "${REPO_ROOT}/hack/ensure-kubectl.sh"
+# shellcheck source=./hack/ensure-kustomize.sh
+source "${REPO_ROOT}/hack/ensure-kustomize.sh"
+
+# Configure provider images generation;
+# please ensure the generated image name matches image names used in the E2E_CONF_FILE
+export REGISTRY=gcr.io/k8s-staging-cluster-api
+export TAG=ci
+export ARCH=amd64
+export PULL_POLICY=IfNotPresent
+
+## Rebuild all Cluster API provider images
+make docker-build
+
+## Rebuild CAPD provider images
+make -C test/infrastructure/docker docker-build
+
+## Pulling cert manager images so we can pre-load in kind nodes
+docker pull quay.io/jetstack/cert-manager-cainjector:v0.16.1
+docker pull quay.io/jetstack/cert-manager-webhook:v0.16.1
+docker pull quay.io/jetstack/cert-manager-controller:v0.16.1
+
+## Pulling kind images used by tests
+docker pull kindest/node:v1.18.2
+docker pull kindest/node:v1.17.2
+
+# Configure e2e tests
+export GINKGO_NODES=3
+export GINKGO_NOCOLOR=true
+export GINKGO_ARGS="--failFast" # Other ginkgo args that need to be appended to the command.
+export E2E_CONF_FILE="${REPO_ROOT}/test/e2e/config/docker-ci.yaml"
+export ARTIFACTS="${ARTIFACTS:-${REPO_ROOT}/_artifacts}"
+export SKIP_RESOURCE_CLEANUP=false
+export USE_EXISTING_CLUSTER=false
+
+# Run conformance tests
+mkdir -p "$ARTIFACTS"
+make test-conformance

scripts/ci-e2e.sh

@@ -61,4 +61,4 @@ export USE_EXISTING_CLUSTER=false
 
 # Run e2e tests
 mkdir -p "$ARTIFACTS"
-make -C test/e2e/ run
+make test-e2e