Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
krancour committed Oct 25, 2023
1 parent eb7ebcf commit 51b3c6f
Show file tree
Hide file tree
Showing 11 changed files with 118 additions and 105 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ RUN GRPC_HEALTH_PROBE_VERSION=v0.4.15 && \
####################################################################################################
# final
####################################################################################################
FROM ghcr.io/akuity/kargo-render:v0.1.0-rc.31 as final
FROM ghcr.io/akuity/kargo-render:v0.1.0-rc.32 as final

USER root

Expand Down
7 changes: 0 additions & 7 deletions cmd/controlplane/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/manager"

render "github.com/akuity/kargo-render"
kargoapi "github.com/akuity/kargo/api/v1alpha1"
"github.com/akuity/kargo/internal/api/kubernetes"
"github.com/akuity/kargo/internal/controller/applications"
Expand All @@ -21,7 +20,6 @@ import (
"github.com/akuity/kargo/internal/controller/stages"
"github.com/akuity/kargo/internal/controller/warehouses"
"github.com/akuity/kargo/internal/credentials"
"github.com/akuity/kargo/internal/logging"
"github.com/akuity/kargo/internal/os"
"github.com/akuity/kargo/internal/types"
versionpkg "github.com/akuity/kargo/internal/version"
Expand Down Expand Up @@ -160,11 +158,6 @@ func newControllerCommand() *cobra.Command {
kargoMgr,
appMgr,
credentialsDB,
render.NewService(
&render.ServiceOptions{
LogLevel: render.LogLevel(logging.LoggerFromContext(ctx).Level),
},
),
shardName,
); err != nil {
return errors.Wrap(err, "error setting up Promotions reconciler")
Expand Down
23 changes: 1 addition & 22 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,7 @@ require (
sigs.k8s.io/yaml v1.3.0
)

require (
github.com/akuity/kargo-render v0.1.0-rc.31
github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1
)
require github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1

require (
cloud.google.com/go/compute v1.20.1 // indirect
Expand All @@ -72,7 +69,6 @@ require (
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect
github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d // indirect
github.com/acomagu/bufpipe v1.0.4 // indirect
github.com/argoproj/pkg v0.13.7-0.20230627120311-a4dd357b057e // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
Expand Down Expand Up @@ -100,7 +96,6 @@ require (
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
github.com/fatih/camelcase v1.0.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.4.2 // indirect
Expand All @@ -109,7 +104,6 @@ require (
github.com/go-git/go-git/v5 v5.8.1 // indirect
github.com/go-jose/go-jose/v3 v3.0.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
Expand All @@ -121,16 +115,12 @@ require (
github.com/google/btree v1.1.2 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-github/v47 v47.1.0 // indirect
github.com/google/go-github/v53 v53.0.0 // indirect
github.com/google/go-jsonnet v0.20.0 // 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/gorilla/mux v1.8.0 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/huandu/xstrings v1.3.3 // indirect
github.com/imdario/mergo v0.3.16 // indirect
Expand Down Expand Up @@ -169,11 +159,9 @@ require (
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/r3labs/diff v1.1.0 // indirect
github.com/redis/go-redis/v9 v9.0.5 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/russross/blackfriday v1.6.0 // indirect
github.com/satori/go.uuid v1.2.0 // indirect
github.com/sergi/go-diff v1.1.0 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/skeema/knownhosts v1.2.0 // indirect
Expand All @@ -184,14 +172,7 @@ require (
github.com/vmihailenco/msgpack/v5 v5.3.4 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/xlab/treeprint v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
go.opentelemetry.io/otel v1.16.0 // indirect
go.opentelemetry.io/otel/metric v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd // indirect
go.uber.org/goleak v1.2.0 // indirect
go.uber.org/ratelimit v0.3.0 // indirect
Expand All @@ -204,8 +185,6 @@ require (
golang.org/x/tools v0.6.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
Expand Down
Loading

0 comments on commit 51b3c6f

Please sign in to comment.