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
cc4ec80e
Commit
cc4ec80e
authored
Oct 09, 2015
by
Chao Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
in scripts, experimental/v1alpha1->extensions/v1beta1
parent
c9ad3e20
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
21 additions
and
21 deletions
+21
-21
config-test.sh
cluster/gce/config-test.sh
+1
-1
util.sh
cluster/gce/util.sh
+3
-3
util.sh
cluster/vagrant/util.sh
+2
-2
update-generated-conversions.sh
hack/after-build/update-generated-conversions.sh
+1
-1
update-generated-deep-copies.sh
hack/after-build/update-generated-deep-copies.sh
+1
-1
update-swagger-spec.sh
hack/after-build/update-swagger-spec.sh
+1
-1
util.sh
hack/lib/util.sh
+1
-1
test-cmd.sh
hack/test-cmd.sh
+2
-2
test-go.sh
hack/test-go.sh
+3
-3
test-integration.sh
hack/test-integration.sh
+5
-5
update-generated-swagger-docs.sh
hack/update-generated-swagger-docs.sh
+1
-1
No files found.
cluster/gce/config-test.sh
View file @
cc4ec80e
...
...
@@ -64,7 +64,7 @@ TEST_CLUSTER_LOG_LEVEL="${TEST_CLUSTER_LOG_LEVEL:---v=4}"
TEST_CLUSTER_RESYNC_PERIOD
=
"
${
TEST_CLUSTER_RESYNC_PERIOD
:-
--min-resync-period=3m
}
"
KUBELET_TEST_ARGS
=
"--max-pods=100
$TEST_CLUSTER_LOG_LEVEL
"
APISERVER_TEST_ARGS
=
"--runtime-config=ex
perimental/v1alph
a1
${
TEST_CLUSTER_LOG_LEVEL
}
"
APISERVER_TEST_ARGS
=
"--runtime-config=ex
tensions/v1bet
a1
${
TEST_CLUSTER_LOG_LEVEL
}
"
CONTROLLER_MANAGER_TEST_ARGS
=
"
${
TEST_CLUSTER_LOG_LEVEL
}
${
TEST_CLUSTER_RESYNC_PERIOD
}
"
SCHEDULER_TEST_ARGS
=
"
${
TEST_CLUSTER_LOG_LEVEL
}
"
KUBEPROXY_TEST_ARGS
=
"
${
TEST_CLUSTER_LOG_LEVEL
}
"
...
...
cluster/gce/util.sh
View file @
cc4ec80e
...
...
@@ -57,10 +57,10 @@ function join_csv {
function
verify-prereqs
{
if
[[
"
${
ENABLE_EXPERIMENTAL_API
}
"
==
"true"
]]
;
then
if
[[
-z
"
${
RUNTIME_CONFIG
}
"
]]
;
then
RUNTIME_CONFIG
=
"ex
perimental/v1alph
a1=true"
RUNTIME_CONFIG
=
"ex
tensions/v1bet
a1=true"
else
# TODO: add checking if RUNTIME_CONFIG contains "ex
perimental/v1alpha1=false" and appending "experimental/v1alph
a1=true" if not.
if
echo
"
${
RUNTIME_CONFIG
}
"
|
grep
-q
-v
"ex
perimental/v1alph
a1=true"
;
then
# TODO: add checking if RUNTIME_CONFIG contains "ex
tensions/v1beta1=false" and appending "extensions/v1bet
a1=true" if not.
if
echo
"
${
RUNTIME_CONFIG
}
"
|
grep
-q
-v
"ex
tensions/v1bet
a1=true"
;
then
echo
"Experimental API should be turned on, but is not turned on in RUNTIME_CONFIG!"
>
&2
exit
1
fi
...
...
cluster/vagrant/util.sh
View file @
cc4ec80e
...
...
@@ -36,10 +36,10 @@ function detect-minions {
function
verify-prereqs
{
if
[[
"
${
ENABLE_EXPERIMENTAL_API
}
"
==
"true"
]]
;
then
if
[[
-z
"
${
RUNTIME_CONFIG
}
"
]]
;
then
RUNTIME_CONFIG
=
"ex
perimental/v1alph
a1"
RUNTIME_CONFIG
=
"ex
tensions/v1bet
a1"
else
# TODO: add checking if RUNTIME_CONFIG contains "experimental/v1=false" and appending "experimental/v1=true" if not.
if
echo
"
${
RUNTIME_CONFIG
}
"
|
grep
-q
-v
"ex
perimental/v1alph
a1=true"
;
then
if
echo
"
${
RUNTIME_CONFIG
}
"
|
grep
-q
-v
"ex
tensions/v1bet
a1=true"
;
then
echo
"Experimental API should be turned on, but is not turned on in RUNTIME_CONFIG!"
exit
1
fi
...
...
hack/after-build/update-generated-conversions.sh
View file @
cc4ec80e
...
...
@@ -43,7 +43,7 @@ EOF
}
# TODO(lavalamp): get this list by listing the pkg/apis/ directory?
DEFAULT_GROUP_VERSIONS
=
"v1 ex
perimental/v1alph
a1"
DEFAULT_GROUP_VERSIONS
=
"v1 ex
tensions/v1bet
a1"
VERSIONS
=
${
VERSIONS
:-
$DEFAULT_GROUP_VERSIONS
}
for
ver
in
$VERSIONS
;
do
# Ensure that the version being processed is registered by setting
...
...
hack/after-build/update-generated-deep-copies.sh
View file @
cc4ec80e
...
...
@@ -57,6 +57,6 @@ function generate_deep_copies() {
}
# v1 is in the group ""
DEFAULT_VERSIONS
=
"/ v1 experimental/ ex
perimental/v1alph
a1"
DEFAULT_VERSIONS
=
"/ v1 experimental/ ex
tensions/v1bet
a1"
VERSIONS
=
${
VERSIONS
:-
$DEFAULT_VERSIONS
}
generate_deep_copies
"
$VERSIONS
"
hack/after-build/update-swagger-spec.sh
View file @
cc4ec80e
...
...
@@ -50,7 +50,7 @@ kube::etcd::start
# Start kube-apiserver
kube::log::status
"Starting kube-apiserver"
KUBE_API_VERSIONS
=
"v1,ex
perimental/v1alph
a1"
"
${
KUBE_OUTPUT_HOSTBIN
}
/kube-apiserver"
\
KUBE_API_VERSIONS
=
"v1,ex
tensions/v1bet
a1"
"
${
KUBE_OUTPUT_HOSTBIN
}
/kube-apiserver"
\
--address
=
"127.0.0.1"
\
--public-address-override
=
"127.0.0.1"
\
--port
=
"
${
API_PORT
}
"
\
...
...
hack/lib/util.sh
View file @
cc4ec80e
...
...
@@ -242,7 +242,7 @@ kube::util::analytics-link() {
# Takes a group/version and returns the path to its location on disk, sans
# "pkg". E.g.:
# * default behavior: ex
perimental/v1alpha1 -> apis/experimental/v1alph
a1
# * default behavior: ex
tensions/v1beta1 -> apis/extensions/v1bet
a1
# * default behavior for only a group: experimental -> apis/experimental
# * Special handling for empty group: v1 -> api/v1, unversioned -> api/unversioned
# * Very special handling for when both group and version are "": / -> api
...
...
hack/test-cmd.sh
View file @
cc4ec80e
...
...
@@ -127,7 +127,7 @@ kube::util::wait_for_url "http://127.0.0.1:${KUBELET_HEALTHZ_PORT}/healthz" "kub
# Start kube-apiserver
kube::log::status
"Starting kube-apiserver"
KUBE_API_VERSIONS
=
"v1,ex
perimental/v1alph
a1"
"
${
KUBE_OUTPUT_HOSTBIN
}
/kube-apiserver"
\
KUBE_API_VERSIONS
=
"v1,ex
tensions/v1bet
a1"
"
${
KUBE_OUTPUT_HOSTBIN
}
/kube-apiserver"
\
--address
=
"127.0.0.1"
\
--public-address-override
=
"127.0.0.1"
\
--port
=
"
${
API_PORT
}
"
\
...
...
@@ -905,7 +905,7 @@ kube_api_versions=(
v1
)
for
version
in
"
${
kube_api_versions
[@]
}
"
;
do
KUBE_API_VERSIONS
=
"v1,ex
perimental/v1alph
a1"
runTests
"
${
version
}
"
KUBE_API_VERSIONS
=
"v1,ex
tensions/v1bet
a1"
runTests
"
${
version
}
"
done
kube::log::status
"TEST PASSED"
hack/test-go.sh
View file @
cc4ec80e
...
...
@@ -57,8 +57,8 @@ KUBE_GOVERALLS_BIN=${KUBE_GOVERALLS_BIN:-}
# separated by comma, lists are separated by semicolon. e.g.,
# "v1,compute/v1alpha1,experimental/v1alpha2;v1,compute/v2,experimental/v1alpha3"
# TODO: It's going to be:
# KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,ex
perimental/v1alph
a1"}
KUBE_TEST_API_VERSIONS
=
${
KUBE_TEST_API_VERSIONS
:-
"v1,ex
perimental/v1alph
a1"
}
# KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,ex
tensions/v1bet
a1"}
KUBE_TEST_API_VERSIONS
=
${
KUBE_TEST_API_VERSIONS
:-
"v1,ex
tensions/v1bet
a1"
}
# once we have multiple group supports
# Run tests with the standard (registry) and a custom etcd prefix
# (kubernetes.io/registry).
...
...
@@ -315,7 +315,7 @@ for (( i=0, j=0; ; )); do
# KUBE_TEST_API sets the version of each group to be tested. KUBE_API_VERSIONS
# register the groups/versions as supported by k8s. So KUBE_API_VERSIONS
# needs to be the superset of KUBE_TEST_API.
KUBE_TEST_API="${apiVersion}" KUBE_API_VERSIONS="v1,ex
perimental/v1alph
a1" ETCD_PREFIX=${etcdPrefix} runTests "$@"
KUBE_TEST_API="${apiVersion}" KUBE_API_VERSIONS="v1,ex
tensions/v1bet
a1" ETCD_PREFIX=${etcdPrefix} runTests "$@"
i=${i}+1
j=${j}+1
if [[ i -eq ${apiVersionsCount} ]] && [[ j -eq ${etcdPrefixesCount} ]]; then
...
...
hack/test-integration.sh
View file @
cc4ec80e
...
...
@@ -28,8 +28,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
# separated by comma, lists are separated by semicolon. e.g.,
# "v1,compute/v1alpha1,experimental/v1alpha2;v1,compute/v2,experimental/v1alpha3"
# TODO: It's going to be:
# KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,ex
perimental/v1alph
a1"}
KUBE_TEST_API_VERSIONS
=
${
KUBE_TEST_API_VERSIONS
:-
"v1,ex
perimental/v1alph
a1"
}
# KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,ex
tensions/v1bet
a1"}
KUBE_TEST_API_VERSIONS
=
${
KUBE_TEST_API_VERSIONS
:-
"v1,ex
tensions/v1bet
a1"
}
# Give integration tests longer to run
KUBE_TIMEOUT
=
${
KUBE_TIMEOUT
:-
-timeout 240s
}
...
...
@@ -52,18 +52,18 @@ runTests() {
KUBE_RACE
=
""
\
KUBE_TIMEOUT
=
"
${
KUBE_TIMEOUT
}
"
\
KUBE_TEST_API_VERSIONS
=
"
$1
"
\
KUBE_API_VERSIONS
=
"v1,ex
perimental/v1alph
a1"
\
KUBE_API_VERSIONS
=
"v1,ex
tensions/v1bet
a1"
\
"
${
KUBE_ROOT
}
/hack/test-go.sh"
test
/integration
kube::log::status
"Running integration test scenario"
KUBE_API_VERSIONS
=
"v1,ex
perimental/v1alph
a1"
KUBE_TEST_API_VERSIONS
=
"
$1
"
"
${
KUBE_OUTPUT_HOSTBIN
}
/integration"
--v
=
${
LOG_LEVEL
}
\
KUBE_API_VERSIONS
=
"v1,ex
tensions/v1bet
a1"
KUBE_TEST_API_VERSIONS
=
"
$1
"
"
${
KUBE_OUTPUT_HOSTBIN
}
/integration"
--v
=
${
LOG_LEVEL
}
\
--max-concurrency
=
"
${
KUBE_INTEGRATION_TEST_MAX_CONCURRENCY
}
"
cleanup
}
KUBE_API_VERSIONS
=
"v1,ex
perimental/v1alph
a1"
"
${
KUBE_ROOT
}
/hack/build-go.sh"
"
$@
"
cmd/integration
KUBE_API_VERSIONS
=
"v1,ex
tensions/v1bet
a1"
"
${
KUBE_ROOT
}
/hack/build-go.sh"
"
$@
"
cmd/integration
# Run cleanup to stop etcd on interrupt or other kill signal.
trap
cleanup EXIT
...
...
hack/update-generated-swagger-docs.sh
View file @
cc4ec80e
...
...
@@ -56,7 +56,7 @@ EOF
mv
"
$TMPFILE
"
"pkg/
$(
kube::util::group-version-to-pkg-path
"
${
group_version
}
"
)
/types_swagger_doc_generated.go"
}
GROUP_VERSIONS
=(
unversioned v1 ex
perimental/v1alph
a1
)
GROUP_VERSIONS
=(
unversioned v1 ex
tensions/v1bet
a1
)
# To avoid compile errors, remove the currently existing files.
for
group_version
in
"
${
GROUP_VERSIONS
[@]
}
"
;
do
rm
-f
"pkg/
$(
kube::util::group-version-to-pkg-path
"
${
group_version
}
"
)
/types_swagger_doc_generated.go"
...
...
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