github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #42988 from MaciekPytel/update_ca_manifest

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 42802, 42927, 42669, 42988, 43012)

Update Cluster Autoscaler entrypoint

**What this PR does / why we need it**:
Update Cluster Autoscaler manifest file to use new shell wrapper instead of directly calling CA binary (the wrapper is already included in current CA image). 
Add params to improve logging.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
```
This commit is contained in:
Kubernetes Submit Queue 2017-03-14 07:31:35 -07:00 committed by GitHub
commit ffb071bee0
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cluster/saltbase/salt/cluster-autoscaler/cluster-autoscaler.manifest
View File

@ -27,9 +27,18 @@
"name": "cluster-autoscaler", "name": "cluster-autoscaler",
"image": "gcr.io/google_containers/cluster-autoscaler:v0.5.0-beta1", "image": "gcr.io/google_containers/cluster-autoscaler:v0.5.0-beta1",
"command": [ "command": [
"/bin/sh", "./run.sh",
"-c", "--kubernetes=http://127.0.0.1:8080?inClusterConfig=f",
"./cluster-autoscaler --kubernetes=http://127.0.0.1:8080?inClusterConfig=f --v=4 {{params}} 1>>/var/log/cluster-autoscaler.log 2>&1" "--v=4",
"--stderrthreshold=info",
"--write-status-configmap=true",
"{{params}}"
],
"env": [
{
"name": "LOG_OUTPUT",
"value": "/var/log/cluster-autoscaler.log"
}
], ],
# TODO: Make resource requirements depend on the size of the cluster # TODO: Make resource requirements depend on the size of the cluster
"resources": { "resources": {