From 2192321b0e9a12883685de57e459fd9292c611ed Mon Sep 17 00:00:00 2001 From: Artiom Diomin Date: Wed, 16 Jun 2021 13:49:26 +0300 Subject: [PATCH] Upgrade machine-controller to v1.33.0 Signed-off-by: Artiom Diomin --- .prow.yaml | 6 +++--- go.mod | 4 ++-- go.sum | 7 +++---- pkg/templates/images/images.go | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.prow.yaml b/.prow.yaml index 0f5beee7a..b86732882 100644 --- a/.prow.yaml +++ b/.prow.yaml @@ -660,7 +660,7 @@ presubmits: ######################################################### # E2E/Upgrade tests (AWS) ######################################################### - - name: pull-kubeone-e2e-aws-upgrade-containerd-1.17-1.18 + - name: pull-kubeone-e2e-aws-upgrade-containerd-1.18-1.19 run_if_changed: "(pkg/|examples/terraform/aws|hack/|test/)" decorate: true clone_uri: "ssh://git@github.com/kubermatic/kubeone.git" @@ -683,9 +683,9 @@ presubmits: - name: TF_VAR_initial_machinedeployment_spotinstances value: "true" - name: TEST_CLUSTER_INITIAL_VERSION - value: "1.17.17" - - name: TEST_CLUSTER_TARGET_VERSION value: "1.18.20" + - name: TEST_CLUSTER_TARGET_VERSION + value: "1.19.12" - name: TEST_TIMEOUT valut: "120m" - name: KUBEONE_TEST_RUN diff --git a/go.mod b/go.mod index 8110dd3f4..6722af1d5 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/google/go-cmp v0.5.5 github.com/imdario/mergo v0.3.11 github.com/koron-go/prefixw v0.0.0-20181013140428-271b207a7572 - github.com/kubermatic/machine-controller v1.28.0 + github.com/kubermatic/machine-controller v1.33.0 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de github.com/pkg/errors v0.9.1 github.com/pmezard/go-difflib v1.0.0 @@ -23,7 +23,7 @@ require ( go.etcd.io/etcd/client/v3 v3.5.0 golang.org/x/crypto v0.0.0-20201217014255-9d1352758620 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 - golang.org/x/tools v0.1.4 // indirect + golang.org/x/tools v0.1.4 google.golang.org/grpc v1.38.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.19.4 diff --git a/go.sum b/go.sum index a52da9770..bd2866873 100644 --- a/go.sum +++ b/go.sum @@ -460,7 +460,7 @@ github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0m github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38= -github.com/hetznercloud/hcloud-go v1.23.1/go.mod h1:xng8lbDUg+xM1dgc0yGHX5EeqbwIq7UYlMWMTx3SQVg= +github.com/hetznercloud/hcloud-go v1.25.0/go.mod h1:2C5uMtBiMoFr3m7lBFPf7wXTdh33CevmZpQIIDPGYJI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs= github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= @@ -522,8 +522,8 @@ github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kubermatic/machine-controller v1.28.0 h1:6XBOm3Z9U5ja6dhzpAkBpB1nuytL2ffjmUK4YkLaddM= -github.com/kubermatic/machine-controller v1.28.0/go.mod h1:X5l6Dwdd2TTOQOMSl7FiKEWcfRH7UI6zmOmjgeT6cPo= +github.com/kubermatic/machine-controller v1.33.0 h1:omIYMu5QuM4QdbhtVzy/VusWen6oN7bcL63oBLPLezs= +github.com/kubermatic/machine-controller v1.33.0/go.mod h1:MBm7nKFUhEBUItiN3IVXSA1XChIhvHFWcjwr397vcio= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -1130,7 +1130,6 @@ golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20201202200335-bef1c476418a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.2 h1:kRBLX7v7Af8W7Gdbbc908OJcdgtK8bOz9Uaj8/F1ACA= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4 h1:cVngSRcfgyZCzys3KYOpCFa+4dqX/Oub9tAq00ttGVs= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= diff --git a/pkg/templates/images/images.go b/pkg/templates/images/images.go index 8b246e97f..470d7dcc1 100644 --- a/pkg/templates/images/images.go +++ b/pkg/templates/images/images.go @@ -67,7 +67,7 @@ func baseResources() map[Resource]string { CalicoNode: "docker.io/calico/node:v3.19.1", DNSNodeCache: "k8s.gcr.io/k8s-dns-node-cache:1.15.13", Flannel: "quay.io/coreos/flannel:v0.13.0", - MachineController: "docker.io/kubermatic/machine-controller:v1.30.0", + MachineController: "docker.io/kubermatic/machine-controller:v1.33.0", MetricsServer: "k8s.gcr.io/metrics-server:v0.3.6", } }