Skip to content

Commit

Permalink
devcontainer: replace VAULT_HOST with AWS_ROLE_ARN (#624)
Browse files Browse the repository at this point in the history
This PR is replacing the `VAULT_HOST` variable with `AWS_ROLE_ARN`. This
is required to use the new token service to get AWS credentials.

---------

Signed-off-by: Jordan Jacobelli <[email protected]>
  • Loading branch information
jjacobelli authored Oct 25, 2024
1 parent dc0f9fc commit 53cc381
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 61 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/cuda11.8-gcc11/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-gcc11-cuda11.8-ubuntu22.04",
"image": "rapidsai/devcontainers:24.12-cpp-gcc11-cuda11.8-ubuntu22.04",
"hostRequirements": {
"gpu": true
},
Expand All @@ -12,7 +12,7 @@
"containerEnv": {
"SCCACHE_REGION": "us-east-2",
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda11.8-gcc11",
"CUCO_CUDA_VERSION": "11.8",
Expand Down
42 changes: 0 additions & 42 deletions .devcontainer/cuda12.5-gcc12/devcontainer.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.06-cpp-gcc12-cuda12.4-ubuntu22.04",
"image": "rapidsai/devcontainers:24.12-cpp-gcc12-cuda12.6-ubuntu22.04",
"hostRequirements": {
"gpu": true
},
Expand All @@ -12,10 +12,10 @@
"containerEnv": {
"SCCACHE_REGION": "us-east-2",
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.4-gcc12",
"CUCO_CUDA_VERSION": "12.4",
"DEVCONTAINER_NAME": "cuda12.6-gcc12",
"CUCO_CUDA_VERSION": "12.6",
"CUCO_HOST_COMPILER": "gcc",
"CUCO_HOST_COMPILER_VERSION": "12"
},
Expand All @@ -38,5 +38,5 @@
}
}
},
"name": "cuda12.4-gcc12"
"name": "cuda12.6-gcc12"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-gcc13-cuda12.5-ubuntu22.04",
"image": "rapidsai/devcontainers:24.12-cpp-gcc13-cuda12.6-ubuntu22.04",
"hostRequirements": {
"gpu": true
},
Expand All @@ -12,10 +12,10 @@
"containerEnv": {
"SCCACHE_REGION": "us-east-2",
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.5-gcc13",
"CUCO_CUDA_VERSION": "12.5",
"DEVCONTAINER_NAME": "cuda12.6-gcc13",
"CUCO_CUDA_VERSION": "12.6",
"CUCO_HOST_COMPILER": "gcc",
"CUCO_HOST_COMPILER_VERSION": "13"
},
Expand All @@ -38,5 +38,5 @@
}
}
},
"name": "cuda12.5-gcc13"
"name": "cuda12.6-gcc13"
}
10 changes: 5 additions & 5 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-gcc13-cuda12.5-ubuntu22.04",
"image": "rapidsai/devcontainers:24.12-cpp-gcc13-cuda12.6-ubuntu22.04",
"hostRequirements": {
"gpu": true
},
Expand All @@ -12,10 +12,10 @@
"containerEnv": {
"SCCACHE_REGION": "us-east-2",
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.5-gcc13",
"CUCO_CUDA_VERSION": "12.5",
"DEVCONTAINER_NAME": "cuda12.6-gcc13",
"CUCO_CUDA_VERSION": "12.6",
"CUCO_HOST_COMPILER": "gcc",
"CUCO_HOST_COMPILER_VERSION": "13"
},
Expand All @@ -38,5 +38,5 @@
}
}
},
"name": "cuda12.5-gcc13"
"name": "cuda12.6-gcc13"
}
4 changes: 2 additions & 2 deletions ci/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.

cuda_oldest: &cuda_oldest '11.8'
cuda_newest: &cuda_newest '12.5'
cuda_newest: &cuda_newest '12.6'

# The GPUs to test on
# Note: This assumes that the appropriate gpu_build_archs are set to include building for the GPUs listed here
Expand All @@ -23,7 +23,7 @@ gpus:
- 'v100'

# The version of the devcontainer images to use from https://hub.docker.com/r/rapidsai/devcontainers
devcontainer_version: '24.10'
devcontainer_version: '24.12'

# Each environment below will generate a unique build/test job
# See the "compute-matrix" job in the workflow for how this is parsed and used
Expand Down

0 comments on commit 53cc381

Please sign in to comment.