Skip to content

Commit 0345fdf

Browse files
justaugustusk8s-ci-robot
authored andcommitted
Update dependencies (4/15/19) (#184)
Gopkg.toml - Azure/azure-sdk-for-go: 26.6.0 -> 27.1.0 WORKSPACE - rules_go: 0.18.1 -> 0.18.3 - bazel-gazelle: 0.16.0 -> 0.17.0 - golang: 1.11.5 -> 1.12.4 - golangci-lint: v1.15.0 -> v1.16.0 - kind: 91d92c86cfa4143143841aad7f9b6d0c35e109ea -> 161151a26faf0dbe962ac9f323cc0cdebac79ba8 - Kubernetes: v1.13.5 -> v1.14.1 Packages - containerd: 1.2.4 -> 1.2.6 (set constants in config package) - Azure/compute: 2018-10-01/compute -> 2019-03-01/compute Signed-off-by: Stephen Augustus <[email protected]>
1 parent 3acfcd4 commit 0345fdf

File tree

69 files changed

+419
-236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+419
-236
lines changed

Gopkg.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ required = [
5050

5151
[[constraint]]
5252
name = "github.com/Azure/azure-sdk-for-go"
53-
version = "26.6.0"
53+
version = "27.1.0"
5454

5555
[[constraint]]
5656
name = "github.com/Azure/go-autorest"

WORKSPACE

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
1717

1818
http_archive(
1919
name = "io_bazel_rules_go",
20-
sha256 = "77dfd303492f2634de7a660445ee2d3de2960cbd52f97d8c0dffa9362d3ddef9",
21-
urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.18.1/rules_go-0.18.1.tar.gz"],
20+
sha256 = "86ae934bd4c43b99893fc64be9d9fc684b81461581df7ea8fc291c816f5ee8c5",
21+
urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.18.3/rules_go-0.18.3.tar.gz"],
2222
)
2323

2424
http_archive(
@@ -30,8 +30,8 @@ http_archive(
3030

3131
http_archive(
3232
name = "bazel_gazelle",
33-
sha256 = "7949fc6cc17b5b191103e97481cf8889217263acf52e00b560683413af204fcb",
34-
urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/0.16.0/bazel-gazelle-0.16.0.tar.gz"],
33+
sha256 = "3c681998538231a2d24d0c07ed5a7658cb72bfb5fd4bf9911157c0e9ac6a2687",
34+
urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/0.17.0/bazel-gazelle-0.17.0.tar.gz"],
3535
)
3636

3737
http_archive(
@@ -46,7 +46,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
4646
go_rules_dependencies()
4747

4848
go_register_toolchains(
49-
go_version = "1.11.5",
49+
go_version = "1.12.4",
5050
)
5151

5252
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
@@ -86,7 +86,7 @@ go_repository(
8686
name = "com_github_golangci_golangci-lint",
8787
build_file_generation = "on",
8888
importpath = "github.com/golangci/golangci-lint",
89-
tag = "v1.15.0",
89+
tag = "v1.16.0",
9090
)
9191

9292
go_repository(
@@ -98,7 +98,7 @@ go_repository(
9898

9999
go_repository(
100100
name = "io_k8s_sigs_kind",
101-
commit = "91d92c86cfa4143143841aad7f9b6d0c35e109ea",
101+
commit = "161151a26faf0dbe962ac9f323cc0cdebac79ba8",
102102
importpath = "sigs.k8s.io/kind",
103103
)
104104

@@ -111,7 +111,7 @@ go_repository(
111111
go_repository(
112112
name = "io_k8s_kubernetes",
113113
importpath = "k8s.io/kubernetes",
114-
tag = "v1.13.5",
114+
tag = "v1.14.1",
115115
)
116116

117117
go_repository(

cmd/clusterctl/examples/azure/generate-yaml.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ export CLUSTER_NAME="${CLUSTER_NAME:-test1}"
3434
export VNET_NAME="${VNET_NAME:-}"
3535

3636
# Machine settings.
37+
export KUBERNETES_VERSION="${KUBERNETES_VERSION:-1.14.1}"
3738
export CONTROL_PLANE_MACHINE_TYPE="${CONTROL_PLANE_MACHINE_TYPE:-Standard_B2ms}"
3839
export NODE_MACHINE_TYPE="${NODE_MACHINE_TYPE:-Standard_B2ms}"
39-
export KUBERNETES_VERSION="${KUBERNETES_VERSION:-1.13.5}"
4040

4141
# Credentials.
4242
SSH_KEY_FILE=${OUTPUT_DIR}/sshkey

pkg/cloud/azure/actuators/machine/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ go_library(
2121
"//pkg/cloud/azure/services/virtualmachineextensions:go_default_library",
2222
"//pkg/cloud/azure/services/virtualmachines:go_default_library",
2323
"//pkg/deployer:go_default_library",
24-
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute:go_default_library",
24+
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute:go_default_library",
2525
"//vendor/github.com/pkg/errors:go_default_library",
2626
"//vendor/k8s.io/api/core/v1:go_default_library",
2727
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -44,7 +44,7 @@ go_test(
4444
"//pkg/cloud/azure:go_default_library",
4545
"//pkg/cloud/azure/actuators:go_default_library",
4646
"//pkg/cloud/azure/services/virtualmachines:go_default_library",
47-
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute:go_default_library",
47+
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute:go_default_library",
4848
"//vendor/github.com/Azure/go-autorest/autorest/to:go_default_library",
4949
"//vendor/github.com/ghodss/yaml:go_default_library",
5050
"//vendor/github.com/pkg/errors:go_default_library",

pkg/cloud/azure/actuators/machine/actuator.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ func NewActuator(params ActuatorParams) *Actuator {
5656

5757
// Create creates a machine and is invoked by the machine controller.
5858
func (a *Actuator) Create(ctx context.Context, cluster *clusterv1.Cluster, machine *clusterv1.Machine) error {
59+
if cluster == nil {
60+
return errors.Errorf("missing cluster for machine %s/%s", machine.Namespace, machine.Name)
61+
}
62+
5963
klog.Infof("Creating machine %v for cluster %v", machine.Name, cluster.Name)
6064

6165
scope, err := actuators.NewMachineScope(actuators.MachineScopeParams{Machine: machine, Cluster: cluster, Client: a.client})
@@ -77,6 +81,10 @@ func (a *Actuator) Create(ctx context.Context, cluster *clusterv1.Cluster, machi
7781

7882
// Delete deletes a machine and is invoked by the Machine Controller.
7983
func (a *Actuator) Delete(ctx context.Context, cluster *clusterv1.Cluster, machine *clusterv1.Machine) error {
84+
if cluster == nil {
85+
return errors.Errorf("missing cluster for machine %s/%s", machine.Namespace, machine.Name)
86+
}
87+
8088
klog.Infof("Deleting machine %v for cluster %v.", machine.Name, cluster.Name)
8189

8290
scope, err := actuators.NewMachineScope(actuators.MachineScopeParams{Machine: machine, Cluster: cluster, Client: a.client})
@@ -101,6 +109,10 @@ func (a *Actuator) Delete(ctx context.Context, cluster *clusterv1.Cluster, machi
101109
// If the Update attempts to mutate any immutable state, the method will error
102110
// and no updates will be performed.
103111
func (a *Actuator) Update(ctx context.Context, cluster *clusterv1.Cluster, machine *clusterv1.Machine) error {
112+
if cluster == nil {
113+
return errors.Errorf("missing cluster for machine %s/%s", machine.Namespace, machine.Name)
114+
}
115+
104116
klog.Infof("Updating machine %v for cluster %v.", machine.Name, cluster.Name)
105117

106118
scope, err := actuators.NewMachineScope(actuators.MachineScopeParams{Machine: machine, Cluster: cluster, Client: a.client})
@@ -123,6 +135,10 @@ func (a *Actuator) Update(ctx context.Context, cluster *clusterv1.Cluster, machi
123135

124136
// Exists test for the existence of a machine and is invoked by the Machine Controller
125137
func (a *Actuator) Exists(ctx context.Context, cluster *clusterv1.Cluster, machine *clusterv1.Machine) (bool, error) {
138+
if cluster == nil {
139+
return false, errors.Errorf("missing cluster for machine %s/%s", machine.Namespace, machine.Name)
140+
}
141+
126142
klog.Infof("Checking if machine %v for cluster %v exists", machine.Name, cluster.Name)
127143

128144
scope, err := actuators.NewMachineScope(actuators.MachineScopeParams{Machine: machine, Cluster: cluster, Client: a.client})

pkg/cloud/azure/actuators/machine/actuator_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strings"
2222
"testing"
2323

24-
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute"
24+
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
2525
"github.com/Azure/go-autorest/autorest/to"
2626
"github.com/ghodss/yaml"
2727
"github.com/pkg/errors"

pkg/cloud/azure/actuators/machine/reconciler.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"strings"
2525
"time"
2626

27-
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute"
27+
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
2828
"github.com/pkg/errors"
2929
apicorev1 "k8s.io/api/core/v1"
3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -379,9 +379,10 @@ func getNodeReference(scope *actuators.MachineScope) (*apicorev1.ObjectReference
379379
// TODO(vincepri): Improve this comparison without relying on substrings.
380380
if strings.Contains(node.Spec.ProviderID, instanceID) {
381381
return &apicorev1.ObjectReference{
382-
Kind: node.Kind,
383-
APIVersion: node.APIVersion,
382+
Kind: "Node",
383+
APIVersion: apicorev1.SchemeGroupVersion.String(),
384384
Name: node.Name,
385+
UID: node.UID,
385386
}, nil
386387
}
387388
}

pkg/cloud/azure/converters/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ go_library(
77
visibility = ["//visibility:public"],
88
deps = [
99
"//pkg/apis/azureprovider/v1alpha1:go_default_library",
10-
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute:go_default_library",
10+
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute:go_default_library",
1111
],
1212
)

pkg/cloud/azure/converters/vm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package converters
1818

1919
import (
20-
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute"
20+
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
2121
"sigs.k8s.io/cluster-api-provider-azure/pkg/apis/azureprovider/v1alpha1"
2222
)
2323

0 commit comments

Comments
 (0)