Merge pull request #11212 from sharifelgamal/kicbase-build
Make sure to capture errors in auto kicbase buildspull/11221/head
Sharif Elgamal
GitHub
commit
b0f6923d68
9
Makefile
9
Makefile
|
|
@ -56,9 +56,6 @@ BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSIO
|
|||
ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image
|
||||
KVM_BUILD_IMAGE ?= $(REGISTRY)/kvm-build-image:$(KVM_GO_VERSION)
|
||||
|
||||
KIC_BASE_IMAGE_GCR ?= $(REGISTRY)/kicbase:$(KIC_VERSION)
|
||||
KIC_BASE_IMAGE_HUB ?= kicbase/stable:$(KIC_VERSION)
|
||||
|
||||
ISO_BUCKET ?= minikube/iso
|
||||
|
||||
MINIKUBE_VERSION ?= $(ISO_VERSION)
|
||||
|
|
@ -688,7 +685,9 @@ docker-multi-arch-builder:
|
|||
env $(X_BUILD_ENV) docker buildx create --name $(X_DOCKER_BUILDER) --buildkitd-flags '--debug' || true
|
||||
|
||||
KICBASE_ARCH = linux/arm64,linux/amd64
|
||||
KICBASE_IMAGE_REGISTRIES ?= $(REGISTRY)/kicbase:$(KIC_VERSION) kicbase/stable:$(KIC_VERSION)
|
||||
KICBASE_IMAGE_GCR ?= $(REGISTRY)/kicbase:$(KIC_VERSION)
|
||||
KICBASE_IMAGE_HUB ?= kicbase/stable:$(KIC_VERSION)
|
||||
KICBASE_IMAGE_REGISTRIES ?= $(KICBASE_IMAGE_GCR) $(KICBASE_IMAGE_HUB)
|
||||
|
||||
.PHONY: push-kic-base-image
|
||||
push-kic-base-image: deploy/kicbase/auto-pause docker-multi-arch-builder ## Push multi-arch local/kicbase:latest to all remote registries
|
||||
|
|
@ -699,7 +698,7 @@ ifdef AUTOPUSH
|
|||
endif
|
||||
$(foreach REG,$(KICBASE_IMAGE_REGISTRIES), \
|
||||
@docker pull $(REG) && echo "Image already exist in registry" && exit 1 || echo "Image doesn't exist in registry";)
|
||||
ifndef AUTOPUSH
|
||||
ifndef CIBUILD
|
||||
$(call user_confirm, 'Are you sure you want to push $(KICBASE_IMAGE_REGISTRIES) ?')
|
||||
endif
|
||||
env $(X_BUILD_ENV) docker buildx build --builder $(X_DOCKER_BUILDER) --platform $(KICBASE_ARCH) $(addprefix -t ,$(KICBASE_IMAGE_REGISTRIES)) --push --build-arg COMMIT_SHA=${VERSION}-$(COMMIT) ./deploy/kicbase
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
set -x
|
||||
set -x -o pipefail
|
||||
|
||||
# Make sure docker is installed and configured
|
||||
./hack/jenkins/installers/check_install_docker.sh
|
||||
|
|
@ -61,7 +61,7 @@ export KICBASE_IMAGE_REGISTRIES="${GCR_IMG} ${DH_IMG}"
|
|||
|
||||
|
||||
# Build a new kicbase image
|
||||
yes | make push-kic-base-image | tee kic-logs.txt
|
||||
CIBUILD=yes make push-kic-base-image | tee kic-logs.txt
|
||||
|
||||
# Abort with error message if above command failed
|
||||
ec=$?
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@ import (
|
|||
|
||||
const (
|
||||
// Version is the current version of kic
|
||||
Version = "v0.0.20-1618262794-11055"
|
||||
Version = "v0.0.20-1619543236-11212"
|
||||
// SHA of the kic base image
|
||||
baseImageSHA = "bd5383644dd35f84afaba199cf16aac1067c462d5e8ef96fa2c1183b3dee856c"
|
||||
baseImageSHA = "b7c6676a7c18654deb3258da55a95dec53983871e371186f217055256cda5b24"
|
||||
// The name of the GCR kicbase repository
|
||||
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
|
||||
// The name of the Dockerhub kicbase repository
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ minikube start [flags]
|
|||
--apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine
|
||||
--apiserver-port int The apiserver listening port (default 8443)
|
||||
--auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true)
|
||||
--base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.20-1618262794-11055@sha256:bd5383644dd35f84afaba199cf16aac1067c462d5e8ef96fa2c1183b3dee856c")
|
||||
--base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.20-1619543236-11212@sha256:b7c6676a7c18654deb3258da55a95dec53983871e371186f217055256cda5b24")
|
||||
--cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
|
||||
--cni string CNI plug-in to use. Valid options: auto, bridge, calico, cilium, flannel, kindnet, or path to a CNI manifest (default: auto)
|
||||
--container-runtime string The container runtime to be used (docker, cri-o, containerd). (default "docker")
|
||||
|
|
|
|||
|
|
@ -81,6 +81,9 @@ validateLoadImage makes sure that `minikube load image` works as expected
|
|||
#### validateRemoveImage
|
||||
validateRemoveImage makes sures that `minikube rm image` works as expected
|
||||
|
||||
#### validateBuildImage
|
||||
validateBuildImage makes sures that `minikube image build` works as expected
|
||||
|
||||
#### validateDockerEnv
|
||||
check functionality of minikube after evaling docker-env
|
||||
|
||||
|
|
@ -345,4 +348,4 @@ TestKubernetesUpgrade upgrades Kubernetes from oldest to newest
|
|||
## TestMissingContainerUpgrade
|
||||
TestMissingContainerUpgrade tests a Docker upgrade where the underlying container is missing
|
||||
|
||||
TEST COUNT: 110
|
||||
TEST COUNT: 111
|
||||
|
|
|
|||
Loading…
Reference in New Issue