Commit 678cffb4 authored by Neelay Shah's avatar Neelay Shah Committed by GitHub
Browse files
parent 6ba39b09
......@@ -17,8 +17,8 @@ Cargo.toml @ryanolson @grahamking @paulhendricks @biswapanda @tmonty12 @guanluo
/deploy/Kubernetes/ @whoisj @hutm @biswapanda
# CI/CD
/.github/ @dynemo-ai/Devops @nnshah1
CODEOWNERS @dynemo-ai/Devops @nnshah1
/.github/ @ai-dynamo/Devops @nnshah1
CODEOWNERS @ai-dynamo/Devops @nnshah1
# Legal
/LICENSE @nv-anants @nvda-mesharma @glos-nv @dmitry-tokarev-nv
......
dynmo->dynamo
dynemo->dynamo
......@@ -348,37 +348,37 @@ spec:
- -c
env:
{{- if gt $parallel_world 1 }}
- name: DYNEMO_LLM_PP
- name: DYNAMO_LLM_PP
value: {{ $parallel_pipeline }}
- name: DYNEMO_LLM_TP
- name: DYNAMO_LLM_TP
value: {{ $parallel_tensor }}
{{- end }}
- name: DYNEMO_NAME
- name: DYNAMO_NAME
value: {{ $component_name | quote }}
{{- if gt (len $component_namespace) 0 }}
- name: DYNEMO_NAMESPACE
- name: DYNAMO_NAMESPACE
value: {{ $component_namespace | quote }}
{{- end }}
{{- if ne $port_health 8000 }}
- name: DYNEMO_PORT_HEALTH
- name: DYNAMO_PORT_HEALTH
value: {{ $port_health }}
{{- end }}
{{- if ne $port_metrics 9347 }}
- name: DYNEMO_PORT_METRICS
- name: DYNAMO_PORT_METRICS
value: {{ $port_metrics }}
{{- end }}
{{- if ne $port_request 9345 }}
- name: DYNEMO_PORT_REQUEST
- name: DYNAMO_PORT_REQUEST
value: {{ $port_request }}
{{- end }}
- name: DYNEMO_RP_ETCD_URL
- name: DYNAMO_RP_ETCD_URL
value: {{ $request_plane_etcd_url }}
- name: DYNEMO_RP_NATS_URL
- name: DYNAMO_RP_NATS_URL
value: {{ $request_plane_nats_url }}
- name: DYNEMO_RP_TIMEOUT
- name: DYNAMO_RP_TIMEOUT
value: {{ $request_plane_timeout }}
{{- if gt $worker_count 1 }}
- name: DYNEMO_WORKER_COUNT
- name: DYNAMO_WORKER_COUNT
value: {{ $worker_count }}
{{- end }}
image: {{ $container_image_name }}
......
......@@ -6,7 +6,7 @@ domain: nvidia.com
layout:
- go.kubebuilder.io/v4
projectName: dynamo-kubernetes-operator
repo: github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/v1alpha1
repo: github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/v1alpha1
resources:
- api:
crdVersion: v1
......@@ -14,7 +14,7 @@ resources:
controller: true
domain: nvidia.com
kind: DynamoNimDeployment
path: github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/v1alpha1
path: github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
......@@ -22,14 +22,14 @@ resources:
controller: true
domain: nvidia.com
kind: DynamoNimRequest
path: github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/v1alpha1
path: github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
namespaced: true
domain: nvidia.com
kind: DynamoNim
path: github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/v1alpha1
path: github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
......@@ -37,6 +37,6 @@ resources:
controller: true
domain: nvidia.com
kind: DynamoDeployment
path: github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/v1alpha1
path: github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/v1alpha1
version: v1alpha1
version: "3"
......@@ -21,12 +21,12 @@ import (
"context"
"fmt"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/modelschemas"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/schemasv1"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/modelschemas"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/schemasv1"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/pkg/dynamo/consts"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/pkg/dynamo/reqcli"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/pkg/dynamo/utils"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/pkg/dynamo/consts"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/pkg/dynamo/reqcli"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/pkg/dynamo/utils"
)
type DynamoAuthHeaders struct {
......
......@@ -18,7 +18,7 @@
package v1alpha1
import (
dynamoCommon "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/common"
dynamoCommon "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/common"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
......
......@@ -18,8 +18,8 @@
package v1alpha1
import (
dynamoCommon "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/common"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/modelschemas"
dynamoCommon "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/common"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/modelschemas"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
......
......@@ -21,8 +21,8 @@ limitations under the License.
package v1alpha1
import (
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/common"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/modelschemas"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/common"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/modelschemas"
"k8s.io/api/autoscaling/v2"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1"
......
......@@ -36,9 +36,9 @@ import (
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
"sigs.k8s.io/controller-runtime/pkg/webhook"
nvidiacomv1alpha1 "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/v1alpha1"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/internal/controller"
commonController "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/internal/controller_common"
nvidiacomv1alpha1 "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/v1alpha1"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/internal/controller"
commonController "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/internal/controller_common"
istioclientsetscheme "istio.io/client-go/pkg/clientset/versioned/scheme"
//+kubebuilder:scaffold:imports
)
......
module github.com/dynemo-ai/dynemo/deploy/dynamo/operator
module github.com/ai-dynamo/dynamo/deploy/dynamo/operator
go 1.23.0
......
......@@ -20,7 +20,7 @@ package controller
import (
"strings"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/v1alpha1"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
......
......@@ -34,9 +34,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/predicate"
nvidiacomv1alpha1 "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/v1alpha1"
commonController "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/internal/controller_common"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/internal/nim"
nvidiacomv1alpha1 "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/v1alpha1"
commonController "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/internal/controller_common"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/internal/nim"
)
const (
......
......@@ -36,16 +36,16 @@ import (
"emperror.dev/errors"
"github.com/cisco-open/k8s-objectmatcher/patch"
dynamoCommon "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/common"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/modelschemas"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/schemasv1"
yataiclient "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/yatai-client"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/v1alpha1"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/internal/controller_common"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/internal/envoy"
commonconfig "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/pkg/dynamo/config"
commonconsts "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/pkg/dynamo/consts"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/pkg/dynamo/system"
dynamoCommon "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/common"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/modelschemas"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/schemasv1"
yataiclient "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/yatai-client"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/v1alpha1"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/internal/controller_common"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/internal/envoy"
commonconfig "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/pkg/dynamo/config"
commonconsts "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/pkg/dynamo/consts"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/pkg/dynamo/system"
"github.com/huandu/xstrings"
"github.com/jinzhu/copier"
"github.com/prometheus/common/version"
......@@ -70,7 +70,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
compounadaiConversion "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/conversion"
compounadaiConversion "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/conversion"
)
const (
......
......@@ -35,9 +35,9 @@ import (
"emperror.dev/errors"
"github.com/apparentlymart/go-shquot/shquot"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/internal/controller_common"
commonconfig "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/pkg/dynamo/config"
commonconsts "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/pkg/dynamo/consts"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/internal/controller_common"
commonconfig "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/pkg/dynamo/config"
commonconsts "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/pkg/dynamo/consts"
"github.com/ettle/strcase"
"github.com/huandu/xstrings"
"github.com/mitchellh/hashstructure/v2"
......@@ -63,11 +63,11 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/predicate"
dynamoCommon "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/common"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/modelschemas"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/schemasv1"
yataiclient "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/yatai-client"
nvidiacomv1alpha1 "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/v1alpha1"
dynamoCommon "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/common"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/modelschemas"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/schemasv1"
yataiclient "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/yatai-client"
nvidiacomv1alpha1 "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/v1alpha1"
)
const (
......
......@@ -24,7 +24,7 @@ import (
"runtime"
"testing"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/v1alpha1"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/v1alpha1"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
......
......@@ -26,20 +26,20 @@ import (
"strings"
"emperror.dev/errors"
compounaiCommon "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/common"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/modelschemas"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/schemasv1"
yataiclient "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/yatai-client"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/v1alpha1"
commonconfig "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/pkg/dynamo/config"
commonconsts "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/pkg/dynamo/consts"
compounaiCommon "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/common"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/modelschemas"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/schemasv1"
yataiclient "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/yatai-client"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/v1alpha1"
commonconfig "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/pkg/dynamo/config"
commonconsts "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/pkg/dynamo/consts"
"github.com/huandu/xstrings"
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/log"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/internal/archive"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/internal/archive"
"gopkg.in/yaml.v2"
)
......
......@@ -20,8 +20,8 @@ package nim
import (
"testing"
compounaiCommon "github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/dynamo/common"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/api/v1alpha1"
compounaiCommon "github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/dynamo/common"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/api/v1alpha1"
"github.com/onsi/gomega"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
......
......@@ -25,7 +25,7 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/dynemo-ai/dynemo/deploy/dynamo/operator/test/utils"
"github.com/ai-dynamo/dynamo/deploy/dynamo/operator/test/utils"
)
const namespace = "dynamo-kubernetes-operator-system"
......
......@@ -20,7 +20,7 @@ from bentoml._internal.context import server_context # type: ignore
from dynamo.sdk.lib.decorators import async_onstart, dynamo_api, dynamo_endpoint
from dynamo.sdk.lib.dependency import depends
from dynamo.sdk.lib.image import DYNEMO_IMAGE
from dynamo.sdk.lib.image import DYNAMO_IMAGE
from dynamo.sdk.lib.service import service
dynamo_context: dict[str, Any] = {}
......@@ -32,7 +32,7 @@ __all__ = [
"dynamo_api",
"dynamo_endpoint",
"depends",
"DYNEMO_IMAGE",
"DYNAMO_IMAGE",
"service",
"dynamo_context",
]
......@@ -21,5 +21,5 @@ import bentoml
# TODO: "dynamo:latest-vllm" image will not be available to image builder in k8s
# so We'd consider publishing the base image for releases to public nvcr.io registry.
image_name = os.getenv("DYNEMO_IMAGE", "dynamo:latest-vllm")
DYNEMO_IMAGE = bentoml.images.PythonImage(base_image=image_name)
image_name = os.getenv("DYNAMO_IMAGE", "dynamo:latest-vllm")
DYNAMO_IMAGE = bentoml.images.PythonImage(base_image=image_name)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment