Skip to content

Commit 3e967e3

Browse files
xkd9Harika
xkd9
authored and
Harika
committed
updated
Signed-off-by: Harika <codewith3@gmail.com>
1 parent 208826c commit 3e967e3

16 files changed

Lines changed: 0 additions & 224 deletions

‎core/helm-charts/tgi/templates/ingress_eks.yaml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,15 @@
1-
<<<<<<< HEAD
21
# Copyright (C) 2025-2026 Intel Corporation
3-
=======
4-
# Copyright (C) 2024-2025 Intel Corporation
5-
>>>>>>> dell-deploy-1.4-nv
62
# SPDX-License-Identifier: Apache-2.0
73
{{- if .Values.ingress.enabled }}
84
apiVersion: networking.k8s.io/v1
95
kind: Ingress
106
metadata:
117
name: {{ include "tgi.fullname" . }}-ingress
12-
<<<<<<< HEAD
13-
namespace: {{- if .Values.apisix.enabled }}
14-
auth-apisix
15-
{{- else }}
16-
{{ .Values.ingress.namespace }}
17-
{{- end }}
18-
annotations:
19-
alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
20-
{{- if .Values.aws_certificate_arn }}
21-
alb.ingress.kubernetes.io/certificate-arn: '{{ .Values.aws_certificate_arn }}'
22-
{{- end }}
23-
alb.ingress.kubernetes.io/group.name: ei-eks
24-
=======
258
namespace: {{ .Values.ingress.namespace }}
269
annotations:
2710
alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
2811
alb.ingress.kubernetes.io/certificate-arn: "{{ default "" .Values.aws_certificate_arn }}"
2912
alb.ingress.kubernetes.io/group.name: keycloak-apisix
30-
>>>>>>> dell-deploy-1.4-nv
3113
alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS": 443}]'
3214
alb.ingress.kubernetes.io/scheme: internet-facing
3315
alb.ingress.kubernetes.io/target-type: ip

‎core/helm-charts/vllm/gaudi-values.yaml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
21
# Copyright (C) 2025-2026 Intel Corporation
3-
=======
4-
# Copyright (C) 2024-2025 Intel Corporation
5-
>>>>>>> dell-deploy-1.4-nv
62
# SPDX-License-Identifier: Apache-2.0
73

84
# User-configurable parameters (can be set via --set during helm install)
@@ -25,19 +21,13 @@ affinity:
2521
requiredDuringSchedulingIgnoredDuringExecution:
2622
nodeSelectorTerms:
2723
- matchExpressions:
28-
<<<<<<< HEAD
29-
- key: ei-inference-eligible
30-
operator: In
31-
values: ["true"]
32-
=======
3324
- key: role
3425
operator: In
3526
values: ["inference"]
3627
- matchExpressions:
3728
- key: role
3829
operator: In
3930
values: ["inference-gaudi"]
40-
>>>>>>> dell-deploy-1.4-nv
4131

4232

4333
runtime: "habana"

‎core/helm-charts/vllm/templates/apisixroutes.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
21
# Copyright (C) 2025-2026 Intel Corporation
3-
=======
4-
# Copyright (C) 2024-2025 Intel Corporation
5-
>>>>>>> dell-deploy-1.4-nv
62
# SPDX-License-Identifier: Apache-2.0
73
{{- if .Values.apisix.enabled }}
84
{{- $modelName := (default .Values.LLM_MODEL_ID .Values.SERVED_MODEL_NAME) | splitList "/" | last }}
@@ -37,11 +33,7 @@ spec:
3733
secretRef: {{ include "vllm.fullname" . }}-secret
3834
config:
3935
discovery: {{ .Values.oidc.discovery }}
40-
<<<<<<< HEAD
41-
{{- if or (eq .Values.platform "openshift") (eq .Values.platform "eks") }}
42-
=======
4336
{{- if eq .Values.platform "openshift" }}
44-
>>>>>>> dell-deploy-1.4-nv
4537
use_jwks: {{ .Values.oidc.use_jwks }}
4638
{{- else }}
4739
introspection_endpoint: {{ .Values.oidc.introspection_endpoint }}

‎core/helm-charts/vllm/templates/deployment.yaml‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
21
# Copyright (C) 2025-2026 Intel Corporation
3-
=======
4-
# Copyright (C) 2024-2025 Intel Corporation
5-
>>>>>>> dell-deploy-1.4-nv
62
# SPDX-License-Identifier: Apache-2.0
73
{{- $modelName := (default .Values.LLM_MODEL_ID .Values.SERVED_MODEL_NAME) }}
84
apiVersion: apps/v1
@@ -27,12 +23,9 @@ spec:
2723
balloon.balloons.resource-policy.nri.io: {{ .Values.cpu_balloon_annotation | quote }}
2824
{{- end }}
2925
{{- end }}
30-
<<<<<<< HEAD
31-
=======
3226
{{- with .Values.podAnnotations }}
3327
{{- toYaml . | nindent 8 }}
3428
{{- end }}
35-
>>>>>>> dell-deploy-1.4-nv
3629
labels:
3730
{{- include "vllm.selectorLabels" . | nindent 8 }}
3831
{{- if not .Values.accelDevice }}
@@ -65,20 +58,12 @@ spec:
6558
{{- if .Values.image.pullPolicy }}
6659
imagePullPolicy: {{ .Values.image.pullPolicy }}
6760
{{- end }}
68-
<<<<<<< HEAD
69-
# command:
70-
# - /bin/bash
71-
# - -c
72-
# - |
73-
# python3 -m vllm.entrypoints.openai.api_server --dtype {{ .Values.d_type }} --model {{ .Values.LLM_MODEL_ID }} --port {{ .Values.port }} --tensor-parallel-size {{ .Values.tensor_parallel_size }} --block-size {{ .Values.block_size }} --max-model-len {{ .Values.max_model_len }} --disable-log-requests
74-
=======
7561
{{- if eq .Values.accelDevice "nvidia" }}
7662
command:
7763
- python3
7864
- -m
7965
- vllm.entrypoints.openai.api_server
8066
{{- end }}
81-
>>>>>>> dell-deploy-1.4-nv
8267
args:
8368
{{- $modelConfig := (index .Values.modelConfigs $modelName | default dict) }}
8469
{{- $modelArgs := $modelConfig.extraCmdArgs | default .Values.defaultModelConfigs.extraCmdArgs }}
@@ -136,11 +121,6 @@ spec:
136121
memory: {{ .Values.memory | quote }}
137122
{{- end }}
138123
{{- end }}
139-
<<<<<<< HEAD
140-
{{- else }}
141-
limits:
142-
habana.ai/gaudi: {{ .Values.tensor_parallel_size | default (index .Values.modelConfigs .Values.LLM_MODEL_ID | default dict).tensor_parallel_size | default .Values.defaultModelConfigs.tensor_parallel_size | quote}}
143-
=======
144124
{{- else if eq .Values.accelDevice "gaudi" }}
145125
limits:
146126
habana.ai/gaudi: {{ .Values.tensor_parallel_size | default (index .Values.modelConfigs .Values.LLM_MODEL_ID | default dict).tensor_parallel_size | default .Values.defaultModelConfigs.tensor_parallel_size | quote}}
@@ -149,7 +129,6 @@ spec:
149129
nvidia.com/gpu: {{ .Values.gpuCount | default 1 | quote }}
150130
{{- else }}
151131
{{- toYaml .Values.resources | nindent 12 }}
152-
>>>>>>> dell-deploy-1.4-nv
153132
{{- end }}
154133
{{- end }}
155134

@@ -195,8 +174,4 @@ spec:
195174
{{- if not .Values.accelDevice }}
196175
# extra time to finish processing buffered requests on CPU before pod is forcibly terminated
197176
terminationGracePeriodSeconds: 120
198-
<<<<<<< HEAD
199-
{{- end }}
200-
=======
201177
{{- end }}
202-
>>>>>>> dell-deploy-1.4-nv

‎core/helm-charts/vllm/templates/ingress_eks.yaml‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,11 @@
1-
<<<<<<< HEAD
21
# Copyright (C) 2025-2026 Intel Corporation
3-
=======
4-
# Copyright (C) 2024-2025 Intel Corporation
5-
>>>>>>> dell-deploy-1.4-nv
62
# SPDX-License-Identifier: Apache-2.0
73
{{- if .Values.ingress.enabled }}
84
{{- $modelName := (default .Values.LLM_MODEL_ID .Values.SERVED_MODEL_NAME) | splitList "/" | last }}
95
apiVersion: networking.k8s.io/v1
106
kind: Ingress
117
metadata:
128
name: {{ include "vllm.fullname" . }}-ingress
13-
<<<<<<< HEAD
14-
namespace: {{- if .Values.apisix.enabled }}
15-
auth-apisix
16-
{{- else }}
17-
{{ .Values.ingress.namespace }}
18-
{{- end }}
19-
annotations:
20-
alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
21-
{{- if .Values.aws_certificate_arn }}
22-
alb.ingress.kubernetes.io/certificate-arn: '{{ .Values.aws_certificate_arn }}'
23-
{{- end }}
24-
alb.ingress.kubernetes.io/group.name: ei-eks
25-
alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS": 443}]'
26-
alb.ingress.kubernetes.io/scheme: internet-facing
27-
alb.ingress.kubernetes.io/target-type: ip
28-
=======
299
namespace: {{ .Values.ingress.namespace }}
3010
annotations:
3111
alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
@@ -35,7 +15,6 @@ metadata:
3515
alb.ingress.kubernetes.io/scheme: internet-facing
3616
alb.ingress.kubernetes.io/target-type: ip
3717
alb.ingress.kubernetes.io/group.order: '2'
38-
>>>>>>> dell-deploy-1.4-nv
3918
spec:
4019
ingressClassName: alb
4120
rules:

‎core/helm-charts/vllm/xeon-values.yaml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
21
# Copyright (C) 2025-2026 Intel Corporation
3-
=======
4-
# Copyright (C) 2024-2025 Intel Corporation
5-
>>>>>>> dell-deploy-1.4-nv
62
# SPDX-License-Identifier: Apache-2.0
73

84
# Xeon CPU-optimized override values for vLLM deployments
@@ -21,10 +17,6 @@ resources:
2117
cpu: "{{ .Values.cpu }}"
2218
memory: "{{ .Values.memory }}"
2319

24-
<<<<<<< HEAD
25-
=======
26-
27-
>>>>>>> dell-deploy-1.4-nv
2820
# CPU-specific configurations
2921
block_size: 128
3022
max_num_seqs: 256
@@ -44,11 +36,6 @@ affinity:
4436
requiredDuringSchedulingIgnoredDuringExecution:
4537
nodeSelectorTerms:
4638
- matchExpressions:
47-
<<<<<<< HEAD
48-
- key: ei-inference-eligible
49-
operator: In
50-
values: ["true"]
51-
=======
5239
- key: role
5340
operator: In
5441
values: ["inference"]
@@ -60,7 +47,6 @@ affinity:
6047
- key: role
6148
operator: In
6249
values: ["inference-cpu"]
63-
>>>>>>> dell-deploy-1.4-nv
6450

6551
# vLLM CPU environment variables
6652
VLLM_CPU_SGL_KERNEL: "1"
@@ -283,8 +269,4 @@ defaultModelConfigs:
283269
"256",
284270
]
285271
tensor_parallel_size: "{{ .Values.tensor_parallel_size }}"
286-
<<<<<<< HEAD
287-
pipeline_parallel_size: "{{ .Values.pipeline_parallel_size }}"
288-
=======
289272
pipeline_parallel_size: "{{ .Values.pipeline_parallel_size }}"
290-
>>>>>>> dell-deploy-1.4-nv

‎core/inference-stack-deploy.sh‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ CYAN=$(tput setaf 6)
88
NC=$(tput sgr0)
99

1010

11-
<<<<<<< HEAD
1211
# Copyright (C) 2025-2026 Intel Corporation
13-
=======
14-
# Copyright (C) 2024-2025 Intel Corporation
15-
>>>>>>> dell-deploy-1.4-nv
1612
# SPDX-License-Identifier: Apache-2.0
1713

1814
# Permission is granted for recipient to internally use and modify this software for purposes of benchmarking and testing on Intel architectures.
@@ -122,10 +118,7 @@ source "$SCRIPT_DIR/lib/cluster/drv-fw-update.sh"
122118
# Components deployment
123119
source "$SCRIPT_DIR/lib/components/kubernetes-setup.sh"
124120
source "$SCRIPT_DIR/lib/components/intel-base-operator.sh"
125-
<<<<<<< HEAD
126-
=======
127121
source "$SCRIPT_DIR/lib/components/nvidia-operator.sh"
128-
>>>>>>> dell-deploy-1.4-nv
129122
source "$SCRIPT_DIR/lib/components/ingress-controller.sh"
130123
source "$SCRIPT_DIR/lib/components/keycloak-controller.sh"
131124
source "$SCRIPT_DIR/lib/components/genai-gateway-controller.sh"

‎core/inventory/inference-config.cfg‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ keycloak_admin_user=your-keycloak-admin-user
66
keycloak_admin_password=changeme
77
hugging_face_token=your_hugging_face_token
88
hugging_face_token_falcon3=your_hugging_face_token
9-
<<<<<<< HEAD
10-
models=11
11-
=======
129
models=
13-
>>>>>>> dell-deploy-1.4-nv
1410
cpu_or_gpu=cpu
1511
vault_pass_code=place-holder-123
1612
deploy_kubernetes_fresh=on
@@ -21,11 +17,4 @@ deploy_observability=off
2117
deploy_llm_models=on
2218
deploy_ceph=off
2319
deploy_istio=off
24-
<<<<<<< HEAD
2520
uninstall_ceph=off
26-
27-
# Agentic AI Plugin
28-
deploy_agenticai_plugin=off
29-
=======
30-
uninstall_ceph=off
31-
>>>>>>> dell-deploy-1.4-nv

‎core/inventory/metadata/addons.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
---
2-
<<<<<<< HEAD
32
# Copyright (C) 2025-2026 Intel Corporation
4-
=======
5-
# Copyright (C) 2024-2025 Intel Corporation
6-
>>>>>>> dell-deploy-1.4-nv
73
# SPDX-License-Identifier: Apache-2.0
84
# Kubernetes dashboard
95
# RBAC required. see docs/getting-started.md for access details.

‎core/inventory/metadata/all.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
---
2-
<<<<<<< HEAD
32
# Copyright (C) 2025-2026 Intel Corporation
4-
=======
5-
# Copyright (C) 2024-2025 Intel Corporation
6-
>>>>>>> dell-deploy-1.4-nv
73
# SPDX-License-Identifier: Apache-2.0
84
## Directory where the binaries will be installed
95
bin_dir: /usr/local/bin

0 commit comments

Comments
 (0)