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
ab1e9c20
Commit
ab1e9c20
authored
Feb 12, 2016
by
Madhusudan.C.S
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Graduate DaemonSet to v1beta1 API, enable it by default.
parent
a8744279
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
19 deletions
+6
-19
config-test.sh
cluster/aws/config-test.sh
+0
-3
common.sh
cluster/common.sh
+4
-10
config-test.sh
cluster/gce/config-test.sh
+0
-1
config-default.sh
cluster/kubemark/config-default.sh
+0
-3
api.md
docs/api.md
+1
-1
master.go
pkg/master/master.go
+1
-1
No files found.
cluster/aws/config-test.sh
View file @
ab1e9c20
...
...
@@ -82,9 +82,6 @@ MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}"
MASTER_RESERVED_IP
=
"
${
MASTER_RESERVED_IP
:-}
"
RUNTIME_CONFIG
=
"
${
KUBE_RUNTIME_CONFIG
:-}
"
# Enable various v1beta1 features
ENABLE_DAEMONSETS
=
"
${
KUBE_ENABLE_DAEMONSETS
:-
true
}
"
# Optional: Cluster monitoring to setup as part of the cluster bring up:
# none - No cluster monitoring setup
# influxdb - Heapster, InfluxDB, and Grafana
...
...
cluster/common.sh
View file @
ab1e9c20
...
...
@@ -420,17 +420,11 @@ function yaml-quote {
echo
"'
$(
echo
"
${
@
}
"
|
sed
-e
"s/'/''/g"
)
'"
}
# Builds the RUNTIME_CONFIG var from other feature enable options
# Builds the RUNTIME_CONFIG var from other feature enable options (such as
# features in alpha)
function
build-runtime-config
()
{
if
[[
"
${
ENABLE_DAEMONSETS
}
"
==
"true"
]]
;
then
if
[[
-z
"
${
RUNTIME_CONFIG
}
"
]]
;
then
RUNTIME_CONFIG
=
"extensions/v1beta1/daemonsets=true"
else
if
echo
"
${
RUNTIME_CONFIG
}
"
|
grep
-q
-v
"extensions/v1beta1/daemonsets=true"
;
then
RUNTIME_CONFIG
=
"
${
RUNTIME_CONFIG
}
,extensions/v1beta1/daemonsets=true"
fi
fi
fi
# There is nothing to do here for now. Just using this function as a placeholder.
:
}
function
write-master-env
{
...
...
cluster/gce/config-test.sh
View file @
ab1e9c20
...
...
@@ -51,7 +51,6 @@ RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
TERMINATED_POD_GC_THRESHOLD
=
${
TERMINATED_POD_GC_THRESHOLD
:-
100
}
# Optional: enable v1beta1 related features
ENABLE_DAEMONSETS
=
"
${
KUBE_ENABLE_DAEMONSETS
:-
true
}
"
ENABLE_REPLICASETS
=
"
${
KUBE_ENABLE_REPLICASETS
:-
true
}
"
# Increase the sleep interval value if concerned about API rate limits. 3, in seconds, is the default.
...
...
cluster/kubemark/config-default.sh
View file @
ab1e9c20
...
...
@@ -41,9 +41,6 @@ CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.244.0.0/16}"
RUNTIME_CONFIG
=
"
${
KUBE_RUNTIME_CONFIG
:-}
"
TERMINATED_POD_GC_THRESHOLD
=
${
TERMINATED_POD_GC_THRESHOLD
:-
100
}
# Optional: enable v1beta1 related features
ENABLE_DAEMONSETS
=
"
${
KUBE_ENABLE_DAEMONSETS
:-
true
}
"
TEST_CLUSTER_LOG_LEVEL
=
"
${
TEST_CLUSTER_LOG_LEVEL
:-
--v=2
}
"
TEST_CLUSTER_RESYNC_PERIOD
=
"
${
TEST_CLUSTER_RESYNC_PERIOD
:-
--min-resync-period=12h
}
"
...
...
docs/api.md
View file @
ab1e9c20
...
...
@@ -113,7 +113,7 @@ create their own API groups](design/extending-api.md), and to avoid naming colli
## Enabling resources in the extensions group
HorizontalPodAutoscalers, Jobs, Ingress, Deployment
s and ReplicaSets are enabled by default.
DaemonSets, Deployments, HorizontalPodAutoscalers, Ingress, Job
s and ReplicaSets are enabled by default.
Other extensions resources can be enabled by setting runtime-config on
apiserver. runtime-config accepts comma separated values. For ex: to disable deployments and jobs, set
`--runtime-config=extensions/v1beta1/deployments=false,extensions/v1beta1/jobs=false`
...
...
pkg/master/master.go
View file @
ab1e9c20
...
...
@@ -570,7 +570,7 @@ func (m *Master) thirdpartyapi(group, kind, version string) *apiserver.APIGroupV
// getExperimentalResources returns the resources for extensions api
func
(
m
*
Master
)
getExtensionResources
(
c
*
Config
)
map
[
string
]
rest
.
Storage
{
// All resources except these are disabled by default.
enabledResources
:=
sets
.
NewString
(
"
horizontalpodautoscalers"
,
"ingresses"
,
"jobs"
,
"replicasets"
,
"deploymen
ts"
)
enabledResources
:=
sets
.
NewString
(
"
daemonsets"
,
"deployments"
,
"horizontalpodautoscalers"
,
"ingresses"
,
"jobs"
,
"replicase
ts"
)
resourceOverrides
:=
m
.
ApiGroupVersionOverrides
[
"extensions/v1beta1"
]
.
ResourceOverrides
isEnabled
:=
func
(
resource
string
)
bool
{
// Check if the resource has been overriden.
...
...
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