metropolis/cli/pkg/context: replace with signal.NotifyContext
Change-Id: I457ccb83c7e25988755bb9463a8c83fc328a722b
Reviewed-on: https://review.monogon.dev/c/monogon/+/3081
Tested-by: Jenkins CI
Reviewed-by: Serge Bazanski <serge@monogon.tech>
diff --git a/cloud/shepherd/mini/BUILD.bazel b/cloud/shepherd/mini/BUILD.bazel
index 5fad3c2..f8a5e72 100644
--- a/cloud/shepherd/mini/BUILD.bazel
+++ b/cloud/shepherd/mini/BUILD.bazel
@@ -17,7 +17,6 @@
"//cloud/shepherd",
"//cloud/shepherd/manager",
"//go/net/ssh",
- "//metropolis/cli/pkg/context",
"@io_k8s_klog_v2//:klog",
"@org_golang_x_crypto//ssh",
],
diff --git a/cloud/shepherd/mini/main.go b/cloud/shepherd/mini/main.go
index b35c09e..0d7b11f 100644
--- a/cloud/shepherd/mini/main.go
+++ b/cloud/shepherd/mini/main.go
@@ -10,6 +10,7 @@
"net/http"
"net/url"
"os"
+ "os/signal"
"strings"
"k8s.io/klog/v2"
@@ -20,7 +21,6 @@
"source.monogon.dev/cloud/lib/component"
"source.monogon.dev/cloud/shepherd"
"source.monogon.dev/cloud/shepherd/manager"
- clicontext "source.monogon.dev/metropolis/cli/pkg/context"
)
type Config struct {
@@ -133,7 +133,7 @@
registry := c.Component.PrometheusRegistry()
c.BMDB.EnableMetrics(registry)
- ctx := clicontext.WithInterrupt(context.Background())
+ ctx, _ := signal.NotifyContext(context.Background(), os.Interrupt)
c.Component.StartPrometheus(ctx)
conn, err := c.BMDB.Open(true)
diff --git a/cloud/shepherd/provider/equinix/BUILD.bazel b/cloud/shepherd/provider/equinix/BUILD.bazel
index 4214f16..ef1ab53 100644
--- a/cloud/shepherd/provider/equinix/BUILD.bazel
+++ b/cloud/shepherd/provider/equinix/BUILD.bazel
@@ -21,7 +21,6 @@
"//cloud/shepherd",
"//cloud/shepherd/manager",
"//go/net/ssh",
- "//metropolis/cli/pkg/context",
"@com_github_packethost_packngo//:packngo",
"@io_k8s_klog_v2//:klog",
"@org_golang_x_crypto//ssh",
diff --git a/cloud/shepherd/provider/equinix/main.go b/cloud/shepherd/provider/equinix/main.go
index 7faee9d..0fb28e1 100644
--- a/cloud/shepherd/provider/equinix/main.go
+++ b/cloud/shepherd/provider/equinix/main.go
@@ -6,6 +6,7 @@
"flag"
"fmt"
"os"
+ "os/signal"
"golang.org/x/crypto/ssh"
"k8s.io/klog/v2"
@@ -16,7 +17,6 @@
"source.monogon.dev/cloud/lib/component"
"source.monogon.dev/cloud/shepherd/manager"
ssh2 "source.monogon.dev/go/net/ssh"
- clicontext "source.monogon.dev/metropolis/cli/pkg/context"
)
type Config struct {
@@ -72,7 +72,7 @@
registry := c.Component.PrometheusRegistry()
c.BMDB.EnableMetrics(registry)
- ctx := clicontext.WithInterrupt(context.Background())
+ ctx, _ := signal.NotifyContext(context.Background(), os.Interrupt)
c.Component.StartPrometheus(ctx)
if c.API.APIKey == "" || c.API.User == "" {