Skip to content

Commit f628f6c

Browse files
varunrsekarvarunrsekar
committed
Use v1 DRA APIs
Signed-off-by: Varun Ramachandra Sekar <[email protected]>
1 parent a64782a commit f628f6c

File tree

1,490 files changed

+140780
-34668
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,490 files changed

+140780
-34668
lines changed

‎api/apps/v1alpha1/nimservice_types.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,7 +1638,7 @@ func (n *NIMService) GetInferenceServiceParams(
16381638
delete(params.PodAnnotations, utils.NvidiaAnnotationParentSpecHashKey)
16391639

16401640
// Set template spec
1641-
if !n.IsAutoScalingEnabled() || deploymentMode != kserveconstants.RawDeployment {
1641+
if !n.IsAutoScalingEnabled() || (deploymentMode != kserveconstants.LegacyRawDeployment && deploymentMode != kserveconstants.Standard) {
16421642
params.MinReplicas = n.GetReplicas()
16431643
} else {
16441644
params.Annotations[kserveconstants.AutoscalerClass] = string(kserveconstants.AutoscalerClassHPA)
@@ -1708,7 +1708,7 @@ func (n *NIMService) GetInferenceServiceParams(
17081708

17091709
// GetInferenceServiceLivenessProbe returns liveness probe for the NIMService container.
17101710
func (n *NIMService) GetInferenceServiceLivenessProbe(modeType kserveconstants.DeploymentModeType) *corev1.Probe {
1711-
if modeType == kserveconstants.RawDeployment {
1711+
if modeType == kserveconstants.LegacyRawDeployment || modeType == kserveconstants.Standard {
17121712
if n.Spec.LivenessProbe.Probe == nil {
17131713
return n.GetDefaultLivenessProbe()
17141714
}
@@ -1744,7 +1744,7 @@ func (n *NIMService) GetInferenceServiceLivenessProbe(modeType kserveconstants.D
17441744

17451745
// GetInferenceServiceReadinessProbe returns readiness probe for the NIMService container.
17461746
func (n *NIMService) GetInferenceServiceReadinessProbe(modeType kserveconstants.DeploymentModeType) *corev1.Probe {
1747-
if modeType == kserveconstants.RawDeployment {
1747+
if modeType == kserveconstants.LegacyRawDeployment || modeType == kserveconstants.Standard {
17481748
if n.Spec.ReadinessProbe.Probe == nil {
17491749
return n.GetDefaultReadinessProbe()
17501750
}
@@ -1780,7 +1780,7 @@ func (n *NIMService) GetInferenceServiceReadinessProbe(modeType kserveconstants.
17801780

17811781
// GetInferenceServiceStartupProbe returns startup probe for the NIMService container.
17821782
func (n *NIMService) GetInferenceServiceStartupProbe(modeType kserveconstants.DeploymentModeType) *corev1.Probe {
1783-
if modeType == kserveconstants.RawDeployment {
1783+
if modeType == kserveconstants.LegacyRawDeployment || modeType == kserveconstants.Standard {
17841784
if n.Spec.StartupProbe.Probe == nil {
17851785
return n.GetDefaultStartupProbe()
17861786
}
@@ -1819,7 +1819,7 @@ func (n *NIMService) GetInferenceServicePorts(modeType kserveconstants.Deploymen
18191819
ports := []corev1.ContainerPort{}
18201820

18211821
// Setup container ports for nimservice
1822-
if modeType == kserveconstants.RawDeployment {
1822+
if modeType == kserveconstants.LegacyRawDeployment || modeType == kserveconstants.Standard {
18231823
ports = append(ports, corev1.ContainerPort{
18241824
Name: DefaultNamedPortAPI,
18251825
Protocol: corev1.ProtocolTCP,

‎bundle/manifests/apps.nvidia.com_nemocustomizers.yaml‎

Lines changed: 126 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -616,8 +616,8 @@ spec:
616616
most preferred is the one with the greatest sum of weights, i.e.
617617
for each node that meets all of the scheduling requirements (resource
618618
request, requiredDuringScheduling anti-affinity expressions, etc.),
619-
compute a sum by iterating through the elements of this field and adding
620-
"weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
619+
compute a sum by iterating through the elements of this field and subtracting
620+
"weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
621621
node(s) with the highest sum are the most preferred.
622622
items:
623623
description: The weights of all of the matched WeightedPodAffinityTerm
@@ -1054,7 +1054,9 @@ spec:
10541054
a Container.
10551055
properties:
10561056
name:
1057-
description: Name of the environment variable. Must be a C_IDENTIFIER.
1057+
description: |-
1058+
Name of the environment variable.
1059+
May consist of any printable ASCII characters except '='.
10581060
type: string
10591061
value:
10601062
description: |-
@@ -1112,6 +1114,43 @@ spec:
11121114
- fieldPath
11131115
type: object
11141116
x-kubernetes-map-type: atomic
1117+
fileKeyRef:
1118+
description: |-
1119+
FileKeyRef selects a key of the env file.
1120+
Requires the EnvFiles feature gate to be enabled.
1121+
properties:
1122+
key:
1123+
description: |-
1124+
The key within the env file. An invalid key will prevent the pod from starting.
1125+
The keys defined within a source may consist of any printable ASCII characters except '='.
1126+
During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
1127+
type: string
1128+
optional:
1129+
default: false
1130+
description: |-
1131+
Specify whether the file or its key must be defined. If the file or key
1132+
does not exist, then the env var is not published.
1133+
If optional is set to true and the specified key does not exist,
1134+
the environment variable will not be set in the Pod's containers.
1135+
1136+
If optional is set to false and the specified key does not exist,
1137+
an error will be returned during Pod creation.
1138+
type: boolean
1139+
path:
1140+
description: |-
1141+
The path within the volume from which to select the file.
1142+
Must be relative and may not contain the '..' path or start with '..'.
1143+
type: string
1144+
volumeName:
1145+
description: The name of the volume mount containing
1146+
the env file.
1147+
type: string
1148+
required:
1149+
- key
1150+
- path
1151+
- volumeName
1152+
type: object
1153+
x-kubernetes-map-type: atomic
11151154
resourceFieldRef:
11161155
description: |-
11171156
Selects a resource of the container: only resources limits and requests
@@ -2127,7 +2166,7 @@ spec:
21272166
Claims lists the names of resources, defined in spec.resourceClaims,
21282167
that are used by this container.
21292168
2130-
This is an alpha field and requires enabling the
2169+
This field depends on the
21312170
DynamicResourceAllocation feature gate.
21322171
21332172
This field is immutable. It can only be set for containers.
@@ -3450,8 +3489,8 @@ spec:
34503489
most preferred is the one with the greatest sum of weights, i.e.
34513490
for each node that meets all of the scheduling requirements (resource
34523491
request, requiredDuringScheduling anti-affinity expressions, etc.),
3453-
compute a sum by iterating through the elements of this field and adding
3454-
"weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
3492+
compute a sum by iterating through the elements of this field and subtracting
3493+
"weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
34553494
node(s) with the highest sum are the most preferred.
34563495
items:
34573496
description: The weights of all of the matched WeightedPodAffinityTerm
@@ -3814,8 +3853,9 @@ spec:
38143853
in a Container.
38153854
properties:
38163855
name:
3817-
description: Name of the environment variable. Must be a
3818-
C_IDENTIFIER.
3856+
description: |-
3857+
Name of the environment variable.
3858+
May consist of any printable ASCII characters except '='.
38193859
type: string
38203860
value:
38213861
description: |-
@@ -3873,6 +3913,43 @@ spec:
38733913
- fieldPath
38743914
type: object
38753915
x-kubernetes-map-type: atomic
3916+
fileKeyRef:
3917+
description: |-
3918+
FileKeyRef selects a key of the env file.
3919+
Requires the EnvFiles feature gate to be enabled.
3920+
properties:
3921+
key:
3922+
description: |-
3923+
The key within the env file. An invalid key will prevent the pod from starting.
3924+
The keys defined within a source may consist of any printable ASCII characters except '='.
3925+
During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
3926+
type: string
3927+
optional:
3928+
default: false
3929+
description: |-
3930+
Specify whether the file or its key must be defined. If the file or key
3931+
does not exist, then the env var is not published.
3932+
If optional is set to true and the specified key does not exist,
3933+
the environment variable will not be set in the Pod's containers.
3934+
3935+
If optional is set to false and the specified key does not exist,
3936+
an error will be returned during Pod creation.
3937+
type: boolean
3938+
path:
3939+
description: |-
3940+
The path within the volume from which to select the file.
3941+
Must be relative and may not contain the '..' path or start with '..'.
3942+
type: string
3943+
volumeName:
3944+
description: The name of the volume mount containing
3945+
the env file.
3946+
type: string
3947+
required:
3948+
- key
3949+
- path
3950+
- volumeName
3951+
type: object
3952+
x-kubernetes-map-type: atomic
38763953
resourceFieldRef:
38773954
description: |-
38783955
Selects a resource of the container: only resources limits and requests
@@ -3988,8 +4065,9 @@ spec:
39884065
in a Container.
39894066
properties:
39904067
name:
3991-
description: Name of the environment variable. Must be a
3992-
C_IDENTIFIER.
4068+
description: |-
4069+
Name of the environment variable.
4070+
May consist of any printable ASCII characters except '='.
39934071
type: string
39944072
value:
39954073
description: |-
@@ -4047,6 +4125,43 @@ spec:
40474125
- fieldPath
40484126
type: object
40494127
x-kubernetes-map-type: atomic
4128+
fileKeyRef:
4129+
description: |-
4130+
FileKeyRef selects a key of the env file.
4131+
Requires the EnvFiles feature gate to be enabled.
4132+
properties:
4133+
key:
4134+
description: |-
4135+
The key within the env file. An invalid key will prevent the pod from starting.
4136+
The keys defined within a source may consist of any printable ASCII characters except '='.
4137+
During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
4138+
type: string
4139+
optional:
4140+
default: false
4141+
description: |-
4142+
Specify whether the file or its key must be defined. If the file or key
4143+
does not exist, then the env var is not published.
4144+
If optional is set to true and the specified key does not exist,
4145+
the environment variable will not be set in the Pod's containers.
4146+
4147+
If optional is set to false and the specified key does not exist,
4148+
an error will be returned during Pod creation.
4149+
type: boolean
4150+
path:
4151+
description: |-
4152+
The path within the volume from which to select the file.
4153+
Must be relative and may not contain the '..' path or start with '..'.
4154+
type: string
4155+
volumeName:
4156+
description: The name of the volume mount containing
4157+
the env file.
4158+
type: string
4159+
required:
4160+
- key
4161+
- path
4162+
- volumeName
4163+
type: object
4164+
x-kubernetes-map-type: atomic
40504165
resourceFieldRef:
40514166
description: |-
40524167
Selects a resource of the container: only resources limits and requests
@@ -4469,7 +4584,7 @@ spec:
44694584
Claims lists the names of resources, defined in spec.resourceClaims,
44704585
that are used by this container.
44714586
4472-
This is an alpha field and requires enabling the
4587+
This field depends on the
44734588
DynamicResourceAllocation feature gate.
44744589
44754590
This field is immutable. It can only be set for containers.

‎bundle/manifests/apps.nvidia.com_nemodatastores.yaml‎

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -616,8 +616,8 @@ spec:
616616
most preferred is the one with the greatest sum of weights, i.e.
617617
for each node that meets all of the scheduling requirements (resource
618618
request, requiredDuringScheduling anti-affinity expressions, etc.),
619-
compute a sum by iterating through the elements of this field and adding
620-
"weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
619+
compute a sum by iterating through the elements of this field and subtracting
620+
"weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
621621
node(s) with the highest sum are the most preferred.
622622
items:
623623
description: The weights of all of the matched WeightedPodAffinityTerm
@@ -1034,7 +1034,9 @@ spec:
10341034
a Container.
10351035
properties:
10361036
name:
1037-
description: Name of the environment variable. Must be a C_IDENTIFIER.
1037+
description: |-
1038+
Name of the environment variable.
1039+
May consist of any printable ASCII characters except '='.
10381040
type: string
10391041
value:
10401042
description: |-
@@ -1092,6 +1094,43 @@ spec:
10921094
- fieldPath
10931095
type: object
10941096
x-kubernetes-map-type: atomic
1097+
fileKeyRef:
1098+
description: |-
1099+
FileKeyRef selects a key of the env file.
1100+
Requires the EnvFiles feature gate to be enabled.
1101+
properties:
1102+
key:
1103+
description: |-
1104+
The key within the env file. An invalid key will prevent the pod from starting.
1105+
The keys defined within a source may consist of any printable ASCII characters except '='.
1106+
During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
1107+
type: string
1108+
optional:
1109+
default: false
1110+
description: |-
1111+
Specify whether the file or its key must be defined. If the file or key
1112+
does not exist, then the env var is not published.
1113+
If optional is set to true and the specified key does not exist,
1114+
the environment variable will not be set in the Pod's containers.
1115+
1116+
If optional is set to false and the specified key does not exist,
1117+
an error will be returned during Pod creation.
1118+
type: boolean
1119+
path:
1120+
description: |-
1121+
The path within the volume from which to select the file.
1122+
Must be relative and may not contain the '..' path or start with '..'.
1123+
type: string
1124+
volumeName:
1125+
description: The name of the volume mount containing
1126+
the env file.
1127+
type: string
1128+
required:
1129+
- key
1130+
- path
1131+
- volumeName
1132+
type: object
1133+
x-kubernetes-map-type: atomic
10951134
resourceFieldRef:
10961135
description: |-
10971136
Selects a resource of the container: only resources limits and requests
@@ -1806,7 +1845,7 @@ spec:
18061845
Claims lists the names of resources, defined in spec.resourceClaims,
18071846
that are used by this container.
18081847
1809-
This is an alpha field and requires enabling the
1848+
This field depends on the
18101849
DynamicResourceAllocation feature gate.
18111850
18121851
This field is immutable. It can only be set for containers.

0 commit comments

Comments
 (0)