diff --git a/.generated_docs b/.generated_docs index 96dd0f02f8514..d9a1fa33bbd2a 100644 --- a/.generated_docs +++ b/.generated_docs @@ -4,6 +4,7 @@ docs/man/man1/kubectl-annotate.1 docs/man/man1/kubectl-api-versions.1 docs/man/man1/kubectl-apply.1 docs/man/man1/kubectl-attach.1 +docs/man/man1/kubectl-autoscale.1 docs/man/man1/kubectl-cluster-info.1 docs/man/man1/kubectl-config-set-cluster.1 docs/man/man1/kubectl-config-set-context.1 @@ -40,6 +41,7 @@ docs/user-guide/kubectl/kubectl_annotate.md docs/user-guide/kubectl/kubectl_api-versions.md docs/user-guide/kubectl/kubectl_apply.md docs/user-guide/kubectl/kubectl_attach.md +docs/user-guide/kubectl/kubectl_autoscale.md docs/user-guide/kubectl/kubectl_cluster-info.md docs/user-guide/kubectl/kubectl_config.md docs/user-guide/kubectl/kubectl_config_set-cluster.md diff --git a/contrib/completions/bash/kubectl b/contrib/completions/bash/kubectl index cdd77d3f467c5..250be199f49ad 100644 --- a/contrib/completions/bash/kubectl +++ b/contrib/completions/bash/kubectl @@ -854,6 +854,43 @@ _kubectl_expose() must_have_one_noun=() } +_kubectl_autoscale() +{ + last_command="kubectl_autoscale" + commands=() + + flags=() + two_word_flags=() + flags_with_completion=() + flags_completion=() + + flags+=("--cpu-percent=") + flags+=("--dry-run") + flags+=("--filename=") + flags_with_completion+=("--filename") + flags_completion+=("__handle_filename_extension_flag json|stdin|yaml|yml") + two_word_flags+=("-f") + flags_with_completion+=("-f") + flags_completion+=("__handle_filename_extension_flag json|stdin|yaml|yml") + flags+=("--generator=") + flags+=("--max=") + flags+=("--min=") + flags+=("--name=") + flags+=("--no-headers") + flags+=("--output=") + two_word_flags+=("-o") + flags+=("--output-version=") + flags+=("--show-all") + flags+=("-a") + flags+=("--sort-by=") + flags+=("--template=") + two_word_flags+=("-t") + + must_have_one_flag=() + must_have_one_flag+=("--max=") + must_have_one_noun=() +} + _kubectl_label() { last_command="kubectl_label" @@ -1211,6 +1248,7 @@ _kubectl() commands+=("run") commands+=("stop") commands+=("expose") + commands+=("autoscale") commands+=("label") commands+=("annotate") commands+=("config") diff --git a/docs/man/man1/kubectl-autoscale.1 b/docs/man/man1/kubectl-autoscale.1 new file mode 100644 index 0000000000000..0659a8e26e274 --- /dev/null +++ b/docs/man/man1/kubectl-autoscale.1 @@ -0,0 +1,196 @@ +.TH "KUBERNETES" "1" " kubernetes User Manuals" "Eric Paris" "Jan 2015" "" + + +.SH NAME +.PP +kubectl autoscale \- Auto\-scale a replication controller + + +.SH SYNOPSIS +.PP +\fBkubectl autoscale\fP [OPTIONS] + + +.SH DESCRIPTION +.PP +Creates an autoscaler that automatically chooses and sets the number of pods that run in a kubernetes cluster. + +.PP +Looks up a replication controller by name and creates an autoscaler that uses this replication controller as a reference. +An autoscaler can automatically increase or decrease number of pods deployed within the system as needed. + + +.SH OPTIONS +.PP +\fB\-\-cpu\-percent\fP=\-1 + The target average CPU utilization (represented as a percent of requested CPU) over all the pods. If it's not specified or negative, the server will apply a default value. + +.PP +\fB\-\-dry\-run\fP=false + If true, only print the object that would be sent, without creating it. + +.PP +\fB\-f\fP, \fB\-\-filename\fP=[] + Filename, directory, or URL to a file identifying the resource to get from a server. + +.PP +\fB\-\-generator\fP="horizontalpodautoscaler/v1beta1" + The name of the API generator to use. Currently there is only 1 generator. + +.PP +\fB\-\-max\fP=\-1 + The upper limit for the number of pods that can be set by the autoscaler. Required. + +.PP +\fB\-\-min\fP=\-1 + The lower limit for the number of pods that can be set by the autoscaler. If it's not specified or negative, the server will apply a default value. + +.PP +\fB\-\-name\fP="" + The name for the newly created object. If not specified, the name of the input resource will be used. + +.PP +\fB\-\-no\-headers\fP=false + When using the default output, don't print headers. + +.PP +\fB\-o\fP, \fB\-\-output\fP="" + Output format. One of: json|yaml|wide|name|go\-template=...|go\-template\-file=...|jsonpath=...|jsonpath\-file=... See golang template [ +\[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]] and jsonpath template [ +\[la]http://releases.k8s.io/HEAD/docs/user-guide/jsonpath.md\[ra]]. + +.PP +\fB\-\-output\-version\fP="" + Output the formatted object with the given version (default api\-version). + +.PP +\fB\-a\fP, \fB\-\-show\-all\fP=false + When printing, show all resources (default hide terminated pods.) + +.PP +\fB\-\-sort\-by\fP="" + If non\-empty, sort list types using this field specification. The field specification is expressed as a JSONPath expression (e.g. 'ObjectMeta.Name'). The field in the API resource specified by this JSONPath expression must be an integer or a string. + +.PP +\fB\-t\fP, \fB\-\-template\fP="" + Template string or path to template file to use when \-o=go\-template, \-o=go\-template\-file. The template format is golang templates [ +\[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]]. + + +.SH OPTIONS INHERITED FROM PARENT COMMANDS +.PP +\fB\-\-alsologtostderr\fP=false + log to standard error as well as files + +.PP +\fB\-\-api\-version\fP="" + The API version to use when talking to the server + +.PP +\fB\-\-certificate\-authority\fP="" + Path to a cert. file for the certificate authority. + +.PP +\fB\-\-client\-certificate\fP="" + Path to a client key file for TLS. + +.PP +\fB\-\-client\-key\fP="" + Path to a client key file for TLS. + +.PP +\fB\-\-cluster\fP="" + The name of the kubeconfig cluster to use + +.PP +\fB\-\-context\fP="" + The name of the kubeconfig context to use + +.PP +\fB\-\-insecure\-skip\-tls\-verify\fP=false + If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure. + +.PP +\fB\-\-kubeconfig\fP="" + Path to the kubeconfig file to use for CLI requests. + +.PP +\fB\-\-log\-backtrace\-at\fP=:0 + when logging hits line file:N, emit a stack trace + +.PP +\fB\-\-log\-dir\fP="" + If non\-empty, write log files in this directory + +.PP +\fB\-\-log\-flush\-frequency\fP=5s + Maximum number of seconds between log flushes + +.PP +\fB\-\-logtostderr\fP=true + log to standard error instead of files + +.PP +\fB\-\-match\-server\-version\fP=false + Require server version to match client version + +.PP +\fB\-\-namespace\fP="" + If present, the namespace scope for this CLI request. + +.PP +\fB\-\-password\fP="" + Password for basic authentication to the API server. + +.PP +\fB\-s\fP, \fB\-\-server\fP="" + The address and port of the Kubernetes API server + +.PP +\fB\-\-stderrthreshold\fP=2 + logs at or above this threshold go to stderr + +.PP +\fB\-\-token\fP="" + Bearer token for authentication to the API server. + +.PP +\fB\-\-user\fP="" + The name of the kubeconfig user to use + +.PP +\fB\-\-username\fP="" + Username for basic authentication to the API server. + +.PP +\fB\-\-v\fP=0 + log level for V logs + +.PP +\fB\-\-vmodule\fP= + comma\-separated list of pattern=N settings for file\-filtered logging + + +.SH EXAMPLE +.PP +.RS + +.nf +# Auto scale a replication controller "foo", with the number of pods between 2 to 10, target CPU utilization at a default value that server applies: +$ kubectl autoscale rc foo \-\-min=2 \-\-max=10 + +# Auto scale a replication controller "foo", with the number of pods between 1 to 5, target CPU utilization at 80%: +$ kubectl autoscale rc foo \-\-max=5 \-\-cpu\-percent=80 + +.fi +.RE + + +.SH SEE ALSO +.PP +\fBkubectl(1)\fP, + + +.SH HISTORY +.PP +January 2015, Originally compiled by Eric Paris (eparis at redhat dot com) based on the kubernetes source material, but hopefully they have been automatically generated since! diff --git a/docs/man/man1/kubectl.1 b/docs/man/man1/kubectl.1 index d4acb7899cb89..aad764d7f1152 100644 --- a/docs/man/man1/kubectl.1 +++ b/docs/man/man1/kubectl.1 @@ -116,7 +116,7 @@ Find more information at .SH SEE ALSO .PP -\fBkubectl\-get(1)\fP, \fBkubectl\-describe(1)\fP, \fBkubectl\-create(1)\fP, \fBkubectl\-replace(1)\fP, \fBkubectl\-patch(1)\fP, \fBkubectl\-delete(1)\fP, \fBkubectl\-edit(1)\fP, \fBkubectl\-apply(1)\fP, \fBkubectl\-namespace(1)\fP, \fBkubectl\-logs(1)\fP, \fBkubectl\-rolling\-update(1)\fP, \fBkubectl\-scale(1)\fP, \fBkubectl\-attach(1)\fP, \fBkubectl\-exec(1)\fP, \fBkubectl\-port\-forward(1)\fP, \fBkubectl\-proxy(1)\fP, \fBkubectl\-run(1)\fP, \fBkubectl\-stop(1)\fP, \fBkubectl\-expose(1)\fP, \fBkubectl\-label(1)\fP, \fBkubectl\-annotate(1)\fP, \fBkubectl\-config(1)\fP, \fBkubectl\-cluster\-info(1)\fP, \fBkubectl\-api\-versions(1)\fP, \fBkubectl\-version(1)\fP, \fBkubectl\-explain(1)\fP, \fBkubectl\-convert(1)\fP, +\fBkubectl\-get(1)\fP, \fBkubectl\-describe(1)\fP, \fBkubectl\-create(1)\fP, \fBkubectl\-replace(1)\fP, \fBkubectl\-patch(1)\fP, \fBkubectl\-delete(1)\fP, \fBkubectl\-edit(1)\fP, \fBkubectl\-apply(1)\fP, \fBkubectl\-namespace(1)\fP, \fBkubectl\-logs(1)\fP, \fBkubectl\-rolling\-update(1)\fP, \fBkubectl\-scale(1)\fP, \fBkubectl\-attach(1)\fP, \fBkubectl\-exec(1)\fP, \fBkubectl\-port\-forward(1)\fP, \fBkubectl\-proxy(1)\fP, \fBkubectl\-run(1)\fP, \fBkubectl\-stop(1)\fP, \fBkubectl\-expose(1)\fP, \fBkubectl\-autoscale(1)\fP, \fBkubectl\-label(1)\fP, \fBkubectl\-annotate(1)\fP, \fBkubectl\-config(1)\fP, \fBkubectl\-cluster\-info(1)\fP, \fBkubectl\-api\-versions(1)\fP, \fBkubectl\-version(1)\fP, \fBkubectl\-explain(1)\fP, \fBkubectl\-convert(1)\fP, .SH HISTORY diff --git a/docs/user-guide/kubectl/kubectl.md b/docs/user-guide/kubectl/kubectl.md index 78074d249e683..119c7950bbace 100644 --- a/docs/user-guide/kubectl/kubectl.md +++ b/docs/user-guide/kubectl/kubectl.md @@ -80,6 +80,7 @@ kubectl * [kubectl api-versions](kubectl_api-versions.md) - Print available API versions. * [kubectl apply](kubectl_apply.md) - Apply a configuration to a resource by filename or stdin * [kubectl attach](kubectl_attach.md) - Attach to a running container. +* [kubectl autoscale](kubectl_autoscale.md) - Auto-scale a replication controller * [kubectl cluster-info](kubectl_cluster-info.md) - Display cluster info * [kubectl config](kubectl_config.md) - config modifies kubeconfig files * [kubectl convert](kubectl_convert.md) - Convert config files between different API versions @@ -104,7 +105,7 @@ kubectl * [kubectl stop](kubectl_stop.md) - Deprecated: Gracefully shut down a resource by name or filename. * [kubectl version](kubectl_version.md) - Print the client and server version information. -###### Auto generated by spf13/cobra on 9-Oct-2015 +###### Auto generated by spf13/cobra on 16-Oct-2015 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_autoscale.md b/docs/user-guide/kubectl/kubectl_autoscale.md new file mode 100644 index 0000000000000..a535f2a6847f0 --- /dev/null +++ b/docs/user-guide/kubectl/kubectl_autoscale.md @@ -0,0 +1,114 @@ + + + + +WARNING +WARNING +WARNING +WARNING +WARNING + +

PLEASE NOTE: This document applies to the HEAD of the source tree

+ +If you are using a released version of Kubernetes, you should +refer to the docs that go with that version. + + +The latest 1.0.x release of this document can be found +[here](http://releases.k8s.io/release-1.0/docs/user-guide/kubectl/kubectl_autoscale.md). + +Documentation for other releases can be found at +[releases.k8s.io](http://releases.k8s.io). + +-- + + + + + +## kubectl autoscale + +Auto-scale a replication controller + +### Synopsis + + +Creates an autoscaler that automatically chooses and sets the number of pods that run in a kubernetes cluster. + +Looks up a replication controller by name and creates an autoscaler that uses this replication controller as a reference. +An autoscaler can automatically increase or decrease number of pods deployed within the system as needed. + +``` +kubectl autoscale (-f FILENAME | TYPE NAME | TYPE/NAME) [--min=MINPODS] --max=MAXPODS [--cpu-percent=CPU] [flags] +``` + +### Examples + +``` +# Auto scale a replication controller "foo", with the number of pods between 2 to 10, target CPU utilization at a default value that server applies: +$ kubectl autoscale rc foo --min=2 --max=10 + +# Auto scale a replication controller "foo", with the number of pods between 1 to 5, target CPU utilization at 80%: +$ kubectl autoscale rc foo --max=5 --cpu-percent=80 +``` + +### Options + +``` + --cpu-percent=-1: The target average CPU utilization (represented as a percent of requested CPU) over all the pods. If it's not specified or negative, the server will apply a default value. + --dry-run[=false]: If true, only print the object that would be sent, without creating it. + -f, --filename=[]: Filename, directory, or URL to a file identifying the resource to get from a server. + --generator="horizontalpodautoscaler/v1beta1": The name of the API generator to use. Currently there is only 1 generator. + --max=-1: The upper limit for the number of pods that can be set by the autoscaler. Required. + --min=-1: The lower limit for the number of pods that can be set by the autoscaler. If it's not specified or negative, the server will apply a default value. + --name="": The name for the newly created object. If not specified, the name of the input resource will be used. + --no-headers[=false]: When using the default output, don't print headers. + -o, --output="": Output format. One of: json|yaml|wide|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://releases.k8s.io/HEAD/docs/user-guide/jsonpath.md]. + --output-version="": Output the formatted object with the given version (default api-version). + -a, --show-all[=false]: When printing, show all resources (default hide terminated pods.) + --sort-by="": If non-empty, sort list types using this field specification. The field specification is expressed as a JSONPath expression (e.g. 'ObjectMeta.Name'). The field in the API resource specified by this JSONPath expression must be an integer or a string. + --template="": Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +``` + +### Options inherited from parent commands + +``` + --alsologtostderr[=false]: log to standard error as well as files + --api-version="": The API version to use when talking to the server + --certificate-authority="": Path to a cert. file for the certificate authority. + --client-certificate="": Path to a client key file for TLS. + --client-key="": Path to a client key file for TLS. + --cluster="": The name of the kubeconfig cluster to use + --context="": The name of the kubeconfig context to use + --insecure-skip-tls-verify[=false]: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure. + --kubeconfig="": Path to the kubeconfig file to use for CLI requests. + --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace + --log-dir="": If non-empty, write log files in this directory + --log-flush-frequency=5s: Maximum number of seconds between log flushes + --logtostderr[=true]: log to standard error instead of files + --match-server-version[=false]: Require server version to match client version + --namespace="": If present, the namespace scope for this CLI request. + --password="": Password for basic authentication to the API server. + -s, --server="": The address and port of the Kubernetes API server + --stderrthreshold=2: logs at or above this threshold go to stderr + --token="": Bearer token for authentication to the API server. + --user="": The name of the kubeconfig user to use + --username="": Username for basic authentication to the API server. + --v=0: log level for V logs + --vmodule=: comma-separated list of pattern=N settings for file-filtered logging +``` + +### SEE ALSO + +* [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager + +###### Auto generated by spf13/cobra on 16-Oct-2015 + + +[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_autoscale.md?pixel)]() + diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh index 54108b3cf77be..3bf433a86626d 100755 --- a/hack/test-cmd.sh +++ b/hack/test-cmd.sh @@ -214,6 +214,9 @@ runTests() { port_field="(index .spec.ports 0).port" port_name="(index .spec.ports 0).name" image_field="(index .spec.containers 0).image" + hpa_min_field=".spec.minReplicas" + hpa_max_field=".spec.maxReplicas" + hpa_cpu_field=".spec.cpuUtilization.targetPercentage" # Passing no arguments to create is an error ! kubectl create @@ -803,6 +806,25 @@ __EOF__ # Post-condition: no replication controller is running kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" '' + ### Auto scale replication controller + # Pre-condition: no replication controller is running + kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" '' + # Command + kubectl create -f examples/guestbook/frontend-controller.yaml "${kube_flags[@]}" + kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" 'frontend:' + # autoscale 1~2 pods, CPU utilization 70%, rc specified by file + kubectl autoscale -f examples/guestbook/frontend-controller.yaml "${kube_flags[@]}" --max=2 --cpu-percent=70 + kube::test::get_object_assert 'hpa frontend' "{{$hpa_min_field}} {{$hpa_max_field}} {{$hpa_cpu_field}}" '1 2 70' + kubectl delete hpa frontend "${kube_flags[@]}" + # autoscale 2~3 pods, default CPU utilization (80%), rc specified by name + kubectl autoscale rc frontend "${kube_flags[@]}" --min=2 --max=3 + kube::test::get_object_assert 'hpa frontend' "{{$hpa_min_field}} {{$hpa_max_field}} {{$hpa_cpu_field}}" '2 3 80' + kubectl delete hpa frontend "${kube_flags[@]}" + # autoscale without specifying --max should fail + ! kubectl autoscale rc frontend "${kube_flags[@]}" + # Clean up + kubectl delete rc frontend "${kube_flags[@]}" + ###################### # Multiple Resources # ###################### diff --git a/hack/verify-flags/exceptions.txt b/hack/verify-flags/exceptions.txt index e07710723ffc7..0c32ccb30a7c8 100644 --- a/hack/verify-flags/exceptions.txt +++ b/hack/verify-flags/exceptions.txt @@ -1,90 +1,10 @@ +_output/release-stage/full/kubernetes/cluster/addons/registry/images/Dockerfile:ADD run_proxy.sh /usr/bin/run_proxy +_output/release-stage/full/kubernetes/docs/admin/salt.md:`api_servers` | (Optional) The IP address / host name where a kubelet can get read-only access to kube-apiserver +_output/release-stage/full/kubernetes/docs/admin/salt.md:`etcd_servers` | (Optional) Comma-delimited list of IP addresses the kube-apiserver and kubelet use to reach etcd. Uses the IP of the first machine in the kubernetes_master role, or 127.0.0.1 on GCE. +_output/release-stage/full/kubernetes/docs/admin/salt.md:`hostname_override` | (Optional) Mapped to the kubelet hostname-override +_output/release-stage/full/kubernetes/docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js:var cloud_config = require('../cloud_config.js'); cluster/addons/registry/images/Dockerfile:ADD run_proxy.sh /usr/bin/run_proxy -cluster/addons/registry/images/Dockerfile:CMD ["/usr/bin/run_proxy"] -cluster/aws/templates/salt-minion.sh:# We set the hostname_override to the full EC2 private dns name -cluster/gce/coreos/helper.sh:# cloud_config yaml file should be passed -cluster/juju/charms/trusty/kubernetes-master/files/controller-manager.upstart.tmpl: --address=%(bind_address)s \ -cluster/juju/charms/trusty/kubernetes-master/files/scheduler.upstart.tmpl: --address=%(bind_address)s \ -cluster/juju/charms/trusty/kubernetes-master/hooks/config-changed: for k in ('etcd_servers',): -cluster/juju/charms/trusty/kubernetes-master/hooks/etcd-relation-changed: for k in ('etcd_servers',): -cluster/juju/charms/trusty/kubernetes-master/hooks/hooks.py: for k in ('etcd_servers',): -cluster/juju/charms/trusty/kubernetes-master/hooks/minions-api-relation-changed: for k in ('etcd_servers',): -cluster/juju/charms/trusty/kubernetes-master/hooks/network-relation-changed: for k in ('etcd_servers',): -cluster/juju/charms/trusty/kubernetes/hooks/api-relation-changed: 'http://%s:%s' % (s[0], s[1]) for s in sorted(etcd_servers)]) -cluster/juju/charms/trusty/kubernetes/hooks/api-relation-changed: api_info = api_servers.pop() -cluster/juju/charms/trusty/kubernetes/hooks/api-relation-changed: api_servers = 'http://%s:%s' % (api_info[0], api_info[1]) -cluster/juju/charms/trusty/kubernetes/hooks/api-relation-changed: api_servers = get_rel_hosts('api', rels, ('hostname', 'port')) -cluster/juju/charms/trusty/kubernetes/hooks/api-relation-changed: etcd_servers = get_rel_hosts('etcd', rels, ('hostname', 'port')) -cluster/juju/charms/trusty/kubernetes/hooks/api-relation-changed: for k in ('etcd_servers', 'kubeapi_server'): -cluster/juju/charms/trusty/kubernetes/hooks/etcd-relation-changed: 'http://%s:%s' % (s[0], s[1]) for s in sorted(etcd_servers)]) -cluster/juju/charms/trusty/kubernetes/hooks/etcd-relation-changed: api_info = api_servers.pop() -cluster/juju/charms/trusty/kubernetes/hooks/etcd-relation-changed: api_servers = 'http://%s:%s' % (api_info[0], api_info[1]) -cluster/juju/charms/trusty/kubernetes/hooks/etcd-relation-changed: api_servers = get_rel_hosts('api', rels, ('hostname', 'port')) -cluster/juju/charms/trusty/kubernetes/hooks/etcd-relation-changed: etcd_servers = get_rel_hosts('etcd', rels, ('hostname', 'port')) -cluster/juju/charms/trusty/kubernetes/hooks/etcd-relation-changed: for k in ('etcd_servers', 'kubeapi_server'): -cluster/juju/charms/trusty/kubernetes/hooks/hooks.py: 'http://%s:%s' % (s[0], s[1]) for s in sorted(etcd_servers)]) -cluster/juju/charms/trusty/kubernetes/hooks/hooks.py: api_info = api_servers.pop() -cluster/juju/charms/trusty/kubernetes/hooks/hooks.py: api_servers = 'http://%s:%s' % (api_info[0], api_info[1]) -cluster/juju/charms/trusty/kubernetes/hooks/hooks.py: api_servers = get_rel_hosts('api', rels, ('hostname', 'port')) -cluster/juju/charms/trusty/kubernetes/hooks/hooks.py: etcd_servers = get_rel_hosts('etcd', rels, ('hostname', 'port')) -cluster/juju/charms/trusty/kubernetes/hooks/hooks.py: for k in ('etcd_servers', 'kubeapi_server'): -cluster/juju/charms/trusty/kubernetes/hooks/network-relation-changed: 'http://%s:%s' % (s[0], s[1]) for s in sorted(etcd_servers)]) -cluster/juju/charms/trusty/kubernetes/hooks/network-relation-changed: api_info = api_servers.pop() -cluster/juju/charms/trusty/kubernetes/hooks/network-relation-changed: api_servers = 'http://%s:%s' % (api_info[0], api_info[1]) -cluster/juju/charms/trusty/kubernetes/hooks/network-relation-changed: api_servers = get_rel_hosts('api', rels, ('hostname', 'port')) -cluster/juju/charms/trusty/kubernetes/hooks/network-relation-changed: etcd_servers = get_rel_hosts('etcd', rels, ('hostname', 'port')) -cluster/juju/charms/trusty/kubernetes/hooks/network-relation-changed: for k in ('etcd_servers', 'kubeapi_server'): -cluster/mesos/docker/common/bin/util-ssl.sh: local cluster_domain="cluster.local" -cluster/saltbase/salt/kube-addons/kube-addons.sh:# Create admission_control objects if defined before any other addon services. If the limits -cluster/saltbase/salt/kube-admission-controls/init.sls:{% if 'LimitRanger' in pillar.get('admission_control', '') %} -cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest:{% set params = address + " " + etcd_servers + " " + cloud_provider + " " + cloud_config + " " + runtime_config + " " + admission_control + " " + service_cluster_ip_range + " " + client_ca_file + " " + basic_auth_file + " " + min_request_timeout -%} -cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest:{% set params = params + " " + cluster_name + " " + cert_file + " " + key_file + " --secure-port=" + secure_port + " " + token_auth_file + " " + bind_address + " " + pillar['log_level'] + " " + advertise_address + " " + proxy_ssh_options -%} -cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest:{%set params = "--master=127.0.0.1:8080" + " " + cluster_name + " " + cluster_cidr + " " + allocate_node_cidrs + " " + enable_horizontal_pod_autoscaler + " " + enable_deployments + " " + cloud_provider + " " + cloud_config + service_account_key + pillar['log_level'] + " " + root_ca_file -%} -cluster/saltbase/salt/kube-proxy/default: {% set api_servers_with_port = api_servers -%} -cluster/saltbase/salt/kube-proxy/default: {% set api_servers_with_port = api_servers + ":6443" -%} -cluster/saltbase/salt/kube-proxy/default: {% set api_servers_with_port = api_servers + ":7080" -%} -cluster/saltbase/salt/kubelet/default: {% set api_servers_with_port = api_servers + ":6443" -%} -cluster/saltbase/salt/kubelet/default: {% set api_servers_with_port = api_servers -%} -cluster/saltbase/salt/opencontrail-networking-master/init.sls: - 'SERVICE_CLUSTER_IP_RANGE': '{{ pillar.get('service_cluster_ip_range') }}' -cluster/saltbase/salt/opencontrail-networking-minion/init.sls: - 'SERVICE_CLUSTER_IP_RANGE': '{{ pillar.get('service_cluster_ip_range') }}' docs/admin/salt.md:`api_servers` | (Optional) The IP address / host name where a kubelet can get read-only access to kube-apiserver docs/admin/salt.md:`etcd_servers` | (Optional) Comma-delimited list of IP addresses the kube-apiserver and kubelet use to reach etcd. Uses the IP of the first machine in the kubernetes_master role, or 127.0.0.1 on GCE. docs/admin/salt.md:`hostname_override` | (Optional) Mapped to the kubelet hostname-override -docs/design/admission_control.md:[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/design/admission_control.md?pixel)]() -docs/design/admission_control.md:[here](http://releases.k8s.io/release-1.0/docs/design/admission_control.md). -docs/devel/README.md:* **Admission Control Plugins** ([admission_control](../design/admission_control.md)) -docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js: host.cloud_config_file = cloud_config; -docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js: host.cloud_config_file = cloud_config[n]; -docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js: if (cloud_config instanceof Array) { -docs/getting-started-guides/coreos/azure/lib/azure_wrapper.js: var cloud_config = cloud_config_creator(x, conf); -docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js: return cloud_config.generate_environment_file_entry_from_object(util.hostname(n, 'kube'), { -docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js: return cloud_config.process_template(input_file, output_file, function(data) { -docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js: return cloud_config.process_template(input_file, output_file, function(data) { -docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js: var write_files_extra = cloud_config.write_files_from('addons', '/etc/kubernetes/addons'); docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js:var cloud_config = require('../cloud_config.js'); -docs/getting-started-guides/logging-elasticsearch.md: "cluster_name" : "kubernetes-logging", -docs/user-guide/accessing-the-cluster.md: "cluster_name" : "kubernetes_logging", -examples/cluster-dns/images/frontend/client.py: service_address = socket.gethostbyname(hostname) -examples/elasticsearch/README.md: "cluster_name" : "myesdb", -examples/elasticsearch/README.md: "cluster_name" : "myesdb", -examples/elasticsearch/production_cluster/README.md: "cluster_name" : "myesdb", -examples/elasticsearch/production_cluster/README.md: "cluster_name" : "myesdb", -hack/lib/logging.sh: local source_file=${BASH_SOURCE[$frame_no]} -hack/lib/logging.sh: local source_file=${BASH_SOURCE[$stack_skip]} -hack/local-up-cluster.sh: runtime_config="--runtime-config=${RUNTIME_CONFIG}" -hack/local-up-cluster.sh: runtime_config="" -pkg/cloudprovider/providers/vagrant/vagrant_test.go: testSaltMinionsResponse = []byte(`{ "return": [{"kubernetes-minion-1": {"kernel": "Linux", "domain": "", "zmqversion": "3.2.4", "kernelrelease": "3.11.10-301.fc20.x86_64", "pythonpath": ["/usr/bin", "/usr/lib64/python27.zip", "/usr/lib64/python2.7", "/usr/lib64/python2.7/plat-linux2", "/usr/lib64/python2.7/lib-tk", "/usr/lib64/python2.7/lib-old", "/usr/lib64/python2.7/lib-dynload", "/usr/lib64/python2.7/site-packages", "/usr/lib/python2.7/site-packages"], "etcd_servers": "10.245.1.2", "ip_interfaces": {"lo": ["127.0.0.1"], "docker0": ["172.17.42.1"], "enp0s8": ["10.245.2.2"], "p2p1": ["10.0.2.15"]}, "shell": "/bin/sh", "mem_total": 491, "saltversioninfo": [2014, 1, 7], "osmajorrelease": ["20"], "node_ip": "10.245.2.2", "id": "kubernetes-minion-1", "osrelease": "20", "ps": "ps -efH", "server_id": 1005530826, "num_cpus": 1, "hwaddr_interfaces": {"lo": "00:00:00:00:00:00", "docker0": "56:84:7a:fe:97:99", "enp0s8": "08:00:27:17:c5:0f", "p2p1": "08:00:27:96:96:e1"}, "virtual": "VirtualBox", "osfullname": "Fedora", "master": "kubernetes-master", "ipv4": ["10.0.2.15", "10.245.2.2", "127.0.0.1", "172.17.42.1"], "ipv6": ["::1", "fe80::a00:27ff:fe17:c50f", "fe80::a00:27ff:fe96:96e1"], "cpu_flags": ["fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", "cx8", "apic", "sep", "mtrr", "pge", "mca", "cmov", "pat", "pse36", "clflush", "mmx", "fxsr", "sse", "sse2", "syscall", "nx", "rdtscp", "lm", "constant_tsc", "rep_good", "nopl", "pni", "monitor", "ssse3", "lahf_lm"], "localhost": "kubernetes-minion-1", "lsb_distrib_id": "Fedora", "fqdn_ip4": ["127.0.0.1"], "fqdn_ip6": [], "nodename": "kubernetes-minion-1", "saltversion": "2014.1.7", "saltpath": "/usr/lib/python2.7/site-packages/salt", "pythonversion": [2, 7, 5, "final", 0], "host": "kubernetes-minion-1", "os_family": "RedHat", "oscodename": "Heisenbug", "defaultencoding": "UTF-8", "osfinger": "Fedora-20", "roles": ["kubernetes-pool"], "num_gpus": 1, "cpu_model": "Intel(R) Core(TM) i7-4600U CPU @ 2.10GHz", "fqdn": "kubernetes-minion-1", "osarch": "x86_64", "cpuarch": "x86_64", "gpus": [{"model": "VirtualBox Graphics Adapter", "vendor": "unknown"}], "path": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin", "os": "Fedora", "defaultlanguage": "en_US"}}]}`) -pkg/kubelet/qos/memory_policy_test.go: t.Errorf("oom_score_adj should be between %d and %d, but was %d", test.lowOOMScoreAdj, test.highOOMScoreAdj, oomScoreAdj) -pkg/kubelet/qos/memory_policy_test.go: highOOMScoreAdj int // The min oom_score_adj score the container should be assigned. -pkg/kubelet/qos/memory_policy_test.go: lowOOMScoreAdj int // The max oom_score_adj score the container should be assigned. -pkg/util/oom/oom_linux.go: err = fmt.Errorf("failed to set oom_score_adj to %d: %v", oomScoreAdj, writeErr) -pkg/util/oom/oom_linux.go: return fmt.Errorf("invalid PID %d specified for oom_score_adj", pid) -pkg/util/oom/oom_linux.go: oomScoreAdjPath := path.Join("/proc", pidStr, "oom_score_adj") -pkg/util/oom/oom_linux.go:// Writes 'value' to /proc//oom_score_adj for all processes in cgroup cgroupName. -pkg/util/oom/oom_linux.go:// Writes 'value' to /proc//oom_score_adj. PID = 0 means self -test/e2e/es_cluster_logging.go: Failf("No cluster_name field in Elasticsearch response: %v", esResponse) -test/e2e/es_cluster_logging.go: // Check to see if have a cluster_name field. -test/e2e/es_cluster_logging.go: clusterName, ok := esResponse["cluster_name"] -test/e2e/host_path.go: fmt.Sprintf("--file_content_in_loop=%v", filePath), -test/e2e/host_path.go: fmt.Sprintf("--retry_time=%d", retryDuration), -test/images/mount-tester/mt.go: flag.IntVar(&retryDuration, "retry_time", 180, "Retry time during the loop") -test/images/mount-tester/mt.go: flag.StringVar(&readFileContentInLoopPath, "file_content_in_loop", "", "Path to read the file content in loop from") diff --git a/hack/verify-flags/known-flags.txt b/hack/verify-flags/known-flags.txt index be65405cc32cf..b44930ec655f1 100644 --- a/hack/verify-flags/known-flags.txt +++ b/hack/verify-flags/known-flags.txt @@ -55,6 +55,7 @@ cors-allowed-origins create-external-load-balancer current-release-pr current-replicas +cpu-percent default-container-cpu-limit default-container-mem-limit delay-shutdown diff --git a/pkg/api/registered/registered.go b/pkg/api/registered/registered.go index b0805aad4835b..a3f8ddfbfc4d5 100644 --- a/pkg/api/registered/registered.go +++ b/pkg/api/registered/registered.go @@ -50,7 +50,7 @@ func init() { valid, ok := validAPIVersions[version] if !ok || !valid { // Not a valid API version. - glog.Fatalf("Invalid api version: %s in KUBE_API_VERSIONS: %s. List of valid API versions: %v", + glog.Fatalf("invalid api version: %s in KUBE_API_VERSIONS: %s. List of valid API versions: %v", version, os.Getenv("KUBE_API_VERSIONS"), validAPIVersions) } RegisteredVersions = append(RegisteredVersions, version) diff --git a/pkg/kubectl/autoscale.go b/pkg/kubectl/autoscale.go new file mode 100644 index 0000000000000..253e5aac4e239 --- /dev/null +++ b/pkg/kubectl/autoscale.go @@ -0,0 +1,112 @@ +/* +Copyright 2015 The Kubernetes Authors All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package kubectl + +import ( + "fmt" + "strconv" + + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/apis/extensions" + "k8s.io/kubernetes/pkg/runtime" +) + +const ( + scaleSubResource = "scale" +) + +type HorizontalPodAutoscalerV1Beta1 struct{} + +func (HorizontalPodAutoscalerV1Beta1) ParamNames() []GeneratorParam { + return []GeneratorParam{ + {"default-name", true}, + {"name", false}, + {"scaleRef-kind", false}, + {"scaleRef-namespace", false}, + {"scaleRef-name", false}, + {"scaleRef-apiVersion", false}, + {"scaleRef-subresource", false}, + {"min", false}, + {"max", true}, + {"cpu-percent", false}, + } +} + +func (HorizontalPodAutoscalerV1Beta1) Generate(genericParams map[string]interface{}) (runtime.Object, error) { + params := map[string]string{} + for key, value := range genericParams { + strVal, isString := value.(string) + if !isString { + return nil, fmt.Errorf("expected string, saw %v for '%s'", value, key) + } + params[key] = strVal + } + + name, found := params["name"] + if !found || len(name) == 0 { + name, found = params["default-name"] + if !found || len(name) == 0 { + return nil, fmt.Errorf("'name' is a required parameter.") + } + } + minString, found := params["min"] + min := -1 + var err error + if found { + if min, err = strconv.Atoi(minString); err != nil { + return nil, err + } + } + maxString, found := params["max"] + if !found { + return nil, fmt.Errorf("'max' is a required parameter.") + } + max, err := strconv.Atoi(maxString) + if err != nil { + return nil, err + } + cpuString, found := params["cpu-percent"] + cpu := -1 + if found { + if cpu, err = strconv.Atoi(cpuString); err != nil { + return nil, err + } + } + + scaler := extensions.HorizontalPodAutoscaler{ + ObjectMeta: api.ObjectMeta{ + Name: name, + }, + Spec: extensions.HorizontalPodAutoscalerSpec{ + ScaleRef: extensions.SubresourceReference{ + Kind: params["scaleRef-kind"], + Namespace: params["scaleRef-namespace"], + Name: params["scaleRef-name"], + APIVersion: params["scaleRef-apiVersion"], + Subresource: scaleSubResource, + }, + MaxReplicas: max, + }, + } + if min > 0 { + scaler.Spec.MinReplicas = &min + } + if cpu >= 0 { + scaler.Spec.CPUUtilization = &extensions.CPUTargetUtilization{cpu} + } + return &scaler, nil +} diff --git a/pkg/kubectl/cmd/autoscale.go b/pkg/kubectl/cmd/autoscale.go new file mode 100644 index 0000000000000..9cf4a3f5f8e6b --- /dev/null +++ b/pkg/kubectl/cmd/autoscale.go @@ -0,0 +1,170 @@ +/* +Copyright 2015 The Kubernetes Authors All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package cmd + +import ( + "fmt" + "io" + + "k8s.io/kubernetes/pkg/kubectl" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/resource" + "k8s.io/kubernetes/pkg/util/errors" + + "github.com/spf13/cobra" +) + +const ( + autoscaleLong = `Creates an autoscaler that automatically chooses and sets the number of pods that run in a kubernetes cluster. + +Looks up a replication controller by name and creates an autoscaler that uses this replication controller as a reference. +An autoscaler can automatically increase or decrease number of pods deployed within the system as needed.` + + autoscaleExample = `# Auto scale a replication controller "foo", with the number of pods between 2 to 10, target CPU utilization at a default value that server applies: +$ kubectl autoscale rc foo --min=2 --max=10 + +# Auto scale a replication controller "foo", with the number of pods between 1 to 5, target CPU utilization at 80%: +$ kubectl autoscale rc foo --max=5 --cpu-percent=80` +) + +// TODO: support autoscale for deployments +func NewCmdAutoscale(f *cmdutil.Factory, out io.Writer) *cobra.Command { + filenames := []string{} + cmd := &cobra.Command{ + Use: "autoscale (-f FILENAME | TYPE NAME | TYPE/NAME) [--min=MINPODS] --max=MAXPODS [--cpu-percent=CPU] [flags]", + Short: "Auto-scale a replication controller", + Long: autoscaleLong, + Example: autoscaleExample, + Run: func(cmd *cobra.Command, args []string) { + err := RunAutoscale(f, out, cmd, args, filenames) + cmdutil.CheckErr(err) + }, + } + cmdutil.AddPrinterFlags(cmd) + cmd.Flags().String("generator", "horizontalpodautoscaler/v1beta1", "The name of the API generator to use. Currently there is only 1 generator.") + cmd.Flags().Int("min", -1, "The lower limit for the number of pods that can be set by the autoscaler. If it's not specified or negative, the server will apply a default value.") + cmd.Flags().Int("max", -1, "The upper limit for the number of pods that can be set by the autoscaler. Required.") + cmd.MarkFlagRequired("max") + cmd.Flags().Int("cpu-percent", -1, fmt.Sprintf("The target average CPU utilization (represented as a percent of requested CPU) over all the pods. If it's not specified or negative, the server will apply a default value.")) + cmd.Flags().String("name", "", "The name for the newly created object. If not specified, the name of the input resource will be used.") + cmd.Flags().Bool("dry-run", false, "If true, only print the object that would be sent, without creating it.") + usage := "Filename, directory, or URL to a file identifying the resource to get from a server." + kubectl.AddJsonFilenameFlag(cmd, &filenames, usage) + return cmd +} + +func RunAutoscale(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []string, filenames []string) error { + namespace, enforceNamespace, err := f.DefaultNamespace() + if err != nil { + return err + } + + // validate flags + if err := validateFlags(cmd); err != nil { + return err + } + + mapper, typer := f.Object() + r := resource.NewBuilder(mapper, typer, f.ClientMapperForCommand()). + ContinueOnError(). + NamespaceParam(namespace).DefaultNamespace(). + FilenameParam(enforceNamespace, filenames...). + ResourceTypeOrNameArgs(false, args...). + Flatten(). + Do() + infos, err := r.Infos() + if err != nil { + return err + } + if len(infos) > 1 { + return fmt.Errorf("multiple resources provided: %v", args) + } + info := infos[0] + mapping := info.ResourceMapping() + if err := f.CanBeAutoscaled(mapping.Kind); err != nil { + return err + } + + // Get the generator, setup and validate all required parameters + generatorName := cmdutil.GetFlagString(cmd, "generator") + generator, found := f.Generator(generatorName) + if !found { + return cmdutil.UsageError(cmd, fmt.Sprintf("generator %q not found.", generatorName)) + } + names := generator.ParamNames() + params := kubectl.MakeParams(cmd, names) + name := info.Name + params["default-name"] = name + + params["scaleRef-kind"] = mapping.Kind + params["scaleRef-namespace"] = namespace + params["scaleRef-name"] = name + params["scaleRef-apiVersion"] = mapping.APIVersion + + if err = kubectl.ValidateParams(names, params); err != nil { + return err + } + + // Generate new object + object, err := generator.Generate(params) + if err != nil { + return err + } + + resourceMapper := &resource.Mapper{ObjectTyper: typer, RESTMapper: mapper, ClientMapper: f.ClientMapperForCommand()} + hpa, err := resourceMapper.InfoForObject(object) + if err != nil { + return err + } + // TODO: extract this flag to a central location, when such a location exists. + if cmdutil.GetFlagBool(cmd, "dry-run") { + return f.PrintObject(cmd, object, out) + } + + // Serialize the configuration into an annotation. + if err := kubectl.UpdateApplyAnnotation(hpa); err != nil { + return err + } + + // Serialize the object with the annotation applied. + data, err := hpa.Mapping.Codec.Encode(object) + if err != nil { + return err + } + object, err = resource.NewHelper(hpa.Client, hpa.Mapping).Create(namespace, false, data) + if err != nil { + return err + } + + if len(cmdutil.GetFlagString(cmd, "output")) > 0 { + return f.PrintObject(cmd, object, out) + } + cmdutil.PrintSuccess(mapper, false, out, info.Mapping.Resource, info.Name, "autoscaled") + return nil +} + +func validateFlags(cmd *cobra.Command) error { + errs := []error{} + max, min, cpu := cmdutil.GetFlagInt(cmd, "max"), cmdutil.GetFlagInt(cmd, "min"), cmdutil.GetFlagInt(cmd, "cpu-percent") + if max < 1 || max < min { + errs = append(errs, fmt.Errorf("--max=MAXPODS is required, and must be at least 1 and --min=MINPODS")) + } + if cpu > 100 { + errs = append(errs, fmt.Errorf("CPU utilization (%%) cannot exceed 100")) + } + return errors.NewAggregate(errs) +} diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go index b52b671616373..ddc14ffcb32c9 100644 --- a/pkg/kubectl/cmd/cmd.go +++ b/pkg/kubectl/cmd/cmd.go @@ -165,6 +165,7 @@ Find more information at https://github.com/kubernetes/kubernetes.`, cmds.AddCommand(NewCmdRun(f, in, out, err)) cmds.AddCommand(NewCmdStop(f, out)) cmds.AddCommand(NewCmdExposeService(f, out)) + cmds.AddCommand(NewCmdAutoscale(f, out)) cmds.AddCommand(NewCmdLabel(f, out)) cmds.AddCommand(NewCmdAnnotate(f, out)) diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index 6fd4118818174..5b2a1047664d1 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -90,6 +90,8 @@ type Factory struct { Generator func(name string) (kubectl.Generator, bool) // Check whether the kind of resources could be exposed CanBeExposed func(kind string) error + // Check whether the kind of resources could be autoscaled + CanBeAutoscaled func(kind string) error } // NewFactory creates a factory with the default Kubernetes resources defined @@ -102,10 +104,11 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory { flags.SetNormalizeFunc(util.WarnWordSepNormalizeFunc) // Warn for "_" flags generators := map[string]kubectl.Generator{ - "run/v1": kubectl.BasicReplicationController{}, - "run-pod/v1": kubectl.BasicPod{}, - "service/v1": kubectl.ServiceGeneratorV1{}, - "service/v2": kubectl.ServiceGeneratorV2{}, + "run/v1": kubectl.BasicReplicationController{}, + "run-pod/v1": kubectl.BasicPod{}, + "service/v1": kubectl.ServiceGeneratorV1{}, + "service/v2": kubectl.ServiceGeneratorV2{}, + "horizontalpodautoscaler/v1beta1": kubectl.HorizontalPodAutoscalerV1Beta1{}, } clientConfig := optionalClientConfig @@ -256,6 +259,12 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory { } return nil }, + CanBeAutoscaled: func(kind string) error { // TODO: support autoscale for deployments + if kind != "ReplicationController" { + return fmt.Errorf("invalid resource provided: %v, only a replication controller is accepted", kind) + } + return nil + }, } }