github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Graduate DaemonSet to v1beta1 API, enable it by default.

pull/6/head
Madhusudan.C.S 2016-02-12 01:04:24 -08:00
parent a8744279eb
commit ab1e9c200f
6 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/aws/config-test.sh
View File

@ -82,9 +82,6 @@ MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}"
MASTER_RESERVED_IP="${MASTER_RESERVED_IP:-}" MASTER_RESERVED_IP="${MASTER_RESERVED_IP:-}"
RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}" 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: # Optional: Cluster monitoring to setup as part of the cluster bring up:
# none - No cluster monitoring setup # none - No cluster monitoring setup
# influxdb - Heapster, InfluxDB, and Grafana # influxdb - Heapster, InfluxDB, and Grafana

14
cluster/common.sh
View File

@ -420,17 +420,11 @@ function yaml-quote {
echo "'$(echo "${@}" | sed -e "s/'/''/g")'" 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() { function build-runtime-config() {
if [[ "${ENABLE_DAEMONSETS}" == "true" ]]; then # There is nothing to do here for now. Just using this function as a placeholder.
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
} }
function write-master-env { function write-master-env {

1
cluster/gce/config-test.sh
View File

@ -51,7 +51,6 @@ RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100} TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100}
# Optional: enable v1beta1 related features # Optional: enable v1beta1 related features
ENABLE_DAEMONSETS="${KUBE_ENABLE_DAEMONSETS:-true}"
ENABLE_REPLICASETS="${KUBE_ENABLE_REPLICASETS:-true}" ENABLE_REPLICASETS="${KUBE_ENABLE_REPLICASETS:-true}"
# Increase the sleep interval value if concerned about API rate limits. 3, in seconds, is the default. # Increase the sleep interval value if concerned about API rate limits. 3, in seconds, is the default.

3
cluster/kubemark/config-default.sh
View File

@ -41,9 +41,6 @@ CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.244.0.0/16}"
RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}" RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100} 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_LOG_LEVEL="${TEST_CLUSTER_LOG_LEVEL:---v=2}"
TEST_CLUSTER_RESYNC_PERIOD="${TEST_CLUSTER_RESYNC_PERIOD:---min-resync-period=12h}" TEST_CLUSTER_RESYNC_PERIOD="${TEST_CLUSTER_RESYNC_PERIOD:---min-resync-period=12h}"

2
docs/api.md
View File

@ -113,7 +113,7 @@ create their own API groups](design/extending-api.md), and to avoid naming colli
## Enabling resources in the extensions group ## Enabling resources in the extensions group
HorizontalPodAutoscalers, Jobs, Ingress, Deployments and ReplicaSets are enabled by default. DaemonSets, Deployments, HorizontalPodAutoscalers, Ingress, Jobs and ReplicaSets are enabled by default.
Other extensions resources can be enabled by setting runtime-config on 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 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` `--runtime-config=extensions/v1beta1/deployments=false,extensions/v1beta1/jobs=false`

2
pkg/master/master.go
View File

@ -570,7 +570,7 @@ func (m *Master) thirdpartyapi(group, kind, version string) *apiserver.APIGroupV
// getExperimentalResources returns the resources for extensions api // getExperimentalResources returns the resources for extensions api
func (m *Master) getExtensionResources(c *Config) map[string]rest.Storage { func (m *Master) getExtensionResources(c *Config) map[string]rest.Storage {
// All resources except these are disabled by default. // All resources except these are disabled by default.
enabledResources := sets.NewString("horizontalpodautoscalers", "ingresses", "jobs", "replicasets", "deployments") enabledResources := sets.NewString("daemonsets", "deployments", "horizontalpodautoscalers", "ingresses", "jobs", "replicasets")
resourceOverrides := m.ApiGroupVersionOverrides["extensions/v1beta1"].ResourceOverrides resourceOverrides := m.ApiGroupVersionOverrides["extensions/v1beta1"].ResourceOverrides
isEnabled := func(resource string) bool { isEnabled := func(resource string) bool {
// Check if the resource has been overriden. // Check if the resource has been overriden.