Skip to content

Commit

Permalink
Merge pull request #269 from chewong/k8s-1-17
Browse files Browse the repository at this point in the history
Upgrade Kubernetes vendor to v1.17.0
  • Loading branch information
k8s-ci-robot authored Dec 17, 2019
2 parents ef7d255 + 78faf93 commit 5ac9a2a
Show file tree
Hide file tree
Showing 1,373 changed files with 130,674 additions and 40,128 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.12.9-stretch AS build
FROM golang:1.13.4-stretch AS build
WORKDIR /go/src/sigs.k8s.io/cloud-provider-azure
COPY . .
RUN make
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.node
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.12.9-stretch AS build
FROM golang:1.13.4-stretch AS build
WORKDIR /go/src/sigs.k8s.io/cloud-provider-azure
COPY . .
RUN make
Expand Down
9 changes: 7 additions & 2 deletions cmd/cloud-controller-manager/app/core.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,17 @@ import (

func startCloudNodeController(ctx *cloudcontrollerconfig.CompletedConfig, cloud cloudprovider.Interface, stopCh <-chan struct{}) (http.Handler, bool, error) {
// Start the CloudNodeController
nodeController := cloudcontrollers.NewCloudNodeController(
nodeController, err := cloudcontrollers.NewCloudNodeController(
ctx.SharedInformers.Core().V1().Nodes(),
// cloud node controller uses existing cluster role from node-controller
ctx.ClientBuilder.ClientOrDie("node-controller"),
cloud,
ctx.ComponentConfig.NodeStatusUpdateFrequency.Duration)
ctx.ComponentConfig.NodeStatusUpdateFrequency.Duration,
)
if err != nil {
klog.Warningf("failed to start cloud node controller: %s", err)
return nil, false, nil
}

go nodeController.Run(stopCh)

Expand Down
2 changes: 1 addition & 1 deletion cmd/cloud-controller-manager/app/options/options_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func TestDefaultFlags(t *testing.T) {
},
ControllerStartInterval: metav1.Duration{Duration: 0},
LeaderElection: componentbaseconfig.LeaderElectionConfiguration{
ResourceLock: "endpoints",
ResourceLock: "endpointsleases",
LeaderElect: true,
LeaseDuration: metav1.Duration{Duration: 15 * time.Second},
RenewDeadline: metav1.Duration{Duration: 10 * time.Second},
Expand Down
446 changes: 252 additions & 194 deletions go.mod

Large diffs are not rendered by default.

552 changes: 316 additions & 236 deletions go.sum

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5ac9a2a

Please sign in to comment.