Merge pull request #359 from hakman/go-1.15.4

Update Go to 1.15.7
kopeio · Jan 21, 2021 · f7946ec · f7946ec
2 parents 666b81f + 9564c92
commit f7946ec
Show file tree

Hide file tree

Showing 567 changed files with 3,639 additions and 2,935 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-2.2.0
+3.4.1
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,7 +23,7 @@ jobs:
 
     - name: Install bazelisk
       run: |
-        curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.4.0/bazelisk-linux-amd64"
+        curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.7.2/bazelisk-linux-amd64"
         mkdir -p "${GITHUB_WORKSPACE}/bin/"
         mv bazelisk-linux-amd64 "${GITHUB_WORKSPACE}/bin/bazelisk"
         chmod +x "${GITHUB_WORKSPACE}/bin/bazelisk"
@@ -40,7 +40,7 @@ jobs:
 
     - name: Install bazelisk
       run: |
-        curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.4.0/bazelisk-linux-amd64"
+        curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.7.2/bazelisk-linux-amd64"
         mkdir -p "${GITHUB_WORKSPACE}/bin/"
         mv bazelisk-linux-amd64 "${GITHUB_WORKSPACE}/bin/bazelisk"
         chmod +x "${GITHUB_WORKSPACE}/bin/bazelisk"

diff --git a/WORKSPACE b/WORKSPACE
@@ -2,28 +2,28 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "d9d71a5fdfcf5f5326f1ffc4bcaea6519cb4fcfe0aaee6ae68c7440ee8b46bc8",
+    sha256 = "7904dbecbaffd068651916dce77ff3437679f9d20e1a7956bff43826e7645fcc",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.22.7/rules_go-v0.22.7.tar.gz",
-        "https://github.com/bazelbuild/rules_go/releases/download/v0.22.7/rules_go-v0.22.7.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.25.1/rules_go-v0.25.1.tar.gz",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.25.1/rules_go-v0.25.1.tar.gz",
     ],
 )
 
 http_archive(
     name = "bazel_gazelle",
-    sha256 = "cdb02a887a7187ea4d5a27452311a75ed8637379a1287d8eeb952138ea485f7d",
+    sha256 = "222e49f034ca7a1d1231422cdb67066b885819885c356673cb1f72f748a3c9d4",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.21.1/bazel-gazelle-v0.21.1.tar.gz",
-        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.21.1/bazel-gazelle-v0.21.1.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.3/bazel-gazelle-v0.22.3.tar.gz",
+        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.3/bazel-gazelle-v0.22.3.tar.gz",
     ],
 )
 
-load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains")
+load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 
 go_rules_dependencies()
 
 go_register_toolchains(
-    go_version = "1.14.5",
+    go_version = "1.15.7",
 )
 
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
@@ -34,9 +34,9 @@ gazelle_dependencies()
 
 http_archive(
     name = "io_bazel_rules_docker",
-    sha256 = "6287241e033d247e9da5ff705dd6ef526bac39ae82f3d17de1b69f8cb313f9cd",
-    strip_prefix = "rules_docker-0.14.3",
-    urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.14.3/rules_docker-v0.14.3.tar.gz"],
+    sha256 = "4521794f0fba2e20f3bf15846ab5e01d5332e587e9ce81629c7f96c793bb7036",
+    strip_prefix = "rules_docker-0.14.4",
+    urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.14.4/rules_docker-v0.14.4.tar.gz"],
 )
 
 load(
@@ -50,6 +50,10 @@ load("@io_bazel_rules_docker//repositories:deps.bzl", container_deps = "deps")
 
 container_deps()
 
+load("@io_bazel_rules_docker//repositories:pip_repositories.bzl", "pip_deps")
+
+pip_deps()
+
 # Note: We can't (easily) use distroless because we need: fsck, blkid, mount, others? to mount disks
 # We also have to use debian-hyperkube-base because we need nsenter / fsck
 

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -1,15 +1,15 @@
 steps:
-- name: gcr.io/cloud-marketplace-containers/google/bazel:2.2.0
+- name: gcr.io/cloud-marketplace-containers/google/bazel:3.4.1
   entrypoint: bazel
   args: ['version']
 
-- name: gcr.io/cloud-marketplace-containers/google/bazel:2.2.0
+- name: gcr.io/cloud-marketplace-containers/google/bazel:3.4.1
   entrypoint: bazel
   args: ['build', '//cmd/...', '//images:etcd-manager', '//images:etcd-backup', '//images:etcd-dump']
   # To build with GCS cache
   #args: ['build', '--google_default_credentials', '--spawn_strategy=remote', '--genrule_strategy=remote', '--strategy=Javac=remote', '--strategy=Closure=remote', '--remote_http_cache=https://storage.googleapis.com/cache-bucket', '//cmd/...']
 
-- name: gcr.io/cloud-marketplace-containers/google/bazel:2.2.0
+- name: gcr.io/cloud-marketplace-containers/google/bazel:3.4.1
   entrypoint: bazel
   args: ['test', '//test/...', '--test_output=streamed', '--local_test_jobs=1']
 

diff --git a/cmd/etcd-backup-ctl/BUILD.bazel b/cmd/etcd-backup-ctl/BUILD.bazel
@@ -1,18 +1,18 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "etcd-backup-ctl_lib",
     srcs = ["main.go"],
     importpath = "kope.io/etcd-manager/cmd/etcd-backup-ctl",
     visibility = ["//visibility:private"],
     deps = [
-        "//pkg/backup:go_default_library",
-        "//vendor/k8s.io/klog/v2:go_default_library",
+        "//pkg/backup",
+        "//vendor/k8s.io/klog/v2:klog",
     ],
 )
 
 go_binary(
     name = "etcd-backup-ctl",
-    embed = [":go_default_library"],
+    embed = [":etcd-backup-ctl_lib"],
     visibility = ["//visibility:public"],
 )
diff --git a/cmd/etcd-backup/BUILD.bazel b/cmd/etcd-backup/BUILD.bazel
@@ -1,19 +1,19 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "etcd-backup_lib",
     srcs = ["main.go"],
     importpath = "kope.io/etcd-manager/cmd/etcd-backup",
     visibility = ["//visibility:private"],
     deps = [
-        "//pkg/backup:go_default_library",
-        "//pkg/backupcontroller:go_default_library",
-        "//vendor/k8s.io/klog/v2:go_default_library",
+        "//pkg/backup",
+        "//pkg/backupcontroller",
+        "//vendor/k8s.io/klog/v2:klog",
     ],
 )
 
 go_binary(
     name = "etcd-backup",
-    embed = [":go_default_library"],
+    embed = [":etcd-backup_lib"],
     visibility = ["//visibility:public"],
 )
diff --git a/cmd/etcd-dump/BUILD.bazel b/cmd/etcd-dump/BUILD.bazel
@@ -1,21 +1,21 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "etcd-dump_lib",
     srcs = ["main.go"],
     importpath = "kope.io/etcd-manager/cmd/etcd-dump",
     visibility = ["//visibility:private"],
     deps = [
-        "//pkg/backup:go_default_library",
-        "//pkg/etcd:go_default_library",
-        "//pkg/etcd/dump:go_default_library",
-        "//pkg/etcdclient:go_default_library",
-        "//vendor/k8s.io/klog/v2:go_default_library",
+        "//pkg/backup",
+        "//pkg/etcd",
+        "//pkg/etcd/dump",
+        "//pkg/etcdclient",
+        "//vendor/k8s.io/klog/v2:klog",
     ],
 )
 
 go_binary(
     name = "etcd-dump",
-    embed = [":go_default_library"],
+    embed = [":etcd-dump_lib"],
     visibility = ["//visibility:public"],
 )
diff --git a/cmd/etcd-manager-ctl/BUILD.bazel b/cmd/etcd-manager-ctl/BUILD.bazel
@@ -1,21 +1,21 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "etcd-manager-ctl_lib",
     srcs = ["main.go"],
     importpath = "kope.io/etcd-manager/cmd/etcd-manager-ctl",
     visibility = ["//visibility:private"],
     deps = [
-        "//pkg/apis/etcd:go_default_library",
-        "//pkg/backup:go_default_library",
-        "//pkg/commands:go_default_library",
-        "//vendor/github.com/golang/protobuf/proto:go_default_library",
-        "//vendor/k8s.io/klog/v2:go_default_library",
+        "//pkg/apis/etcd",
+        "//pkg/backup",
+        "//pkg/commands",
+        "//vendor/github.com/golang/protobuf/proto",
+        "//vendor/k8s.io/klog/v2:klog",
     ],
 )
 
 go_binary(
     name = "etcd-manager-ctl",
-    embed = [":go_default_library"],
+    embed = [":etcd-manager-ctl_lib"],
     visibility = ["//visibility:public"],
 )
diff --git a/cmd/etcd-manager/BUILD.bazel b/cmd/etcd-manager/BUILD.bazel
@@ -1,40 +1,40 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "etcd-manager_lib",
     srcs = ["main.go"],
     importpath = "kope.io/etcd-manager/cmd/etcd-manager",
     visibility = ["//visibility:private"],
     deps = [
-        "//pkg/apis/etcd:go_default_library",
-        "//pkg/backup:go_default_library",
-        "//pkg/commands:go_default_library",
-        "//pkg/controller:go_default_library",
-        "//pkg/etcd:go_default_library",
-        "//pkg/hosts:go_default_library",
-        "//pkg/legacy:go_default_library",
-        "//pkg/locking:go_default_library",
-        "//pkg/pki:go_default_library",
-        "//pkg/privateapi:go_default_library",
-        "//pkg/privateapi/discovery:go_default_library",
-        "//pkg/privateapi/discovery/vfs:go_default_library",
-        "//pkg/tlsconfig:go_default_library",
-        "//pkg/urls:go_default_library",
-        "//pkg/volumes:go_default_library",
-        "//pkg/volumes/alicloud:go_default_library",
-        "//pkg/volumes/aws:go_default_library",
-        "//pkg/volumes/azure:go_default_library",
-        "//pkg/volumes/do:go_default_library",
-        "//pkg/volumes/external:go_default_library",
-        "//pkg/volumes/gce:go_default_library",
-        "//pkg/volumes/openstack:go_default_library",
-        "//vendor/k8s.io/klog/v2:go_default_library",
-        "//vendor/k8s.io/kops/util/pkg/vfs:go_default_library",
+        "//pkg/apis/etcd",
+        "//pkg/backup",
+        "//pkg/commands",
+        "//pkg/controller",
+        "//pkg/etcd",
+        "//pkg/hosts",
+        "//pkg/legacy",
+        "//pkg/locking",
+        "//pkg/pki",
+        "//pkg/privateapi",
+        "//pkg/privateapi/discovery",
+        "//pkg/privateapi/discovery/vfs",
+        "//pkg/tlsconfig",
+        "//pkg/urls",
+        "//pkg/volumes",
+        "//pkg/volumes/alicloud",
+        "//pkg/volumes/aws",
+        "//pkg/volumes/azure",
+        "//pkg/volumes/do",
+        "//pkg/volumes/external",
+        "//pkg/volumes/gce",
+        "//pkg/volumes/openstack",
+        "//vendor/k8s.io/klog/v2:klog",
+        "//vendor/k8s.io/kops/util/pkg/vfs",
     ],
 )
 
 go_binary(
     name = "etcd-manager",
-    embed = [":go_default_library"],
+    embed = [":etcd-manager_lib"],
     visibility = ["//visibility:public"],
 )
diff --git a/go.mod b/go.mod
@@ -92,9 +92,9 @@ require (
 	go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5
 	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
-	golang.org/x/sys v0.0.0-20201126233918-771906719818 // indirect
 	golang.org/x/text v0.3.4 // indirect
-	golang.org/x/tools v0.0.0-20201125231158-b5590deeca9b // indirect
+	golang.org/x/tools v0.1.0 // indirect
+	golang.org/x/tools/gopls v0.6.3 // indirect
 	google.golang.org/api v0.22.0
 	google.golang.org/grpc v1.27.1
 	gopkg.in/gcfg.v1 v1.2.3