build: remove cilium
This was used back when we were considering CIlium for our networking
layer. However, we abandoned that idea, and as such these are all
unnecessary.
Test Plan: Refactor, CI only.
X-Origin-Diff: phab/D685
GitOrigin-RevId: 30f296d7626d64cc1a07a73e4e7bbd18d9e9d933
diff --git a/build/fietsje/BUILD.bazel b/build/fietsje/BUILD.bazel
index cf75cca..6e59787 100644
--- a/build/fietsje/BUILD.bazel
+++ b/build/fietsje/BUILD.bazel
@@ -4,7 +4,6 @@
name = "go_default_library",
srcs = [
"dependency.go",
- "deps_cilium.go",
"deps_containerd.go",
"deps_delve.go",
"deps_gvisor.go",
diff --git a/build/fietsje/deps_cilium.go b/build/fietsje/deps_cilium.go
deleted file mode 100644
index 0a1252b..0000000
--- a/build/fietsje/deps_cilium.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2020 The Monogon Project Authors.
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-func depsCilium(p *planner) {
- p.collect(
- "github.com/cilium/cilium", "v1.8.0-rc1",
- disabledProtoBuild,
- ).replace(
- // Cilium forks this library to introduce an API that they need, but
- // which the upstream rejected. Since this new API does not cause any
- // backwards incompatibility, we pull in their fork.
- // See https://github.com/miekg/dns/pull/949#issuecomment-487832458 for
- // more information about the fork.
- "github.com/miekg/dns", "github.com/cilium/dns", "8e25ec9a0ff3",
- ).replace(
- // Cilium forks this library (a Go Kafka client) to apply the following
- // patches on top:
- // - 01ce283: Fix de/serialization of null arrays
- // - c411825: Correcly check msgSize in ReadResp before discarding.
- // - 947cc36: Kafka : Cilium panics with error *index out of range
- // error* on receiving messages of very large size.
- // serge@ has not found any trace of the Cilium project trying to
- // upstream this, but the patches seem to be only bugfixes, not
- // breaking functionality.
- // However, the fork-off point of the upstream project is fairly old
- // (commit b5a758db, dated Dec 7, 2017 - pre v1.5.0 of upstream). This
- // might cause issues in the future when we start to have other
- // consumers of this library.
- "github.com/optiopay/kafka", "github.com/cilium/kafka", "01ce283b732b",
- ).use(
- "github.com/hashicorp/go-immutable-radix",
- "github.com/sasha-s/go-deadlock",
- "github.com/google/gopacket",
- "github.com/hashicorp/consul/api",
- "github.com/pborman/uuid",
- "github.com/petermattis/goid",
- "github.com/kr/text",
- "github.com/hashicorp/go-cleanhttp",
- "github.com/hashicorp/serf",
- "github.com/joho/godotenv",
- "github.com/envoyproxy/protoc-gen-validate",
- "github.com/hashicorp/go-rootcerts",
- "github.com/armon/go-metrics",
- "github.com/shirou/gopsutil",
- "github.com/cncf/udpa/go",
- "github.com/cpuguy83/go-md2man/v2",
- "github.com/russross/blackfriday/v2",
- "github.com/shurcooL/sanitized_anchor_name",
- "github.com/google/gops",
- "github.com/mattn/go-shellwords",
- "github.com/c9s/goprocinfo",
- "github.com/cilium/ipam",
- "github.com/kardianos/osext",
- "github.com/servak/go-fastping",
- "github.com/golang/snappy",
- "github.com/cilium/arping",
- ).with(disabledProtoBuild, forceBazelGeneration).use(
- "github.com/cilium/proxy",
- ).with(disabledProtoBuild, buildExtraArgs("-exclude=src")).use(
- // -exclude=src fixes a build issue with Gazelle. See:
- // https://github.com/census-instrumentation/opencensus-proto/issues/200
- "github.com/census-instrumentation/opencensus-proto",
- )
-}
diff --git a/build/fietsje/deps_containerd.go b/build/fietsje/deps_containerd.go
index 79b46aa..5172ffe 100644
--- a/build/fietsje/deps_containerd.go
+++ b/build/fietsje/deps_containerd.go
@@ -73,6 +73,7 @@
"github.com/prometheus/procfs",
"github.com/russross/blackfriday/v2",
"github.com/seccomp/libseccomp-golang",
+ "github.com/shurcooL/sanitized_anchor_name",
"github.com/sirupsen/logrus",
"github.com/syndtr/gocapability",
"github.com/tchap/go-patricia",
diff --git a/build/fietsje/main.go b/build/fietsje/main.go
index f9671a3..7be1107 100644
--- a/build/fietsje/main.go
+++ b/build/fietsje/main.go
@@ -65,7 +65,6 @@
depsKubernetes(p)
depsContainerd(p)
depsGVisor(p)
- depsCilium(p)
// our own deps, common
p.collectOverride("go.uber.org/zap", "v1.15.0")
@@ -83,25 +82,28 @@
p.collect("github.com/rekby/gpt", "a930afbc6edcc89c83d39b79e52025698156178d")
p.collect("github.com/yalue/native_endian", "51013b03be4fd97b0aabf29a6923e60359294186")
- // used by //core/cmd/mkimage
+ // Used by //metropolis/build/mkimage
p.collect("github.com/diskfs/go-diskfs", "v1.0.0").use(
"gopkg.in/djherbis/times.v1",
)
+ // Used by //metropolis/build/genosrelease
+ p.collect("github.com/joho/godotenv", "v1.3.0")
+
// used by //build/bindata
p.collect("github.com/kevinburke/go-bindata", "v3.16.0")
- // used by deltagen
- p.collectOverride("github.com/lyft/protoc-gen-star", "v0.4.14")
-
// for interactive debugging during development (//:dlv alias)
depsDelve(p)
- // Used by //core/cmd/nanoswitch
+ // Used by //metropolis/test/nanoswitch
p.collect("github.com/google/nftables", "7127d9d22474b437f0e8136ddb21855df29790bf").use(
"github.com/koneu/natend",
)
+ // Used by //metropolis/node/core/network/dhcp4c
+ p.collect("github.com/google/gopacket", "v1.1.17")
+
// used by //core//kubernetes/clusternet
p.collect("golang.zx2c4.com/wireguard/wgctrl", "ec7f26be9d9e47a32a2789f8c346031978485cbf").use(
"github.com/mdlayher/netlink",
@@ -121,10 +123,11 @@
"github.com/caddyserver/caddy",
"github.com/dnstap/golang-dnstap",
"github.com/farsightsec/golang-framestream",
- "github.com/infobloxopen/go-trees",
- "github.com/opentracing/opentracing-go",
- "github.com/grpc-ecosystem/grpc-opentracing",
"github.com/flynn/go-shlex",
+ "github.com/grpc-ecosystem/grpc-opentracing",
+ "github.com/infobloxopen/go-trees",
+ "github.com/miekg/dns",
+ "github.com/opentracing/opentracing-go",
)
// goimports
diff --git a/third_party/go/repositories.bzl b/third_party/go/repositories.bzl
index 2da5c0e..785e090 100644
--- a/third_party/go/repositories.bzl
+++ b/third_party/go/repositories.bzl
@@ -85,12 +85,6 @@
sum = "h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA=",
)
go_repository(
- name = "com_github_armon_go_metrics",
- importpath = "github.com/armon/go-metrics",
- version = "v0.0.0-20180917152333-f0300d1749da",
- sum = "h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I=",
- )
- go_repository(
name = "com_github_asaskevich_govalidator",
importpath = "github.com/asaskevich/govalidator",
version = "v0.0.0-20190424111038-f61b66f89f4a",
@@ -115,12 +109,6 @@
sum = "h1:CGxCgetQ64DKk7rdZ++Vfnb1+ogGNnB17OJKJXD2Cfs=",
)
go_repository(
- name = "com_github_c9s_goprocinfo",
- importpath = "github.com/c9s/goprocinfo",
- version = "v0.0.0-20190309065803-0b2ad9ac246b",
- sum = "h1:4yfM1Zm+7U+m0inJ0g6JvdqGePXD8eG4nXUTbcLT6gk=",
- )
- go_repository(
name = "com_github_caddyserver_caddy",
importpath = "github.com/caddyserver/caddy",
version = "v1.0.5",
@@ -139,16 +127,6 @@
sum = "h1:JIufpQLbh4DkbQoii76ItQIUFzevQSqOLZca4eamEDs=",
)
go_repository(
- name = "com_github_census_instrumentation_opencensus_proto",
- importpath = "github.com/census-instrumentation/opencensus-proto",
- version = "v0.2.1",
- sum = "h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=",
- build_file_proto_mode = "disable",
- build_extra_args = [
- "-exclude=src",
- ],
- )
- go_repository(
name = "com_github_cespare_xxhash_v2",
importpath = "github.com/cespare/xxhash/v2",
version = "v2.1.1",
@@ -167,45 +145,12 @@
sum = "h1:jt+rnBIhFtPw0fhtpYGcUOilh4aO9Hj7r+YLEtf30uA=",
)
go_repository(
- name = "com_github_cilium_arping",
- importpath = "github.com/cilium/arping",
- version = "v1.0.1-0.20190728065459-c5eaf8d7a710",
- sum = "h1:htVjkajqUYy6JmLMGlZYxfZ4urQq7rDvgUfmSJX7fSg=",
- )
- go_repository(
- name = "com_github_cilium_cilium",
- importpath = "github.com/cilium/cilium",
- version = "v1.8.0-rc1",
- sum = "h1:tbMNmz8RjjnZ1LHJ8D88mHeQcwEr0aW6eqaratxspu8=",
- build_file_proto_mode = "disable",
- )
- go_repository(
name = "com_github_cilium_ebpf",
importpath = "github.com/cilium/ebpf",
version = "v0.0.0-20200702112145-1c8d4c9ef775",
sum = "h1:cHzBGGVew0ezFsq2grfy2RsB8hO/eNyBgOLHBCqfR1U=",
)
go_repository(
- name = "com_github_cilium_ipam",
- importpath = "github.com/cilium/ipam",
- version = "v0.0.0-20200420133938-2f672ef3ad54",
- sum = "h1:YOrdErbkc+X+6wflk5idOHZ1IJtLNr3Vnz8JlznG0VI=",
- )
- go_repository(
- name = "com_github_cilium_proxy",
- importpath = "github.com/cilium/proxy",
- version = "v0.0.0-20200309181938-3cf80fe45d03",
- sum = "h1:vkRt49aGUyDbrmR8lVXWUPhS9uYvUZB+jwXyer9aq0w=",
- build_file_proto_mode = "disable",
- build_file_generation = "on",
- )
- go_repository(
- name = "com_github_cncf_udpa_go",
- importpath = "github.com/cncf/udpa/go",
- version = "v0.0.0-20191230090109-edbea6a78f6d",
- sum = "h1:F6x9XOn7D+HmM4z8vuG/vvlE53rWPWebGLdIy3Nh+XM=",
- )
- go_repository(
name = "com_github_container_storage_interface_spec",
importpath = "github.com/container-storage-interface/spec",
version = "v1.2.0",
@@ -465,12 +410,6 @@
sum = "h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk=",
)
go_repository(
- name = "com_github_envoyproxy_protoc_gen_validate",
- importpath = "github.com/envoyproxy/protoc-gen-validate",
- version = "v0.3.0-java",
- sum = "h1:bV5JGEB1ouEzZa0hgVDFFiClrUEuGWRaAc/3mxR2QK0=",
- )
- go_repository(
name = "com_github_euank_go_kmsg_parser",
importpath = "github.com/euank/go-kmsg-parser",
version = "v2.0.0+incompatible",
@@ -634,12 +573,6 @@
sum = "h1:5ZkaAPbicIKTF2I64qf5Fh8Aa83Q/dnOafMYV0OMwjA=",
)
go_repository(
- name = "com_github_golang_snappy",
- importpath = "github.com/golang/snappy",
- version = "v0.0.1",
- sum = "h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=",
- )
- go_repository(
name = "com_github_google_btree",
importpath = "github.com/google/btree",
version = "v1.0.0",
@@ -694,12 +627,6 @@
sum = "h1:rMrlX2ZY2UbvT+sdz3+6J+pp2z+msCq9MxTU6ymxbBY=",
)
go_repository(
- name = "com_github_google_gops",
- importpath = "github.com/google/gops",
- version = "v0.3.6",
- sum = "h1:6akvbMlpZrEYOuoebn2kR+ZJekbZqJ28fJXTs84+8to=",
- )
- go_repository(
name = "com_github_google_gvisor",
importpath = "github.com/google/gvisor",
version = "v0.0.0-20200511005220-c52195d25825",
@@ -789,42 +716,18 @@
sum = "h1:0/fjvIF5JHJdr34/JPEk1DJFFonjW37pDLvuAy9YieQ=",
)
go_repository(
- name = "com_github_hashicorp_consul_api",
- importpath = "github.com/hashicorp/consul/api",
- version = "v1.2.0",
- sum = "h1:oPsuzLp2uk7I7rojPKuncWbZ+m5TMoD4Ivs+2Rkeh4Y=",
- )
- go_repository(
name = "com_github_hashicorp_errwrap",
importpath = "github.com/hashicorp/errwrap",
version = "v1.0.0",
sum = "h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=",
)
go_repository(
- name = "com_github_hashicorp_go_cleanhttp",
- importpath = "github.com/hashicorp/go-cleanhttp",
- version = "v0.5.1",
- sum = "h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=",
- )
- go_repository(
- name = "com_github_hashicorp_go_immutable_radix",
- importpath = "github.com/hashicorp/go-immutable-radix",
- version = "v1.1.0",
- sum = "h1:vN9wG1D6KG6YHRTWr8512cxGOVgTMEfgEdSj/hr8MPc=",
- )
- go_repository(
name = "com_github_hashicorp_go_multierror",
importpath = "github.com/hashicorp/go-multierror",
version = "v1.0.0",
sum = "h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o=",
)
go_repository(
- name = "com_github_hashicorp_go_rootcerts",
- importpath = "github.com/hashicorp/go-rootcerts",
- version = "v1.0.0",
- sum = "h1:Rqb66Oo1X/eSV1x66xbDccZjhJigjg0+e82kpwzSwCI=",
- )
- go_repository(
name = "com_github_hashicorp_golang_lru",
importpath = "github.com/hashicorp/golang-lru",
version = "v0.5.3",
@@ -837,12 +740,6 @@
sum = "h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=",
)
go_repository(
- name = "com_github_hashicorp_serf",
- importpath = "github.com/hashicorp/serf",
- version = "v0.8.2",
- sum = "h1:YZ7UKsJv+hKjqGVUUbtE3HNj79Eln2oQ75tniF6iPt0=",
- )
- go_repository(
name = "com_github_hpcloud_tail",
importpath = "github.com/hpcloud/tail",
version = "v1.0.0",
@@ -891,12 +788,6 @@
sum = "h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=",
)
go_repository(
- name = "com_github_kardianos_osext",
- importpath = "github.com/kardianos/osext",
- version = "v0.0.0-20170510131534-ae77be60afb1",
- sum = "h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro=",
- )
- go_repository(
name = "com_github_karrick_godirwalk",
importpath = "github.com/karrick/godirwalk",
version = "v1.7.5",
@@ -933,12 +824,6 @@
sum = "h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=",
)
go_repository(
- name = "com_github_kr_text",
- importpath = "github.com/kr/text",
- version = "v0.1.0",
- sum = "h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=",
- )
- go_repository(
name = "com_github_liggitt_tabwriter",
importpath = "github.com/liggitt/tabwriter",
version = "v0.0.0-20181228230101-89fcab3d43de",
@@ -951,12 +836,6 @@
sum = "h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffktY=",
)
go_repository(
- name = "com_github_lyft_protoc_gen_star",
- importpath = "github.com/lyft/protoc-gen-star",
- version = "v0.4.14",
- sum = "h1:HUkD4H4dYFIgu3Bns/3N6J5GmKHCEGnhYBwNu3fvXgA=",
- )
- go_repository(
name = "com_github_magiconair_properties",
importpath = "github.com/magiconair/properties",
version = "v1.8.1",
@@ -987,12 +866,6 @@
sum = "h1:UnlwIPBGaTZfPQ6T1IGzPI0EkYAQmT9fAEJ/poFC63o=",
)
go_repository(
- name = "com_github_mattn_go_shellwords",
- importpath = "github.com/mattn/go-shellwords",
- version = "v1.0.5",
- sum = "h1:JhhFTIOslh5ZsPrpa3Wdg8bF0WI3b44EMblmU9wIsXc=",
- )
- go_repository(
name = "com_github_matttproud_golang_protobuf_extensions",
importpath = "github.com/matttproud/golang_protobuf_extensions",
version = "v1.0.1",
@@ -1025,9 +898,8 @@
go_repository(
name = "com_github_miekg_dns",
importpath = "github.com/miekg/dns",
- version = "v1.1.4-0.20190417235132-8e25ec9a0ff3",
- sum = "h1:wenYMyWJ08dgEUUj0Ija8qdK/V9vL3ThAD5sjOYlFlg=",
- replace = "github.com/cilium/dns",
+ version = "v1.1.29",
+ sum = "h1:xHBEhR+t5RzcFJjBLJlax2daXOrTYtr9z4WdKEfWFzg=",
)
go_repository(
name = "com_github_mindprince_gonvml",
@@ -1159,19 +1031,6 @@
sum = "h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=",
)
go_repository(
- name = "com_github_optiopay_kafka",
- importpath = "github.com/optiopay/kafka",
- version = "v0.0.0-20180809090225-01ce283b732b",
- sum = "h1:+bsFX/WOMIoaayXVyRem1awcpz3icz/HoL8Dxg/m6a4=",
- replace = "github.com/cilium/kafka",
- )
- go_repository(
- name = "com_github_pborman_uuid",
- importpath = "github.com/pborman/uuid",
- version = "v1.2.0",
- sum = "h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=",
- )
- go_repository(
name = "com_github_peterbourgon_diskv",
importpath = "github.com/peterbourgon/diskv",
version = "v2.0.1+incompatible",
@@ -1184,12 +1043,6 @@
sum = "h1:8uaXtUkxiy+T/zdLWuxa/PG4so0TPZDZfafFNNSaptE=",
)
go_repository(
- name = "com_github_petermattis_goid",
- importpath = "github.com/petermattis/goid",
- version = "v0.0.0-20180202154549-b0b1615b78e5",
- sum = "h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ=",
- )
- go_repository(
name = "com_github_pkg_errors",
importpath = "github.com/pkg/errors",
version = "v0.9.1",
@@ -1256,12 +1109,6 @@
sum = "h1:2c1EFnZHIPCW8qKWgHMH/fX2PkSabFc5mrVzfUNdg5U=",
)
go_repository(
- name = "com_github_sasha_s_go_deadlock",
- importpath = "github.com/sasha-s/go-deadlock",
- version = "v0.2.1-0.20190427202633-1595213edefa",
- sum = "h1:0U2s5loxrTy6/VgfVoLuVLFJcURKLH49ie0zSch7gh4=",
- )
- go_repository(
name = "com_github_sbezverk_nfproxy",
importpath = "github.com/sbezverk/nfproxy",
version = "v0.0.0-20200514180651-7fac5f39824e",
@@ -1284,18 +1131,6 @@
sum = "h1:NJjM5DNFOs0s3kYE1WUOr6G8V97sdt46rlXTMfXGWBo=",
)
go_repository(
- name = "com_github_servak_go_fastping",
- importpath = "github.com/servak/go-fastping",
- version = "v0.0.0-20160802140958-5718d12e20a0",
- sum = "h1:FFgMDF0otYdRIy7stdzyE6l1mbyw16XtOWXn6NJ8bEU=",
- )
- go_repository(
- name = "com_github_shirou_gopsutil",
- importpath = "github.com/shirou/gopsutil",
- version = "v0.0.0-20180427012116-c95755e4bcd7",
- sum = "h1:80VN+vGkqM773Br/uNNTSheo3KatTgV8IpjIKjvVLng=",
- )
- go_repository(
name = "com_github_shurcool_sanitized_anchor_name",
importpath = "github.com/shurcooL/sanitized_anchor_name",
version = "v1.0.0",