Skip to content

Commit ca87986

Browse files
committed
chore: set janitor value via env vars
1 parent 2d6905d commit ca87986

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

.github/workflows/integration-gcp.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ jobs:
104104
id: apps
105105
if: steps.client.outcome == 'success'
106106
shell: bash
107+
env:
108+
GCP_PROJECT_ID: "${{ env.TF_VAR_project_id }}"
109+
GCP_ZONE: "${{ env.TF_VAR_zone }}"
110+
GCP_SERVICE_ACCOUNT: "${{ env.SERVICE_ACCOUNT }}"
107111
run: tests/uat/install-apps.sh
108112

109113
# Test

tests/uat/install-apps.sh

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,10 @@ CERT_MANAGER_VERSION=$(yq eval '.cluster.cert_manager' "$VERSIONS_FILE")
3636

3737
# Configuration
3838
CLUSTER_NAME="${CLUSTER_NAME:-nvsentinel-uat}"
39-
AWS_REGION="${AWS_REGION:-us-east-1}"
4039
CSP="${CSP:-kind}" # Default to kind for local development
4140
NVSENTINEL_VERSION="${NVSENTINEL_VERSION:-}"
4241
FAKE_GPU_NODE_COUNT="${FAKE_GPU_NODE_COUNT:-10}"
43-
4442
VALUES_DIR="${SCRIPT_DIR}/${CSP}"
45-
4643
PROMETHEUS_VALUES="${VALUES_DIR}/prometheus-operator-values.yaml"
4744
GPU_OPERATOR_VALUES="${VALUES_DIR}/gpu-operator-values.yaml"
4845
CERT_MANAGER_VALUES="${VALUES_DIR}/cert-manager-values.yaml"
@@ -51,6 +48,14 @@ NVSENTINEL_CHART="${REPO_ROOT}/distros/kubernetes/nvsentinel"
5148
RESOURCE_QUOTA_RESOURCE="${VALUES_DIR}/resource-quota.yaml"
5249
GCP_COS_GPU_DS="https://raw.githubusercontent.com/GoogleCloudPlatform/container-engine-accelerators/master/nvidia-driver-installer/cos/daemonset-preloaded.yaml"
5350

51+
# AWS
52+
AWS_REGION="${AWS_REGION:-us-east-1}"
53+
54+
# GPG
55+
GCP_PROJECT_ID="${GCP_PROJECT_ID:-}"
56+
GCP_ZONE="${GCP_ZONE:-}"
57+
GCP_SERVICE_ACCOUNT="${GCP_SERVICE_ACCOUNT:-}"
58+
5459
# ARM64-specific values file (if needed)
5560
NVSENTINEL_ARM64_VALUES="${REPO_ROOT}/distros/kubernetes/nvsentinel/values-tilt-arm64.yaml"
5661

@@ -256,6 +261,14 @@ install_nvsentinel() {
256261
"--set" "janitor.csp.aws.accountId=$aws_account_id"
257262
"--set" "janitor.csp.aws.iamRoleName=$janitor_role_name"
258263
)
264+
elif [[ "$CSP" == "gcp" ]]; then
265+
extra_set_args+=(
266+
"--set" "janitor.csp.gcp.projectId=$GCP_PROJECT_ID"
267+
"--set" "janitor.csp.gcp.zone=$GCP_ZONE"
268+
"--set" "janitor.csp.gcp.serviceAccount=$GCP_SERVICE_ACCOUNT"
269+
)
270+
else
271+
log "Janitor extra args not defined for: $CSP"
259272
fi
260273

261274
# Build helm command with proper array handling

0 commit comments

Comments
 (0)