TMP

kubernetes-retired · Mar 29, 2024 · 29ee0e9 · 29ee0e9
1 parent d17053a
commit 29ee0e9
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 49 deletions.
diff --git a/etcd-manager/WORKSPACE b/etcd-manager/WORKSPACE
@@ -1,22 +1,5 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-#=============================================================================
-# Platforms
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-http_archive(
-    name = "platforms",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.9/platforms-0.0.9.tar.gz",
-        "https://github.com/bazelbuild/platforms/releases/download/0.0.9/platforms-0.0.9.tar.gz",
-    ],
-    sha256 = "5eda539c841265031c2f82d8ae7a3a6490bd62176e0c038fc469eabf91f6149b",
-)
-
-# To use the new Starlark host platform in @platforms, also include the following snippet:
-load("@platforms//host:extension.bzl", "host_platform_repo")
-host_platform_repo(name = "host_platform")
-
 #=============================================================================
 # Go rules
 

diff --git a/etcd-manager/go.mod b/etcd-manager/go.mod
@@ -81,7 +81,7 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.19.0 // indirect
 	golang.org/x/crypto v0.21.0 // indirect
-	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
+	golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
 	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.5.0 // indirect

diff --git a/etcd-manager/go.sum b/etcd-manager/go.sum
@@ -230,8 +230,8 @@ golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58
 golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
 golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8=
+golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 h1:aAcj0Da7eBAtrTp03QXWvm88pSyOt+UgdZw2BFZ+lEw=
+golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -311,8 +311,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
-golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
+golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
+golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

diff --git a/etcd-manager/images/BUILD b/etcd-manager/images/BUILD
@@ -92,10 +92,6 @@ container_image(
 
 container_image(
     name = "etcd-manager",
-    architecture = select({
-        "@io_bazel_rules_go//go/platform:amd64": "amd64",
-        "@io_bazel_rules_go//go/platform:arm64": "arm64",
-    }),
     base = "etcd-manager-base",
     entrypoint = ["/etcd-manager"],
     env = select({
@@ -110,10 +106,6 @@ container_image(
 
 container_image(
     name = "etcd-manager-slim",
-    architecture = select({
-        "@io_bazel_rules_go//go/platform:amd64": "amd64",
-        "@io_bazel_rules_go//go/platform:arm64": "arm64",
-    }),
     base = select({
         "@io_bazel_rules_go//go/platform:amd64": "//images/base:base_image_amd64",
         "@io_bazel_rules_go//go/platform:arm64": "//images/base:base_image_arm64",
@@ -155,10 +147,6 @@ container_push(
 
 container_image(
     name = "etcd-dump",
-    architecture = select({
-        "@io_bazel_rules_go//go/platform:amd64": "amd64",
-        "@io_bazel_rules_go//go/platform:arm64": "arm64",
-    }),
     base = "etcd-manager-base",
     entrypoint = ["/etcd-dump"],
     files = [
@@ -180,10 +168,6 @@ container_push(
 
 container_image(
     name = "etcd-backup",
-    architecture = select({
-        "@io_bazel_rules_go//go/platform:amd64": "amd64",
-        "@io_bazel_rules_go//go/platform:arm64": "arm64",
-    }),
     base = "etcd-manager-base",
     entrypoint = ["/etcd-backup"],
     files = [

diff --git a/etcd-manager/tools/deb-tools/vendor/github.com/go-logr/logr/BUILD.bazel b/etcd-manager/tools/deb-tools/vendor/github.com/go-logr/logr/BUILD.bazel
diff --git a/etcd-manager/tools/deb-tools/vendor/k8s.io/klog/v2/BUILD.bazel b/etcd-manager/tools/deb-tools/vendor/k8s.io/klog/v2/BUILD.bazel
diff --git a/etcd-manager/tools/deb-tools/vendor/k8s.io/klog/v2/internal/serialize/BUILD.bazel b/etcd-manager/tools/deb-tools/vendor/k8s.io/klog/v2/internal/serialize/BUILD.bazel
diff --git a/etcd-manager/tools/deb-tools/vendor/k8s.io/klog/v2/internal/sloghandler/BUILD.bazel b/etcd-manager/tools/deb-tools/vendor/k8s.io/klog/v2/internal/sloghandler/BUILD.bazel
diff --git a/etcd-manager/vendor/modules.txt b/etcd-manager/vendor/modules.txt
@@ -366,7 +366,7 @@ golang.org/x/crypto/pkcs12
 golang.org/x/crypto/pkcs12/internal/rc2
 golang.org/x/crypto/ssh
 golang.org/x/crypto/ssh/internal/bcrypt_pbkdf
-# golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
+# golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8
 ## explicit; go 1.20
 golang.org/x/exp/constraints
 # golang.org/x/net v0.22.0