From f6a8daf1547ac668dea31535520cb17003dade55 Mon Sep 17 00:00:00 2001 From: Evan Vetere Date: Wed, 21 Oct 2026 14:49:33 -0400 Subject: [PATCH] Revert "feat: Run the controllers on an empty base image" --- Dockerfile | 2 +- cmd/fabric-identity-controller/main.go | 1 - cmd/main.go | 1 - go.mod | 1 - go.sum | 2 -- 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8de159b..96300da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ COPY internal/ internal/ RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -ldflags "-s -w" -o vpc-controller cmd/main.go RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -ldflags "-s -w" -o fabric-identity-controller cmd/fabric-identity-controller/main.go -FROM scratch +FROM gcr.io/distroless/static-debian12:nonroot WORKDIR / COPY --from=builder /workspace/vpc-controller . COPY --from=builder /workspace/fabric-identity-controller . diff --git a/cmd/fabric-identity-controller/main.go b/cmd/fabric-identity-controller/main.go index 14ddc5c..5479564 100644 --- a/cmd/fabric-identity-controller/main.go +++ b/cmd/fabric-identity-controller/main.go @@ -27,7 +27,6 @@ import ( "flag" "os" - _ "golang.org/x/crypto/x509roots/fallback" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" diff --git a/cmd/main.go b/cmd/main.go index eebd7fb..62d8eb3 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -26,7 +26,6 @@ import ( "os" nadv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1" - _ "golang.org/x/crypto/x509roots/fallback" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" diff --git a/go.mod b/go.mod index 943e1cb..0431086 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,6 @@ require ( go.datum.net/network v0.1.0 go.datum.net/network-services-operator v0.27.0 go.miloapis.com/ipam v0.4.0 - golang.org/x/crypto/x509roots/fallback v0.0.0-20261020153306-9f2b28d4331a k8s.io/api v0.36.3 k8s.io/apimachinery v0.36.3 k8s.io/client-go v0.36.3 diff --git a/go.sum b/go.sum index 5526ae1..6c1b0e7 100644 --- a/go.sum +++ b/go.sum @@ -139,8 +139,6 @@ go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ= go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/crypto/x509roots/fallback v0.0.0-20261020153306-9f2b28d4331a h1:V5oicZXS0oqZx30gY/apgSVD7YvNBfrIOdcMnlelJY4= -golang.org/x/crypto/x509roots/fallback v0.0.0-20261020153306-9f2b28d4331a/go.mod h1:HPze8vhfG6fO06AM+VSvxRm4E3+5Yk375mgrJ5M2z1E= golang.org/x/mod v0.40.0 h1:hUv+3cXcdRHz08UmSiOob7sadHig73uo5bkXxQ/tvUs= golang.org/x/mod v0.40.0/go.mod h1:0/weTWkPWGBikyTWAX3dkjVztMmBA5hM0DH6BElSupE= golang.org/x/net v0.58.0 h1:ynWG7rqYi4ccpTEuPZ2QGWHktVEM9DMCj9yzDE0Q7To=