kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump kubernetes.sync and fix main.go with new k8 Godeps

This commit is contained in:
Sheldon Kwok 2018-07-17 02:35:54 -07:00
parent cc0b9b204c
commit 20293c2365
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cluster-autoscaler/kubernetes.sync
View File

@ -1,24 +1,26 @@
commit eac9c4ff5711158eaca899a58d1293e39cbd040e (origin/master, origin/HEAD)
Merge: c855accaec 86e152dc3f
commit e09be82ad04107f81032b82a1e2452759001819f
Merge: 77205b90a0 f77060aa8d
Author: Kubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com>
Date: Thu Jun 14 05:09:04 2018 -0700
Date: Tue Jul 17 02:13:07 2018 -0700
Merge pull request #65070 from davidz627/fix/externalProvisionerClusterRole
Merge pull request #66254 from sigma/patch-1
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.
Automatic merge from submit-queue (batch tested with PRs 66172, 66254). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.
Added PV GET api rule to external-provisioner
client-go: update documentation for remotecommand.StreamOptions
Adds the PV GET API rule to the system:external-provisioner cluster role. It is required because the provisioner does a GET here:
https://github.com/kubernetes-incubator/external-storage/blob/master/lib/controller/controller.go#L1121
**What this PR does / why we need it**:
Fixes #65058
The ability to explicitly define the supported protocols was removed in commit 12c7874c0d88e9099ab2a29915d26751f0d23c2a
Adjust documentation accordingly.
/sig storage
/kind bug
/priority critical-urgent
/cc @msau42 @sbezverk
**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
**Special notes for your reviewer**:
**Release note**:
```release-note
NONE
```

5
cluster-autoscaler/main.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package main
import (
ctx "context"
"flag"
"fmt"
"net/http"
@ -359,13 +360,13 @@ func main() {
glog.Fatalf("Unable to create leader election lock: %v", err)
}
kube_leaderelection.RunOrDie(kube_leaderelection.LeaderElectionConfig{
kube_leaderelection.RunOrDie(ctx.TODO(), kube_leaderelection.LeaderElectionConfig{
Lock: lock,
LeaseDuration: leaderElection.LeaseDuration.Duration,
RenewDeadline: leaderElection.RenewDeadline.Duration,
RetryPeriod: leaderElection.RetryPeriod.Duration,
Callbacks: kube_leaderelection.LeaderCallbacks{
OnStartedLeading: func(_ <-chan struct{}) {
OnStartedLeading: func(_ ctx.Context) {
// Since we are committing a suicide after losing
// mastership, we can safely ignore the argument.
run(healthCheck)