Unverified Commit 3057af00 authored by Thomas Montfort's avatar Thomas Montfort Committed by GitHub
Browse files

feat(dep-715): refactor helm directory and remove reference to cloud (#5042)

parent b5922693
...@@ -110,9 +110,11 @@ manifests: controller-gen ensure-yq ## Generate WebhookConfiguration, ClusterRol ...@@ -110,9 +110,11 @@ manifests: controller-gen ensure-yq ## Generate WebhookConfiguration, ClusterRol
yq eval '.metadata.annotations."helm.sh/resource-policy" = "keep"' -i "$$file"; \ yq eval '.metadata.annotations."helm.sh/resource-policy" = "keep"' -i "$$file"; \
fi; \ fi; \
done done
if [ -d "../helm/crds/templates/" ]; then \ if [ ! -d "../helm/charts/crds/templates/" ]; then \
cp config/crd/bases/*.yaml ../helm/crds/templates/; \ echo "Creating directory ../helm/charts/crds/templates/"; \
mkdir -p ../helm/charts/crds/templates/; \
fi fi
cp config/crd/bases/*.yaml ../helm/charts/crds/templates/
echo "Adding NVIDIA header to RBAC files" echo "Adding NVIDIA header to RBAC files"
for file in config/rbac/*.yaml; do \ for file in config/rbac/*.yaml; do \
if [ -f "$$file" ] && ! head -20 "$$file" | grep -q "NVIDIA CORPORATION"; then \ if [ -f "$$file" ] && ! head -20 "$$file" | grep -q "NVIDIA CORPORATION"; then \
...@@ -324,7 +326,7 @@ generate-api-docs: crd-ref-docs ## Generate API reference documentation from CRD ...@@ -324,7 +326,7 @@ generate-api-docs: crd-ref-docs ## Generate API reference documentation from CRD
--output-path=./docs/api_reference.md --output-path=./docs/api_reference.md
@echo "✅ Generated API reference at ./docs/api_reference.md" @echo "✅ Generated API reference at ./docs/api_reference.md"
# concatenate header.md, api_reference.md, and footer.md # concatenate header.md, api_reference.md, and footer.md
cat docs/header.md ./docs/api_reference.md docs/footer.md > ../../../docs/kubernetes/api_reference.md cat docs/header.md ./docs/api_reference.md docs/footer.md > ../../docs/kubernetes/api_reference.md
rm ./docs/api_reference.md rm ./docs/api_reference.md
@echo "✅ Concatenated header.md, api_reference.md, and footer.md" @echo "✅ Concatenated header.md, api_reference.md, and footer.md"
......
...@@ -6,7 +6,7 @@ domain: nvidia.com ...@@ -6,7 +6,7 @@ domain: nvidia.com
layout: layout:
- go.kubebuilder.io/v4 - go.kubebuilder.io/v4
projectName: dynamo-kubernetes-operator projectName: dynamo-kubernetes-operator
repo: github.com/ai-dynamo/dynamo/deploy/cloud/operator/api/v1alpha1 repo: github.com/ai-dynamo/dynamo/deploy/operator/api/v1alpha1
resources: resources:
- api: - api:
crdVersion: v1 crdVersion: v1
...@@ -14,7 +14,7 @@ resources: ...@@ -14,7 +14,7 @@ resources:
controller: true controller: true
domain: nvidia.com domain: nvidia.com
kind: DynamoComponentDeployment kind: DynamoComponentDeployment
path: github.com/ai-dynamo/dynamo/deploy/cloud/operator/api/v1alpha1 path: github.com/ai-dynamo/dynamo/deploy/operator/api/v1alpha1
version: v1alpha1 version: v1alpha1
- api: - api:
crdVersion: v1 crdVersion: v1
...@@ -22,7 +22,7 @@ resources: ...@@ -22,7 +22,7 @@ resources:
controller: true controller: true
domain: nvidia.com domain: nvidia.com
kind: DynamoGraphDeployment kind: DynamoGraphDeployment
path: github.com/ai-dynamo/dynamo/deploy/cloud/operator/api/v1alpha1 path: github.com/ai-dynamo/dynamo/deploy/operator/api/v1alpha1
version: v1alpha1 version: v1alpha1
- api: - api:
crdVersion: v1 crdVersion: v1
...@@ -30,6 +30,6 @@ resources: ...@@ -30,6 +30,6 @@ resources:
controller: true controller: true
domain: nvidia.com domain: nvidia.com
kind: DynamoModel kind: DynamoModel
path: github.com/ai-dynamo/dynamo/deploy/cloud/operator/api/v1alpha1 path: github.com/ai-dynamo/dynamo/deploy/operator/api/v1alpha1
version: v1alpha1 version: v1alpha1
version: "3" version: "3"
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
package v1alpha1 package v1alpha1
import ( import (
commonconsts "github.com/ai-dynamo/dynamo/deploy/cloud/operator/internal/consts" commonconsts "github.com/ai-dynamo/dynamo/deploy/operator/internal/consts"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
) )
......
...@@ -23,7 +23,7 @@ import ( ...@@ -23,7 +23,7 @@ import (
"reflect" "reflect"
"testing" "testing"
commonconsts "github.com/ai-dynamo/dynamo/deploy/cloud/operator/internal/consts" commonconsts "github.com/ai-dynamo/dynamo/deploy/operator/internal/consts"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
......
...@@ -55,18 +55,18 @@ import ( ...@@ -55,18 +55,18 @@ import (
volcanoscheme "volcano.sh/apis/pkg/client/clientset/versioned/scheme" volcanoscheme "volcano.sh/apis/pkg/client/clientset/versioned/scheme"
grovev1alpha1 "github.com/NVIDIA/grove/operator/api/core/v1alpha1" grovev1alpha1 "github.com/NVIDIA/grove/operator/api/core/v1alpha1"
nvidiacomv1alpha1 "github.com/ai-dynamo/dynamo/deploy/cloud/operator/api/v1alpha1" nvidiacomv1alpha1 "github.com/ai-dynamo/dynamo/deploy/operator/api/v1alpha1"
"github.com/ai-dynamo/dynamo/deploy/cloud/operator/internal/consts" "github.com/ai-dynamo/dynamo/deploy/operator/internal/consts"
"github.com/ai-dynamo/dynamo/deploy/cloud/operator/internal/controller" "github.com/ai-dynamo/dynamo/deploy/operator/internal/controller"
commonController "github.com/ai-dynamo/dynamo/deploy/cloud/operator/internal/controller_common" commonController "github.com/ai-dynamo/dynamo/deploy/operator/internal/controller_common"
"github.com/ai-dynamo/dynamo/deploy/cloud/operator/internal/etcd" "github.com/ai-dynamo/dynamo/deploy/operator/internal/etcd"
"github.com/ai-dynamo/dynamo/deploy/cloud/operator/internal/modelendpoint" "github.com/ai-dynamo/dynamo/deploy/operator/internal/modelendpoint"
"github.com/ai-dynamo/dynamo/deploy/cloud/operator/internal/namespace_scope" "github.com/ai-dynamo/dynamo/deploy/operator/internal/namespace_scope"
"github.com/ai-dynamo/dynamo/deploy/cloud/operator/internal/rbac" "github.com/ai-dynamo/dynamo/deploy/operator/internal/rbac"
"github.com/ai-dynamo/dynamo/deploy/cloud/operator/internal/secret" "github.com/ai-dynamo/dynamo/deploy/operator/internal/secret"
"github.com/ai-dynamo/dynamo/deploy/cloud/operator/internal/secrets" "github.com/ai-dynamo/dynamo/deploy/operator/internal/secrets"
internalwebhook "github.com/ai-dynamo/dynamo/deploy/cloud/operator/internal/webhook" internalwebhook "github.com/ai-dynamo/dynamo/deploy/operator/internal/webhook"
webhookvalidation "github.com/ai-dynamo/dynamo/deploy/cloud/operator/internal/webhook/validation" webhookvalidation "github.com/ai-dynamo/dynamo/deploy/operator/internal/webhook/validation"
istioclientsetscheme "istio.io/client-go/pkg/clientset/versioned/scheme" istioclientsetscheme "istio.io/client-go/pkg/clientset/versioned/scheme"
//+kubebuilder:scaffold:imports //+kubebuilder:scaffold:imports
) )
......
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