Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
c761f779
Commit
c761f779
authored
Oct 15, 2018
by
Jeff Grafton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Base conformance image on debian-hyperkube-base:0.11.0 and reenable by default
parent
2d46adae
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
release.sh
build/lib/release.sh
+1
-1
Makefile
cluster/images/conformance/Makefile
+1
-5
No files found.
build/lib/release.sh
View file @
c761f779
...
@@ -29,7 +29,7 @@ readonly RELEASE_TARS="${LOCAL_OUTPUT_ROOT}/release-tars"
...
@@ -29,7 +29,7 @@ readonly RELEASE_TARS="${LOCAL_OUTPUT_ROOT}/release-tars"
readonly
RELEASE_IMAGES
=
"
${
LOCAL_OUTPUT_ROOT
}
/release-images"
readonly
RELEASE_IMAGES
=
"
${
LOCAL_OUTPUT_ROOT
}
/release-images"
KUBE_BUILD_HYPERKUBE
=
${
KUBE_BUILD_HYPERKUBE
:-
y
}
KUBE_BUILD_HYPERKUBE
=
${
KUBE_BUILD_HYPERKUBE
:-
y
}
KUBE_BUILD_CONFORMANCE
=
${
KUBE_BUILD_CONFORMANCE
:-
n
}
KUBE_BUILD_CONFORMANCE
=
${
KUBE_BUILD_CONFORMANCE
:-
y
}
# Validate a ci version
# Validate a ci version
#
#
...
...
cluster/images/conformance/Makefile
View file @
c761f779
...
@@ -25,7 +25,7 @@ KUBECTL_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/kubec
...
@@ -25,7 +25,7 @@ KUBECTL_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/kubec
E2E_TEST_BIN
?=
$(
shell
pwd
)
/../../../
$(OUT_DIR)
/dockerized/bin/linux/
$(ARCH)
/e2e.test
E2E_TEST_BIN
?=
$(
shell
pwd
)
/../../../
$(OUT_DIR)
/dockerized/bin/linux/
$(ARCH)
/e2e.test
CLUSTER_DIR
?=
$(
shell
pwd
)
/../../../cluster/
CLUSTER_DIR
?=
$(
shell
pwd
)
/../../../cluster/
BASEIMAGE
=
k8s.gcr.io/debian-hyperkube-base-
$(ARCH)
:0.1
0.2
BASEIMAGE
=
k8s.gcr.io/debian-hyperkube-base-
$(ARCH)
:0.1
1.0
TEMP_DIR
:=
$(
shell
mktemp
-d
-t
conformanceXXXXXX
)
TEMP_DIR
:=
$(
shell
mktemp
-d
-t
conformanceXXXXXX
)
all
:
build
all
:
build
...
@@ -48,10 +48,6 @@ endif
...
@@ -48,10 +48,6 @@ endif
cd
${TEMP_DIR}
&&
sed
-i.back
"s|BASEIMAGE|${BASEIMAGE}|g"
Dockerfile
cd
${TEMP_DIR}
&&
sed
-i.back
"s|BASEIMAGE|${BASEIMAGE}|g"
Dockerfile
ifneq
($(ARCH),amd64)
# Register /usr/bin/qemu-ARCH-static as the handler for non-x86 binaries in the kernel
docker run --rm --privileged multiarch/qemu-user-static
:
register --reset
endif
docker build --pull -t ${REGISTRY}/conformance-${ARCH}
:
${VERSION} ${TEMP_DIR}
docker build --pull -t ${REGISTRY}/conformance-${ARCH}
:
${VERSION} ${TEMP_DIR}
rm
-rf
"
${
TEMP_DIR
}
"
rm
-rf
"
${
TEMP_DIR
}
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment