-
Notifications
You must be signed in to change notification settings - Fork 59
feat(nvca): publish storage capability catalog #1334
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
balajinvda
wants to merge
2
commits into
main
Choose a base branch
from
feat/nvca-storage-capability-catalog
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
175 changes: 175 additions & 0 deletions
175
deploy/helm/nvca-operator/nvca-operator/files/nvcf-storage-capabilities-v1alpha1.schema.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,175 @@ | ||
| { | ||
| "$comment": "SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. SPDX-License-Identifier: Apache-2.0", | ||
| "$schema": "https://json-schema.org/draft/2020-12/schema", | ||
| "$id": "https://nvcf.nvidia.com/schemas/storage-capability-catalog-v1alpha1.json", | ||
| "title": "NVCF storage capability catalog", | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "required": ["apiVersion", "kind", "drivers"], | ||
| "properties": { | ||
| "apiVersion": {"const": "storage.nvcf.nvidia.com/v1alpha1"}, | ||
| "kind": {"const": "StorageCapabilityCatalog"}, | ||
| "drivers": { | ||
| "type": "object", | ||
| "minProperties": 1, | ||
| "propertyNames": {"type": "string", "minLength": 1, "pattern": "\\S"}, | ||
| "properties": { | ||
| "nvmesh-csi.excelero.com": {"$ref": "#/$defs/nvmeshDriver"} | ||
| }, | ||
| "additionalProperties": {"$ref": "#/$defs/nonNVMeshDriver"} | ||
| } | ||
| }, | ||
| "$defs": { | ||
| "accessMode": { | ||
| "type": "string", | ||
| "enum": ["ReadWriteOnce", "ReadOnlyMany", "ReadWriteMany"] | ||
| }, | ||
| "readerMountOption": { | ||
| "type": "string", | ||
| "minLength": 1, | ||
| "pattern": "^\\S(?:.*\\S)?$" | ||
| }, | ||
| "regularTransitionStrategy": { | ||
| "type": "string", | ||
| "enum": ["disabled", "roxReadOnly", "rwxReadOnly"] | ||
| }, | ||
| "helmTransitionStrategy": { | ||
| "type": "string", | ||
| "enum": ["disabled", "roxReadOnly"] | ||
| }, | ||
| "transitions": { | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "required": ["regularModelCache", "helmModelCache"], | ||
| "properties": { | ||
| "regularModelCache": {"$ref": "#/$defs/regularTransitionStrategy"}, | ||
| "helmModelCache": {"$ref": "#/$defs/helmTransitionStrategy"} | ||
| } | ||
| }, | ||
| "driver": { | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "required": ["provider", "accessModes", "readerMountOptions", "transitions"], | ||
| "properties": { | ||
| "provider": {"type": "string", "minLength": 1, "pattern": "\\S"}, | ||
| "accessModes": { | ||
| "type": "array", | ||
| "uniqueItems": true, | ||
| "items": {"$ref": "#/$defs/accessMode"} | ||
| }, | ||
| "readerMountOptions": { | ||
| "type": "array", | ||
| "uniqueItems": true, | ||
| "items": {"$ref": "#/$defs/readerMountOption"}, | ||
| "allOf": [ | ||
| { | ||
| "not": { | ||
| "allOf": [ | ||
| {"contains": {"const": "ro"}}, | ||
| {"contains": {"const": "rw"}} | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "not": { | ||
| "allOf": [ | ||
| {"contains": {"const": "recovery"}}, | ||
| {"contains": {"const": "norecovery"}} | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "not": { | ||
| "allOf": [ | ||
| {"contains": {"const": "uuid"}}, | ||
| {"contains": {"const": "nouuid"}} | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "transitions": {"$ref": "#/$defs/transitions"} | ||
| }, | ||
| "allOf": [ | ||
| { | ||
| "if": { | ||
| "properties": { | ||
| "transitions": { | ||
| "anyOf": [ | ||
| { | ||
| "properties": {"regularModelCache": {"const": "roxReadOnly"}}, | ||
| "required": ["regularModelCache"] | ||
| }, | ||
| { | ||
| "properties": {"helmModelCache": {"const": "roxReadOnly"}}, | ||
| "required": ["helmModelCache"] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "required": ["transitions"] | ||
| }, | ||
| "then": { | ||
| "properties": { | ||
| "accessModes": { | ||
| "allOf": [ | ||
| {"contains": {"const": "ReadWriteOnce"}}, | ||
| {"contains": {"const": "ReadOnlyMany"}} | ||
| ] | ||
| }, | ||
| "readerMountOptions": { | ||
| "allOf": [ | ||
| {"contains": {"const": "ro"}}, | ||
| {"contains": {"const": "norecovery"}}, | ||
| {"contains": {"const": "nouuid"}} | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "if": { | ||
| "properties": { | ||
| "transitions": { | ||
| "properties": {"regularModelCache": {"const": "rwxReadOnly"}}, | ||
| "required": ["regularModelCache"] | ||
| } | ||
| }, | ||
| "required": ["transitions"] | ||
| }, | ||
| "then": { | ||
| "properties": { | ||
| "accessModes": {"contains": {"const": "ReadWriteMany"}}, | ||
| "readerMountOptions": {"maxItems": 0} | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "nvmeshDriver": { | ||
| "allOf": [ | ||
| {"$ref": "#/$defs/driver"}, | ||
| { | ||
| "properties": { | ||
| "provider": {"const": "nvmesh"} | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "nonNVMeshDriver": { | ||
| "allOf": [ | ||
| {"$ref": "#/$defs/driver"}, | ||
| { | ||
| "properties": { | ||
| "transitions": { | ||
| "properties": { | ||
| "regularModelCache": {"enum": ["disabled", "rwxReadOnly"]}, | ||
| "helmModelCache": {"const": "disabled"} | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
68 changes: 68 additions & 0 deletions
68
deploy/helm/nvca-operator/nvca-operator/files/nvcf-storage-capabilities-v1alpha1.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| # SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # This public catalog is owned by NVCA and installed with the NVCA chart. | ||
| # accessModes lists only modes demonstrated for the exact tested provider. | ||
| # readerMountOptions lists options for read-only reader PVs that NVCA creates | ||
| # or rewrites. rwxReadOnly mounts the shared claim read-only and uses none. | ||
| # A transition value is a closed enum, not free text. A strategy name means | ||
| # enabled; disabled means the workflow is unsupported. | ||
| # A disabled transition means that the end-to-end workflow is not qualified. | ||
| # The strict loader validates this catalog. Runtime reconciliation does not | ||
| # consume it until the storage-selection change is released. | ||
| apiVersion: storage.nvcf.nvidia.com/v1alpha1 | ||
| kind: StorageCapabilityCatalog | ||
| drivers: | ||
| nvmesh-csi.excelero.com: | ||
| provider: nvmesh | ||
| accessModes: | ||
| - ReadWriteOnce | ||
| - ReadOnlyMany | ||
| readerMountOptions: | ||
| - ro | ||
| - norecovery | ||
| - nouuid | ||
| transitions: | ||
| regularModelCache: roxReadOnly | ||
| helmModelCache: roxReadOnly | ||
| csi.weka.io: | ||
| provider: weka | ||
| # Fresh RWX and ROX claims were tested. Cross-namespace cache lifecycle is | ||
| # not yet qualified, so both transitions remain disabled. | ||
| accessModes: | ||
| - ReadWriteMany | ||
| - ReadOnlyMany | ||
| readerMountOptions: [] | ||
| transitions: | ||
| regularModelCache: disabled | ||
| helmModelCache: disabled | ||
| fss.csi.oraclecloud.com: | ||
| provider: ociFss | ||
| # Only an RWX claim was tested. Its readers used read-only Pod mounts; that | ||
| # is not evidence that a ReadOnlyMany claim is supported. | ||
| accessModes: | ||
| - ReadWriteMany | ||
| readerMountOptions: [] | ||
| transitions: | ||
| regularModelCache: disabled | ||
| helmModelCache: disabled | ||
| lustre.csi.oraclecloud.com: | ||
| provider: ociLustre | ||
| # No PVC access mode has been qualified in an NVCF cache workflow. | ||
| accessModes: [] | ||
| readerMountOptions: [] | ||
| transitions: | ||
| regularModelCache: disabled | ||
| helmModelCache: disabled |
30 changes: 30 additions & 0 deletions
30
deploy/helm/nvca-operator/nvca-operator/templates/storage-capabilities-configmap.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| # SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| {{- $catalogPath := "files/nvcf-storage-capabilities-v1alpha1.yaml" -}} | ||
| {{- $catalog := .Files.Get $catalogPath -}} | ||
| {{- if not $catalog -}} | ||
| {{- fail (printf "required NVCF storage capability catalog %s is missing" $catalogPath) -}} | ||
| {{- end }} | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: nvcf-storage-capabilities | ||
| namespace: {{ .Release.Namespace }} | ||
| labels: | ||
| {{- include "nvcaop.labels" . | nindent 4 }} | ||
| data: | ||
| storage-provider-capabilities.yaml: | | ||
| {{- $catalog | nindent 4 }} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🗄️ Data Integrity & Integration | 🟡 Minor | ⚡ Quick win
Reject the NVMesh provider in the non-NVMesh branch.
nonNVMeshDriverdoes not excludeprovider: nvmesh. A different provisioner key can therefore declare the NVMesh provider and use non-NVMesh transition rules. Rejectnvmeshin this branch.deploy/helm/nvca-operator/nvca-operator/files/nvcf-storage-capabilities-v1alpha1.schema.json#L163-L166: add aproviderconstraint that rejects"nvmesh".src/compute-plane-services/nvca/deployments/nvca-operator/files/nvcf-storage-capabilities-v1alpha1.schema.json#L163-L166: add the same constraint to preserve chart parity.📍 Affects 2 files
deploy/helm/nvca-operator/nvca-operator/files/nvcf-storage-capabilities-v1alpha1.schema.json#L163-L166(this comment)src/compute-plane-services/nvca/deployments/nvca-operator/files/nvcf-storage-capabilities-v1alpha1.schema.json#L163-L166🤖 Prompt for AI Agents