fix: remove kubectl binary from argoexec (#10550)

Signed-off-by: Mitsuo Heijo <[email protected]>

Dockerfile

@@ -76,14 +76,8 @@ RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache
 
 ####################################################################################################
 
-# NOTE: kubectl version should be one minor version less than https://storage.googleapis.com/kubernetes-release/release/stable.txt
-FROM bitnami/kubectl:1.24.8 as kubectl
-
-####################################################################################################
-
 FROM gcr.io/distroless/static as argoexec
 
-COPY --from=kubectl /opt/bitnami/kubectl/bin/kubectl /bin/
 COPY --from=argoexec-build /go/src/github.com/argoproj/argo-workflows/dist/argoexec /bin/
 COPY --from=argoexec-build /etc/mime.types /etc/mime.types
 COPY hack/ssh_known_hosts /etc/ssh/

Dockerfile.windows

@@ -28,12 +28,6 @@ RUN choco install golang --version=$env:GOLANG_VERSION ; \
 FROM mcr.microsoft.com/windows/nanoserver:${IMAGE_OS_VERSION} as argoexec-base
 COPY --from=builder /windows/system32/netapi32.dll /windows/system32/netapi32.dll
 
-# NOTE: kubectl version should be one minor version less than https://storage.googleapis.com/kubernetes-release/release/stable.txt
-ENV KUBECTL_VERSION=1.24.8
-
-RUN mkdir C:\app && \
- curl -L -o C:\app\kubectl.exe "https://storage.googleapis.com/kubernetes-release/release/v%KUBECTL_VERSION%/bin/windows/amd64/kubectl.exe"
-
 COPY --from=builder C:/ProgramData/chocolatey/lib/7zip.portable/tools/7z-extra/x64/7za.exe C:/app/7za.exe
 
 # add binaries to path

cmd/argoexec/commands/root.go

@@ -39,10 +39,6 @@ var (
  logFormat string // --log-format
 )
 
-func init() {
- cobra.OnInitialize(initConfig)
-}
-
 func initConfig() {
  cmd.SetLogFormatter(logFormat)
  cli.SetLogLevel(logLevel)
@@ -56,6 +52,9 @@ func NewRootCommand() *cobra.Command {
  Run: func(cmd *cobra.Command, args []string) {
  cmd.HelpFunc()(cmd, args)
  },
+ PersistentPreRun: func(cmd *cobra.Command, args []string) {
+ initConfig()
+ },
  }
 
  command.AddCommand(NewAgentCommand())

go.mod

@@ -63,10 +63,12 @@ require (
  gopkg.in/jcmturner/gokrb5.v5 v5.3.0
  k8s.io/api v0.24.3
  k8s.io/apimachinery v0.24.3
+ k8s.io/cli-runtime v0.24.3
  k8s.io/client-go v0.24.3
  k8s.io/gengo v0.0.0-20220613173612-397b4ae3bce7
  k8s.io/klog/v2 v2.60.1
  k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8
+ k8s.io/kubectl v0.24.3
  k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
  sigs.k8s.io/yaml v1.3.0
  upper.io/db.v3 v3.8.0+incompatible
@@ -80,6 +82,7 @@ require (
  github.com/Azure/azure-sdk-for-go v62.0.0+incompatible // indirect
  github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0 // indirect
  github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0 // indirect
+ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
  github.com/Azure/go-autorest v14.2.0+incompatible // indirect
  github.com/Azure/go-autorest/autorest v0.11.24 // indirect
  github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect
@@ -89,6 +92,7 @@ require (
  github.com/Azure/go-autorest/logger v0.2.1 // indirect
  github.com/Azure/go-autorest/tracing v0.6.0 // indirect
  github.com/AzureAD/microsoft-authentication-library-for-go v0.8.1 // indirect
+ github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
  github.com/Masterminds/goutils v1.1.1 // indirect
  github.com/Masterminds/semver/v3 v3.2.0 // indirect
  github.com/Microsoft/go-winio v0.5.2 // indirect
@@ -114,10 +118,12 @@ require (
  github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20220228164355-396b2034c795 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/cespare/xxhash/v2 v2.2.0 // indirect
+ github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
  github.com/chrismellard/docker-credential-acr-env v0.0.0-20220119192733-fe33c00cee21 // indirect
  github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
  github.com/creack/pty v1.1.18
  github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd // indirect
  github.com/dimchansky/utfbom v1.1.1 // indirect
  github.com/docker/cli v20.10.17+incompatible // indirect
  github.com/docker/distribution v2.8.1+incompatible // indirect
@@ -126,24 +132,31 @@ require (
  github.com/dustin/go-humanize v1.0.0 // indirect
  github.com/emicklei/go-restful/v3 v3.8.0 // indirect
  github.com/emirpasic/gods v1.12.0 // indirect
+ github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
+ github.com/fatih/camelcase v1.0.0 // indirect
  github.com/fatih/structs v1.1.0 // indirect
  github.com/felixge/httpsnoop v1.0.3 // indirect
  github.com/fsnotify/fsnotify v1.6.0 // indirect
+ github.com/fvbommel/sortorder v1.0.1 // indirect
+ github.com/go-errors/errors v1.0.1 // indirect
  github.com/go-git/gcfg v1.5.0 // indirect
  github.com/go-git/go-billy/v5 v5.3.1 // indirect
  github.com/go-logr/logr v1.2.3 // indirect
  github.com/go-openapi/jsonpointer v0.19.6 // indirect
  github.com/go-openapi/swag v0.22.3 // indirect
  github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
  github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+ github.com/google/btree v1.0.1 // indirect
  github.com/google/gnostic v0.5.7-v3refs // indirect
  github.com/google/go-cmp v0.5.9 // indirect
  github.com/google/go-containerregistry/pkg/authn/kubernetes v0.0.0-20220301182634-bfe2ffc6b6bd // indirect
  github.com/google/go-querystring v1.1.0 // indirect
  github.com/google/gofuzz v1.2.0 // indirect
+ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
  github.com/google/uuid v1.3.0 // indirect
  github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
  github.com/googleapis/gax-go/v2 v2.7.0 // indirect
+ github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
  github.com/hashicorp/go-uuid v1.0.2 // indirect
  github.com/hashicorp/hcl v1.0.0 // indirect
  github.com/huandu/xstrings v1.3.3 // indirect
@@ -154,13 +167,16 @@ require (
  github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
  github.com/jcmturner/gofork v1.0.0 // indirect
  github.com/jmespath/go-jmespath v0.4.0 // indirect
+ github.com/jonboulle/clockwork v0.2.2 // indirect
  github.com/josharian/intern v1.0.0 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
  github.com/kevinburke/ssh_config v1.2.0 // indirect
  github.com/klauspost/compress v1.15.9 // indirect
  github.com/klauspost/cpuid/v2 v2.1.0 // indirect
  github.com/kylelemons/godebug v1.1.0 // indirect
  github.com/lib/pq v1.10.4 // indirect
+ github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
+ github.com/lithammer/dedent v1.1.0 // indirect
  github.com/magiconair/properties v1.8.7 // indirect
  github.com/mailru/easyjson v0.7.7 // indirect
  github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
@@ -172,18 +188,23 @@ require (
  github.com/mitchellh/mapstructure v1.5.0 // indirect
  github.com/mitchellh/reflectwalk v1.0.2 // indirect
  github.com/moby/spdystream v0.2.0 // indirect
+ github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
+ github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
  github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
  github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852 // indirect
  github.com/onsi/ginkgo v1.16.5 // indirect
  github.com/opencontainers/go-digest v1.0.0 // indirect
  github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198 // indirect
  github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+ github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
  github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
  github.com/prometheus/procfs v0.8.0 // indirect
  github.com/rs/xid v1.4.0 // indirect
+ github.com/russross/blackfriday v1.6.0 // indirect
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
  github.com/sanity-io/litter v1.5.5 // indirect
  github.com/sergi/go-diff v1.1.0 // indirect
@@ -201,10 +222,12 @@ require (
  github.com/xanzy/ssh-agent v0.3.1 // indirect
  github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
  github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
+ github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
  github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 // indirect
  github.com/yudai/gojsondiff v1.0.0 // indirect
  github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
  go.opencensus.io v0.24.0 // indirect
+ go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
  golang.org/x/net v0.6.0 // indirect
  golang.org/x/sys v0.5.0 // indirect
  golang.org/x/term v0.5.0
@@ -221,8 +244,14 @@ require (
  gopkg.in/warnings.v0 v0.1.2 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
+ k8s.io/component-base v0.24.3 // indirect
+ k8s.io/component-helpers v0.24.3 // indirect
+ k8s.io/metrics v0.24.3 // indirect
  moul.io/http2curl/v2 v2.3.0 // indirect
  sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
+ sigs.k8s.io/kustomize/api v0.11.4 // indirect
+ sigs.k8s.io/kustomize/kustomize/v4 v4.5.4 // indirect
+ sigs.k8s.io/kustomize/kyaml v0.13.6 // indirect
  sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
 )