go: re-do the entire thing
This is a mega-change, but attempting to split this up further is
probably not worth the effort.
Summary:
1. Bump up bazel, rules_go, and others.
2. Switch to new go target naming (bye bye go_default_library)
3. Move go deps to go.mod/go.sum, use make gazelle generate from that
4. Bump up Python deps a bit
And also whatever was required to actually get things to work - loads of
small useless changes.
Tested to work on NixOS and Ubuntu 20.04:
$ bazel build //...
$ bazel test //...
Change-Id: I8364bdaa1406b9ae4d0385a6b607f3e7989f98a9
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1583
Reviewed-by: q3k <q3k@hackerspace.pl>
diff --git a/cluster/identd/BUILD.bazel b/cluster/identd/BUILD.bazel
index c49293f..689b922 100644
--- a/cluster/identd/BUILD.bazel
+++ b/cluster/identd/BUILD.bazel
@@ -2,46 +2,46 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
- name = "go_default_library",
+ name = "identd_lib",
srcs = ["main.go"],
importpath = "code.hackerspace.pl/hscloud/cluster/identd",
visibility = ["//visibility:private"],
deps = [
- "//cluster/identd/ident:go_default_library",
- "//cluster/identd/kubenat:go_default_library",
- "//go/mirko:go_default_library",
- "@com_github_golang_glog//:go_default_library",
- "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
+ "//cluster/identd/ident",
+ "//cluster/identd/kubenat",
+ "//go/mirko",
+ "@com_github_golang_glog//:glog",
+ "@io_k8s_apimachinery//pkg/apis/meta/v1:meta",
],
)
go_binary(
name = "identd",
- embed = [":go_default_library"],
+ embed = [":identd_lib"],
visibility = ["//visibility:public"],
)
container_layer(
name = "layer_bin",
+ directory = "/cluster/identd/",
files = [
":identd",
],
- directory = "/cluster/identd/",
)
container_image(
name = "runtime",
base = "@prodimage-bionic//image",
+ entrypoint = "/cluster/identd/identd",
layers = [
":layer_bin",
],
- entrypoint = "/cluster/identd/identd",
)
container_push(
name = "push",
- image = ":runtime",
format = "Docker",
+ image = ":runtime",
registry = "registry.k0.hswaw.net",
repository = "q3k/identd",
tag = "{BUILD_TIMESTAMP}-{STABLE_GIT_COMMIT}",
diff --git a/cluster/identd/cri/BUILD.bazel b/cluster/identd/cri/BUILD.bazel
index 68a15aa..1fd00bd 100644
--- a/cluster/identd/cri/BUILD.bazel
+++ b/cluster/identd/cri/BUILD.bazel
@@ -17,7 +17,7 @@
)
go_library(
- name = "go_default_library",
+ name = "cri",
embed = [":cri_go_proto"],
importpath = "code.hackerspace.pl/hscloud/cluster/identd/cri",
visibility = ["//visibility:public"],
diff --git a/cluster/identd/ident/BUILD.bazel b/cluster/identd/ident/BUILD.bazel
index 737b814..a1bf063 100644
--- a/cluster/identd/ident/BUILD.bazel
+++ b/cluster/identd/ident/BUILD.bazel
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
go_library(
- name = "go_default_library",
+ name = "ident",
srcs = [
"client.go",
"errors.go",
@@ -11,17 +11,17 @@
],
importpath = "code.hackerspace.pl/hscloud/cluster/identd/ident",
visibility = ["//visibility:public"],
- deps = ["@com_github_golang_glog//:go_default_library"],
+ deps = ["@com_github_golang_glog//:glog"],
)
go_test(
- name = "go_default_test",
+ name = "ident_test",
srcs = [
"e2e_test.go",
"request_test.go",
"response_test.go",
"server_test.go",
],
- embed = [":go_default_library"],
- deps = ["@com_github_go_test_deep//:go_default_library"],
+ embed = [":ident"],
+ deps = ["@com_github_go_test_deep//:deep"],
)
diff --git a/cluster/identd/kubenat/BUILD.bazel b/cluster/identd/kubenat/BUILD.bazel
index eeb97ef..02eea63 100644
--- a/cluster/identd/kubenat/BUILD.bazel
+++ b/cluster/identd/kubenat/BUILD.bazel
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
go_library(
- name = "go_default_library",
+ name = "kubenat",
srcs = [
"kubenat.go",
"pods.go",
@@ -10,25 +10,25 @@
importpath = "code.hackerspace.pl/hscloud/cluster/identd/kubenat",
visibility = ["//visibility:public"],
deps = [
- "//cluster/identd/cri:go_default_library",
- "@com_github_cenkalti_backoff//:go_default_library",
- "@com_github_golang_glog//:go_default_library",
+ "//cluster/identd/cri",
+ "@com_github_cenkalti_backoff//:backoff",
+ "@com_github_golang_glog//:glog",
"@org_golang_google_grpc//:go_default_library",
- "@org_golang_google_grpc//codes:go_default_library",
- "@org_golang_google_grpc//status:go_default_library",
+ "@org_golang_google_grpc//codes",
+ "@org_golang_google_grpc//status",
],
)
go_test(
- name = "go_default_test",
+ name = "kubenat_test",
srcs = [
"kubenat_test.go",
"pods_test.go",
"translation_test.go",
],
- embed = [":go_default_library"],
+ embed = [":kubenat"],
deps = [
- "@com_github_go_test_deep//:go_default_library",
- "@com_github_golang_glog//:go_default_library",
+ "@com_github_go_test_deep//:deep",
+ "@com_github_golang_glog//:glog",
],
)