Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Revert "Added a variable for adding GPU Operator Namespace Labels" #15

Merged
merged 1 commit into from
Oct 18, 2023
Merged

Revert "Added a variable for adding GPU Operator Namespace Labels" #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion gke/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ No modules.
| <a name="input_gpu_min_node_count"></a> [gpu\_min\_node\_count](#input\_gpu\_min\_node\_count) | Min number of GPU nodes in GPU nodepool | `string` | `"2"` | no |
| <a name="input_gpu_operator_driver_version"></a> [gpu\_operator\_driver\_version](#input\_gpu\_operator\_driver\_version) | The NVIDIA Driver version deployed with GPU Operator. Defaults to latest available. Not set when `nvaie` is set to true | `string` | `"535.104.05"` | no |
| <a name="input_gpu_operator_namespace"></a> [gpu\_operator\_namespace](#input\_gpu\_operator\_namespace) | The namespace to deploy the NVIDIA GPU operator intov | `string` | `"gpu-operator"` | no |
| <a name="input_gpu_operator_namespace_labels"></a> [gpu\_operator\_namespace\_labels](#input\_gpu\_operator\_namespace\_labels) | Additional labels to be added to the GPU Operator namespace | `map(string)` | `{}` | no |
| <a name="input_gpu_operator_version"></a> [gpu\_operator\_version](#input\_gpu\_operator\_version) | Version of the GPU Operator to deploy. Defaults to latest available. Not set when `nvaie` is set to `true` | `string` | `"v23.6.1"` | no |
| <a name="input_gpu_type"></a> [gpu\_type](#input\_gpu\_type) | GPU SKU To attach to Holoscan GPU Node (eg. nvidia-tesla-k80) | `string` | `"nvidia-tesla-v100"` | no |
| <a name="input_network"></a> [network](#input\_network) | Network CIDR for VPC | `string` | `""` | no |
Expand Down
5 changes: 1 addition & 4 deletions gke/examples/cnpack/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@ CNPack Configuration
module "holoscan-ready-gke" {
source = "../../" # Can also be the git URL+tag when running remotely
cluster_name = var.cluster_name
project_id = var.project_id
project_id = var.project_id
region = var.region # Can be any region
node_zones = var.node_zones # Can be any region but ensure your desired machine types/gpus exist
gpu_operator_namespace_labels = {
"platform.nvidia.com/monitoring" = "enabled"
}
}

6 changes: 2 additions & 4 deletions gke/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,10 @@ resource "kubernetes_namespace_v1" "gpu-operator" {
name = "gpu-operator"
}

labels = merge({
labels = {
cluster = var.cluster_name
managed_by = "Terraform"
},
var.gpu_operator_namespace_labels
)
}

name = var.gpu_operator_namespace
}
Expand Down
1 change: 0 additions & 1 deletion gke/terraform.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
# gpu_min_node_count = "2"
# gpu_operator_driver_version = "535.104.05"
# gpu_operator_namespace = "gpu-operator"
# gpu_operator_namespace_labels = {}
# gpu_operator_version = "v23.6.1"
# gpu_type = "nvidia-tesla-v100"
# network = ""
Expand Down
7 changes: 0 additions & 7 deletions gke/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,6 @@ variable "gpu_operator_namespace" {
description = "The namespace to deploy the NVIDIA GPU operator intov"
}


variable "gpu_operator_namespace_labels" {
description = "Additional labels to be added to the GPU Operator namespace"
type = map(string)
default = {}
}

variable "nvaie" {
type = bool
default = false
Expand Down