From a9605f2aca597f771eb9cacfcf4261412d3dadd9 Mon Sep 17 00:00:00 2001 From: "M. Adil Fayyaz" <62440954+AdilFayyaz@users.noreply.github.com> Date: Mon, 6 Apr 2026 15:23:35 -0700 Subject: [PATCH 1/5] add: dep Signed-off-by: M. Adil Fayyaz <62440954+AdilFayyaz@users.noreply.github.com> --- actions/config/config.go | 26 +++++++++++++++++++++++++ actions/k8s/app_scheme.go | 13 +++++++++++++ go.mod | 8 +++++++- go.sum | 41 +++++++++++++++++++++++++++++++++++---- runs/config/config.go | 18 +++++++++++++++++ 5 files changed, 101 insertions(+), 5 deletions(-) create mode 100644 actions/k8s/app_scheme.go diff --git a/actions/config/config.go b/actions/config/config.go index 46b964e0437..53803e2fca4 100644 --- a/actions/config/config.go +++ b/actions/config/config.go @@ -1,6 +1,8 @@ package config import ( + "time" + "github.com/flyteorg/flyte/v2/flytestdlib/config" ) @@ -21,10 +23,31 @@ var defaultConfig = &Config{ RunServiceURL: "http://localhost:8090", // 8M slots × 8 bytes/pointer = 64 MB; can track ~8M unique actions. RecordFilterSize: 1 << 23, + Apps: AppConfig{ + Enabled: false, + Namespace: "flyte-apps", + DefaultRequestTimeout: 5 * time.Minute, + MaxRequestTimeout: time.Hour, + }, } var configSection = config.MustRegisterSection(configSectionKey, defaultConfig) +// AppConfig holds configuration for the App deployment controller. +type AppConfig struct { + // Enabled controls whether the app deployment controller is started. + Enabled bool `json:"enabled" pflag:",Enable app deployment controller"` + + // Namespace is the K8s namespace where KService CRDs are created. + Namespace string `json:"namespace" pflag:",Namespace for app KServices"` + + // DefaultRequestTimeout is the request timeout applied to apps that don't specify one. + DefaultRequestTimeout time.Duration `json:"defaultRequestTimeout" pflag:",Default request timeout for apps"` + + // MaxRequestTimeout is the hard cap on request timeout (Knative max is 3600s). + MaxRequestTimeout time.Duration `json:"maxRequestTimeout" pflag:",Maximum allowed request timeout for apps"` +} + // Config holds the configuration for the Actions service type Config struct { // HTTP server configuration @@ -45,6 +68,9 @@ type Config struct { // RecordFilterSize is the size of the bloom filter used to deduplicate RecordAction calls. RecordFilterSize int `json:"recordFilterSize" pflag:",Size of the oppo bloom filter for deduplicating RecordAction calls"` + + // Apps holds configuration for the app deployment controller. + Apps AppConfig `json:"apps"` } // ServerConfig holds HTTP server configuration diff --git a/actions/k8s/app_scheme.go b/actions/k8s/app_scheme.go new file mode 100644 index 00000000000..9f3d450d494 --- /dev/null +++ b/actions/k8s/app_scheme.go @@ -0,0 +1,13 @@ +package k8s + +import ( + "k8s.io/client-go/kubernetes/scheme" + servingv1 "knative.dev/serving/pkg/apis/serving/v1" +) + +// InitAppScheme registers Knative Serving types (Service, Route, Configuration, Revision) +// into the client-go scheme so that the K8s client can manage KService CRDs. +// Must be called before creating any K8s clients that interact with apps. +func InitAppScheme() error { + return servingv1.AddToScheme(scheme.Scheme) +} diff --git a/go.mod b/go.mod index 951d2ae04c6..156a6afde6e 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/googleapis/gax-go/v2 v2.15.0 github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 - github.com/hashicorp/golang-lru v0.5.4 + github.com/hashicorp/golang-lru v1.0.2 github.com/imdario/mergo v0.3.16 github.com/jackc/pgconn v1.14.3 github.com/jackc/pgx/v5 v5.7.6 @@ -81,6 +81,7 @@ require ( k8s.io/client-go v0.34.1 k8s.io/klog/v2 v2.130.1 k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 + knative.dev/serving v0.40.2 sigs.k8s.io/controller-runtime v0.22.4 ) @@ -116,6 +117,7 @@ require ( github.com/aws/smithy-go v1.24.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect + github.com/blendle/zapdriver v1.3.1 // indirect github.com/cenkalti/backoff/v5 v5.0.3 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect @@ -145,6 +147,7 @@ require ( github.com/google/cel-go v0.26.0 // indirect github.com/google/gnostic-models v0.7.0 // indirect github.com/google/go-cmp v0.7.0 // indirect + github.com/google/go-containerregistry v0.13.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect github.com/google/s2a-go v0.1.9 // indirect @@ -173,6 +176,7 @@ require ( github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/ncw/swift v1.0.53 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pelletier/go-toml/v2 v2.0.0-beta.8 // indirect github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect @@ -222,6 +226,8 @@ require ( k8s.io/component-base v0.34.1 // indirect k8s.io/kms v0.28.3 // indirect k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect + knative.dev/networking v0.0.0-20240116081125-ce0738abf051 // indirect + knative.dev/pkg v0.0.0-20240116073220-b488e7be5902 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect diff --git a/go.sum b/go.sum index 199c6655184..96bfbc0d322 100644 --- a/go.sum +++ b/go.sum @@ -63,7 +63,12 @@ cloud.google.com/go/trace v1.11.7 h1:kDNDX8JkaAG3R2nq1lIdkb7FCSi1rCmsEtKVsty7p+U cloud.google.com/go/trace v1.11.7/go.mod h1:TNn9d5V3fQVf6s4SCveVMIBS2LJUqo73GACmq/Tky0s= connectrpc.com/connect v1.19.1 h1:R5M57z05+90EfEvCY1b7hBxDVOUl45PrtXtAV2fOC14= connectrpc.com/connect v1.19.1/go.mod h1:tN20fjdGlewnSFeZxLKb0xwIZ6ozc3OQs2hTXy4du9w= +contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d h1:LblfooH1lKOpp1hIhukktmSAxFkqMPFk9KR6iZ0MJNI= +contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d/go.mod h1:IshRmMJBhDfFj5Y67nVhMYTTIze91RUeT73ipWKs/GY= +contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= +contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/Azure/azure-sdk-for-go v67.0.0+incompatible h1:SVBwznSETB0Sipd0uyGJr7khLhJOFRUEUb+0JgkCvDo= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 h1:Gt0j3wceWMwPmiazCa8MzMA0MfhmPIz0Qp0FJ6qcM0U= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0/go.mod h1:Ot/6aikWnKWi4l9QB7qVSwa8iMphQNqkWALMoNT3rzM= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 h1:B+blDbyVIG3WaikNxPnhPiJ1MThR03b3vKGtER95TP4= @@ -138,6 +143,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= +github.com/blendle/zapdriver v1.3.1 h1:C3dydBOWYRiOk+B8X9IVZ5IOe+7cl+tGOexN4QqHfpE= +github.com/blendle/zapdriver v1.3.1/go.mod h1:mdXfREi6u5MArG4j9fewC+FGnXaBR+T4Ox4J2u4eHCc= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= @@ -145,6 +152,8 @@ github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0 github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM= github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= +github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -221,6 +230,10 @@ github.com/go-gormigrate/gormigrate/v2 v2.1.5 h1:1OyorA5LtdQw12cyJDEHuTrEV3GiXiI github.com/go-gormigrate/gormigrate/v2 v2.1.5/go.mod h1:mj9ekk/7CPF3VjopaFvWKN2v7fN3D9d3eEOAXRhi/+M= github.com/go-jose/go-jose/v4 v4.1.2 h1:TK/7NqRQZfgAh+Td8AlsrvtPoUyiHh0LqVvokh+1vHI= github.com/go-jose/go-jose/v4 v4.1.2/go.mod h1:22cg9HWM1pOlnRiY+9cQYJ9XHmya1bYW8OeDM6Ku6Oo= +github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= +github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= @@ -297,6 +310,8 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +github.com/google/go-containerregistry v0.13.0 h1:y1C7Z3e149OJbOPDBxLYR8ITPz8dTKqQwjErKVHJC8k= +github.com/google/go-containerregistry v0.13.0/go.mod h1:J9FQ+eSS4a1aC2GNZxvNpbWhgp0487v+cgiilB4FqDo= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -331,8 +346,8 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo= github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld9rcmyfL1OZhoc= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 h1:QGLs/O40yoNK9vmy4rhUGBVyMf1lISBGtXRpsu/Qu/o= @@ -347,8 +362,8 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 h1:NmZ1PKzSTQbuGHw9DGPFomqkkLW github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3/go.mod h1:zQrxl1YP88HQlA6i9c63DSVPFklWpGX4OWAc9bFuaH4= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= +github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -439,12 +454,15 @@ github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= github.com/onsi/gomega v1.36.1 h1:bJDPBO7ibjxcbHMgSCoo4Yj18UWbKDlLwX1x9sybDcw= github.com/onsi/gomega v1.36.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= +github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= +github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.0-beta.8 h1:dy81yyLYJDwMTifq24Oi/IslOslRrDSb3jwDggjz3Z0= github.com/pelletier/go-toml/v2 v2.0.0-beta.8/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= @@ -462,6 +480,8 @@ github.com/prometheus/common v0.67.4 h1:yR3NqWO1/UyO1w2PhUvXlGQs/PtFmoveVO0KZ4+L github.com/prometheus/common v0.67.4/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI= github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws= github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw= +github.com/prometheus/statsd_exporter v0.22.7 h1:7Pji/i2GuhK6Lu7DHrtTkFmNBCudCPT1pX2CziuyQR0= +github.com/prometheus/statsd_exporter v0.22.7/go.mod h1:N/TevpjkIh9ccs6nuzY3jQn9dFqnUakOjnEuMPJJJnI= github.com/ray-project/kuberay/ray-operator v1.1.0-rc.1 h1:skD8MXnQMO3QGUeTKt09VOXvuch/gJh8+6q3OLm0kAQ= github.com/ray-project/kuberay/ray-operator v1.1.0-rc.1/go.mod h1:ZqyKKvMP5nKDldQoKmur+Wcx7wVlV9Q98phFqHzr+KY= github.com/redis/go-redis/extra/redisprometheus/v9 v9.17.2 h1:0c8P2OMKaMFMMA7ve1SJPUXVsI9urJMO6BNVZzgKNJY= @@ -552,6 +572,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= go.opentelemetry.io/contrib/detectors/gcp v1.36.0 h1:F7q2tNlCaHY9nMKHR6XH9/qkp8FktLnIcy6jJNyOCQw= @@ -584,12 +606,15 @@ go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mx go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0= go.opentelemetry.io/proto/otlp v1.7.1 h1:gTOMpGDb0WTBOP8JaO72iL3auEZhVmAQg4ipjOVAtj4= go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0= @@ -641,6 +666,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI= +golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -974,6 +1001,12 @@ k8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f h1:eeEUOoGYWhOz7EyXqhlR2z k8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +knative.dev/networking v0.0.0-20240116081125-ce0738abf051 h1:bTRVfwmfu4/7U1YBcgBl1VANAwmal6zkoAI9p7PQwDY= +knative.dev/networking v0.0.0-20240116081125-ce0738abf051/go.mod h1:rdzGL1OVP6VItEiJUN/FTCrDnIzkA6ykhSvaK+0Ne6o= +knative.dev/pkg v0.0.0-20240116073220-b488e7be5902 h1:H6+JJN23fhwYWCHY1339sY6uhIyoUwDy1a8dN233fdk= +knative.dev/pkg v0.0.0-20240116073220-b488e7be5902/go.mod h1:NYk8mMYoLkO7CQWnNkti4YGGnvLxN6MIDbUvtgeo0C0= +knative.dev/serving v0.40.2 h1:ljTKmp0wmpvpVsfy/b+ETqCcdqS6l30n6T+17oYd4ng= +knative.dev/serving v0.40.2/go.mod h1:Ory3XczDB8b1lH757CSdeDeouY3LHzSamX8IjmStuoU= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/runs/config/config.go b/runs/config/config.go index acf86471eb6..35a39d8a040 100644 --- a/runs/config/config.go +++ b/runs/config/config.go @@ -23,6 +23,9 @@ var defaultConfig = &Config{ {ID: "production", Name: "Production"}, {ID: "staging", Name: "Staging"}, }, + Apps: AppsConfig{ + InternalAppServiceURL: "http://localhost:8091", + }, } var configSection = config.MustRegisterSection(configSectionKey, defaultConfig) @@ -50,6 +53,9 @@ type Config struct { // Domains are injected into project responses (not stored per project row). Domains []DomainConfig `json:"domains"` + + // Apps holds configuration for the App service. + Apps AppsConfig `json:"apps"` } // ServerConfig holds HTTP server configuration @@ -64,6 +70,18 @@ type DomainConfig struct { Name string `json:"name"` } +// AppsConfig holds configuration for the App service in the runs (control plane). +type AppsConfig struct { + // PublicURLPattern is a Go template for generating public ingress URLs. + // Available variables: {{.Name}}, {{.Project}}, {{.Domain}} + // Example: "https://{{.Name}}-{{.Project}}.apps.flyte.example.com" + PublicURLPattern string `json:"publicUrlPattern" pflag:",URL pattern for app ingress"` + + // InternalAppServiceURL is the base URL of the InternalAppService (actions data plane). + // In unified mode this is overridden by sc.BaseURL. + InternalAppServiceURL string `json:"internalAppServiceUrl" pflag:",URL of the internal app service"` +} + // GetConfig returns the parsed runs configuration func GetConfig() *Config { return configSection.GetConfig().(*Config) From 9ca7eb0e98ba8c0b1aefb590c37b491f89fd0d1e Mon Sep 17 00:00:00 2001 From: "M. Adil Fayyaz" <62440954+AdilFayyaz@users.noreply.github.com> Date: Mon, 6 Apr 2026 21:09:02 -0700 Subject: [PATCH 2/5] restructure Signed-off-by: M. Adil Fayyaz <62440954+AdilFayyaz@users.noreply.github.com> --- actions/cmd/main.go | 2 +- actions/setup.go | 2 +- {actions/k8s => app}/app_scheme.go | 2 +- cache_service/cmd/main.go | 2 +- cache_service/setup.go | 2 +- dataproxy/cmd/main.go | 2 +- dataproxy/setup.go | 2 +- events/cmd/main.go | 2 +- events/setup.go | 2 +- executor/cmd/main.go | 2 +- executor/setup.go | 2 +- {app => flytestdlib/app}/app.go | 0 {app => flytestdlib/app}/context.go | 0 {app => flytestdlib/app}/db.go | 0 {app => flytestdlib/app}/error.go | 0 {app => flytestdlib/app}/k8s.go | 0 manager/cmd/main.go | 2 +- runs/cmd/main.go | 2 +- runs/service/run_service.go | 2 +- runs/setup.go | 2 +- secret/cmd/main.go | 2 +- secret/setup.go | 2 +- 22 files changed, 17 insertions(+), 17 deletions(-) rename {actions/k8s => app}/app_scheme.go (97%) rename {app => flytestdlib/app}/app.go (100%) rename {app => flytestdlib/app}/context.go (100%) rename {app => flytestdlib/app}/db.go (100%) rename {app => flytestdlib/app}/error.go (100%) rename {app => flytestdlib/app}/k8s.go (100%) diff --git a/actions/cmd/main.go b/actions/cmd/main.go index b96b893c883..0e8da5a3002 100644 --- a/actions/cmd/main.go +++ b/actions/cmd/main.go @@ -7,7 +7,7 @@ import ( "github.com/flyteorg/flyte/v2/actions" actionsconfig "github.com/flyteorg/flyte/v2/actions/config" - "github.com/flyteorg/flyte/v2/app" + "github.com/flyteorg/flyte/v2/flytestdlib/app" ) func main() { diff --git a/actions/setup.go b/actions/setup.go index b877d833db1..6f20d863403 100644 --- a/actions/setup.go +++ b/actions/setup.go @@ -8,7 +8,7 @@ import ( "github.com/flyteorg/flyte/v2/actions/config" actionsk8s "github.com/flyteorg/flyte/v2/actions/k8s" "github.com/flyteorg/flyte/v2/actions/service" - "github.com/flyteorg/flyte/v2/app" + "github.com/flyteorg/flyte/v2/flytestdlib/app" "github.com/flyteorg/flyte/v2/flytestdlib/logger" "github.com/flyteorg/flyte/v2/gen/go/flyteidl2/actions/actionsconnect" "github.com/flyteorg/flyte/v2/gen/go/flyteidl2/workflow/workflowconnect" diff --git a/actions/k8s/app_scheme.go b/app/app_scheme.go similarity index 97% rename from actions/k8s/app_scheme.go rename to app/app_scheme.go index 9f3d450d494..5ce61eba08b 100644 --- a/actions/k8s/app_scheme.go +++ b/app/app_scheme.go @@ -1,4 +1,4 @@ -package k8s +package app import ( "k8s.io/client-go/kubernetes/scheme" diff --git a/cache_service/cmd/main.go b/cache_service/cmd/main.go index 5bbf1402003..8477806b588 100644 --- a/cache_service/cmd/main.go +++ b/cache_service/cmd/main.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/flyteorg/flyte/v2/app" + "github.com/flyteorg/flyte/v2/flytestdlib/app" "github.com/flyteorg/flyte/v2/cache_service" cacheserviceconfig "github.com/flyteorg/flyte/v2/cache_service/config" "github.com/flyteorg/flyte/v2/flytestdlib/contextutils" diff --git a/cache_service/setup.go b/cache_service/setup.go index c1ef8450e18..add2302b588 100644 --- a/cache_service/setup.go +++ b/cache_service/setup.go @@ -7,7 +7,7 @@ import ( "github.com/go-gormigrate/gormigrate/v2" - "github.com/flyteorg/flyte/v2/app" + "github.com/flyteorg/flyte/v2/flytestdlib/app" "github.com/flyteorg/flyte/v2/cache_service/config" "github.com/flyteorg/flyte/v2/cache_service/migrations" "github.com/flyteorg/flyte/v2/cache_service/service" diff --git a/dataproxy/cmd/main.go b/dataproxy/cmd/main.go index 6267337eeb6..e224d50efde 100644 --- a/dataproxy/cmd/main.go +++ b/dataproxy/cmd/main.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/flyteorg/flyte/v2/app" + "github.com/flyteorg/flyte/v2/flytestdlib/app" "github.com/flyteorg/flyte/v2/dataproxy" "github.com/flyteorg/flyte/v2/flytestdlib/contextutils" "github.com/flyteorg/flyte/v2/flytestdlib/promutils" diff --git a/dataproxy/setup.go b/dataproxy/setup.go index dfd9bd456d5..9ba7e9db904 100644 --- a/dataproxy/setup.go +++ b/dataproxy/setup.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/flyteorg/flyte/v2/app" + "github.com/flyteorg/flyte/v2/flytestdlib/app" "github.com/flyteorg/flyte/v2/dataproxy/config" "github.com/flyteorg/flyte/v2/dataproxy/service" "github.com/flyteorg/flyte/v2/gen/go/flyteidl2/dataproxy/dataproxyconnect" diff --git a/events/cmd/main.go b/events/cmd/main.go index a5efbc6ce2e..cabbf351a66 100644 --- a/events/cmd/main.go +++ b/events/cmd/main.go @@ -4,7 +4,7 @@ import ( "context" "os" - "github.com/flyteorg/flyte/v2/app" + "github.com/flyteorg/flyte/v2/flytestdlib/app" "github.com/flyteorg/flyte/v2/events" eventsconfig "github.com/flyteorg/flyte/v2/events/config" ) diff --git a/events/setup.go b/events/setup.go index b075518867c..9750d69d961 100644 --- a/events/setup.go +++ b/events/setup.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/flyteorg/flyte/v2/app" + "github.com/flyteorg/flyte/v2/flytestdlib/app" "github.com/flyteorg/flyte/v2/events/config" "github.com/flyteorg/flyte/v2/events/service" "github.com/flyteorg/flyte/v2/flytestdlib/logger" diff --git a/executor/cmd/main.go b/executor/cmd/main.go index 9cb87a4435c..5fdc9718036 100644 --- a/executor/cmd/main.go +++ b/executor/cmd/main.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/flyteorg/flyte/v2/app" + "github.com/flyteorg/flyte/v2/flytestdlib/app" "github.com/flyteorg/flyte/v2/executor" ctrl "sigs.k8s.io/controller-runtime" ) diff --git a/executor/setup.go b/executor/setup.go index 1eb2cb57661..78f5889ae59 100644 --- a/executor/setup.go +++ b/executor/setup.go @@ -18,7 +18,7 @@ import ( metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/webhook" - "github.com/flyteorg/flyte/v2/app" + "github.com/flyteorg/flyte/v2/flytestdlib/app" flyteorgv1 "github.com/flyteorg/flyte/v2/executor/api/v1" "github.com/flyteorg/flyte/v2/executor/pkg/config" "github.com/flyteorg/flyte/v2/executor/pkg/controller" diff --git a/app/app.go b/flytestdlib/app/app.go similarity index 100% rename from app/app.go rename to flytestdlib/app/app.go diff --git a/app/context.go b/flytestdlib/app/context.go similarity index 100% rename from app/context.go rename to flytestdlib/app/context.go diff --git a/app/db.go b/flytestdlib/app/db.go similarity index 100% rename from app/db.go rename to flytestdlib/app/db.go diff --git a/app/error.go b/flytestdlib/app/error.go similarity index 100% rename from app/error.go rename to flytestdlib/app/error.go diff --git a/app/k8s.go b/flytestdlib/app/k8s.go similarity index 100% rename from app/k8s.go rename to flytestdlib/app/k8s.go diff --git a/manager/cmd/main.go b/manager/cmd/main.go index 9e89602a67b..2bc50254ae7 100644 --- a/manager/cmd/main.go +++ b/manager/cmd/main.go @@ -7,7 +7,7 @@ import ( "os" "github.com/flyteorg/flyte/v2/actions" - "github.com/flyteorg/flyte/v2/app" + "github.com/flyteorg/flyte/v2/flytestdlib/app" "github.com/flyteorg/flyte/v2/cache_service" "github.com/flyteorg/flyte/v2/dataproxy" "github.com/flyteorg/flyte/v2/events" diff --git a/runs/cmd/main.go b/runs/cmd/main.go index 68e0667074e..dc7e83b852f 100644 --- a/runs/cmd/main.go +++ b/runs/cmd/main.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/flyteorg/flyte/v2/app" + "github.com/flyteorg/flyte/v2/flytestdlib/app" "github.com/flyteorg/flyte/v2/flytestdlib/contextutils" "github.com/flyteorg/flyte/v2/flytestdlib/database" "github.com/flyteorg/flyte/v2/flytestdlib/promutils" diff --git a/runs/service/run_service.go b/runs/service/run_service.go index b9b03331be8..4094537419b 100644 --- a/runs/service/run_service.go +++ b/runs/service/run_service.go @@ -9,7 +9,7 @@ import ( "time" "connectrpc.com/connect" - "github.com/flyteorg/flyte/v2/app" + "github.com/flyteorg/flyte/v2/flytestdlib/app" "golang.org/x/sync/errgroup" "google.golang.org/grpc/codes" "google.golang.org/protobuf/proto" diff --git a/runs/setup.go b/runs/setup.go index d1ae8467557..5901939e013 100644 --- a/runs/setup.go +++ b/runs/setup.go @@ -9,7 +9,7 @@ import ( "github.com/go-gormigrate/gormigrate/v2" - "github.com/flyteorg/flyte/v2/app" + "github.com/flyteorg/flyte/v2/flytestdlib/app" "github.com/flyteorg/flyte/v2/gen/go/flyteidl2/actions/actionsconnect" flyteappconnect "github.com/flyteorg/flyte/v2/gen/go/flyteidl2/app/appconnect" "github.com/flyteorg/flyte/v2/gen/go/flyteidl2/auth/authconnect" diff --git a/secret/cmd/main.go b/secret/cmd/main.go index 65df1afa83b..d573bc9809b 100644 --- a/secret/cmd/main.go +++ b/secret/cmd/main.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/flyteorg/flyte/v2/app" + "github.com/flyteorg/flyte/v2/flytestdlib/app" "github.com/flyteorg/flyte/v2/secret" secretconfig "github.com/flyteorg/flyte/v2/secret/config" ) diff --git a/secret/setup.go b/secret/setup.go index 120cd2058f0..68cea952aa5 100644 --- a/secret/setup.go +++ b/secret/setup.go @@ -3,7 +3,7 @@ package secret import ( "context" - "github.com/flyteorg/flyte/v2/app" + "github.com/flyteorg/flyte/v2/flytestdlib/app" "github.com/flyteorg/flyte/v2/flytestdlib/logger" "github.com/flyteorg/flyte/v2/gen/go/flyteidl2/secret/secretconnect" "github.com/flyteorg/flyte/v2/secret/service" From 2837dfe7620a0d2f7c2449af53af8aba3a7770f9 Mon Sep 17 00:00:00 2001 From: "M. Adil Fayyaz" <62440954+AdilFayyaz@users.noreply.github.com> Date: Mon, 6 Apr 2026 21:34:33 -0700 Subject: [PATCH 3/5] remove db wrapper Signed-off-by: M. Adil Fayyaz <62440954+AdilFayyaz@users.noreply.github.com> --- cache_service/cmd/main.go | 3 ++- flytestdlib/app/db.go | 22 ---------------------- manager/cmd/main.go | 4 +++- runs/cmd/main.go | 3 ++- 4 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 flytestdlib/app/db.go diff --git a/cache_service/cmd/main.go b/cache_service/cmd/main.go index 8477806b588..63015a56a7e 100644 --- a/cache_service/cmd/main.go +++ b/cache_service/cmd/main.go @@ -10,6 +10,7 @@ import ( cacheserviceconfig "github.com/flyteorg/flyte/v2/cache_service/config" "github.com/flyteorg/flyte/v2/flytestdlib/contextutils" "github.com/flyteorg/flyte/v2/flytestdlib/database" + "github.com/flyteorg/flyte/v2/flytestdlib/logger" "github.com/flyteorg/flyte/v2/flytestdlib/promutils" "github.com/flyteorg/flyte/v2/flytestdlib/promutils/labeled" "github.com/flyteorg/flyte/v2/flytestdlib/storage" @@ -24,7 +25,7 @@ func main() { sc.Host = cfg.Server.Host sc.Port = cfg.Server.Port - db, err := app.InitDB(ctx, database.GetConfig()) + db, err := database.GetDB(ctx, database.GetConfig(), logger.GetConfig()) if err != nil { return fmt.Errorf("failed to initialize database: %w", err) } diff --git a/flytestdlib/app/db.go b/flytestdlib/app/db.go deleted file mode 100644 index 8dd8f89e76e..00000000000 --- a/flytestdlib/app/db.go +++ /dev/null @@ -1,22 +0,0 @@ -package app - -import ( - "context" - "fmt" - - "gorm.io/gorm" - - "github.com/flyteorg/flyte/v2/flytestdlib/database" - "github.com/flyteorg/flyte/v2/flytestdlib/logger" -) - -// InitDB creates a gorm.DB from the given config. -func InitDB(ctx context.Context, cfg *database.DbConfig) (*gorm.DB, error) { - db, err := database.GetDB(ctx, cfg, logger.GetConfig()) - if err != nil { - return nil, fmt.Errorf("failed to initialize database: %w", err) - } - - logger.Infof(ctx, "Database connection established") - return db, nil -} diff --git a/manager/cmd/main.go b/manager/cmd/main.go index 2bc50254ae7..eec382db3eb 100644 --- a/manager/cmd/main.go +++ b/manager/cmd/main.go @@ -13,6 +13,8 @@ import ( "github.com/flyteorg/flyte/v2/events" "github.com/flyteorg/flyte/v2/executor" "github.com/flyteorg/flyte/v2/flytestdlib/contextutils" + "github.com/flyteorg/flyte/v2/flytestdlib/database" + "github.com/flyteorg/flyte/v2/flytestdlib/logger" "github.com/flyteorg/flyte/v2/flytestdlib/promutils" "github.com/flyteorg/flyte/v2/flytestdlib/promutils/labeled" "github.com/flyteorg/flyte/v2/flytestdlib/storage" @@ -43,7 +45,7 @@ func setup(ctx context.Context, sc *app.SetupContext) error { // Initialize database dbCfg := &runsconfig.GetConfig().Database - db, err := app.InitDB(ctx, dbCfg) + db, err := database.GetDB(ctx, dbCfg, logger.GetConfig()) if err != nil { return fmt.Errorf("failed to initialize database: %w", err) } diff --git a/runs/cmd/main.go b/runs/cmd/main.go index dc7e83b852f..4ebfc29e845 100644 --- a/runs/cmd/main.go +++ b/runs/cmd/main.go @@ -8,6 +8,7 @@ import ( "github.com/flyteorg/flyte/v2/flytestdlib/app" "github.com/flyteorg/flyte/v2/flytestdlib/contextutils" "github.com/flyteorg/flyte/v2/flytestdlib/database" + "github.com/flyteorg/flyte/v2/flytestdlib/logger" "github.com/flyteorg/flyte/v2/flytestdlib/promutils" "github.com/flyteorg/flyte/v2/flytestdlib/promutils/labeled" "github.com/flyteorg/flyte/v2/flytestdlib/storage" @@ -25,7 +26,7 @@ func main() { sc.Port = cfg.Server.Port sc.Namespace = "flyte" // TODO: make configurable - db, err := app.InitDB(ctx, database.GetConfig()) + db, err := database.GetDB(ctx, database.GetConfig(), logger.GetConfig()) if err != nil { return fmt.Errorf("failed to initialize database: %w", err) } From d559fceace505c41e5ce6bc229d29501bac9b99f Mon Sep 17 00:00:00 2001 From: "M. Adil Fayyaz" <62440954+AdilFayyaz@users.noreply.github.com> Date: Tue, 7 Apr 2026 11:15:12 -0700 Subject: [PATCH 4/5] cleanup Signed-off-by: M. Adil Fayyaz <62440954+AdilFayyaz@users.noreply.github.com> --- {app => flytestdlib/app}/app_scheme.go | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {app => flytestdlib/app}/app_scheme.go (100%) diff --git a/app/app_scheme.go b/flytestdlib/app/app_scheme.go similarity index 100% rename from app/app_scheme.go rename to flytestdlib/app/app_scheme.go From e1bd7bdbe231d83966433716235080bc8566c195 Mon Sep 17 00:00:00 2001 From: "M. Adil Fayyaz" <62440954+AdilFayyaz@users.noreply.github.com> Date: Tue, 7 Apr 2026 11:29:38 -0700 Subject: [PATCH 5/5] update: dockerfile Signed-off-by: M. Adil Fayyaz <62440954+AdilFayyaz@users.noreply.github.com> --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index af7a5023916..d43a445e531 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,6 @@ ENV CGO_ENABLED=0 WORKDIR /flyteorg/build -COPY app app COPY dataproxy dataproxy COPY executor executor COPY flytecopilot flytecopilot