Skip to content

ci: fixes for uat janitor provider install #671

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

Merged
lalitadithya merged 1 commit into from
Jan 10, 2026
Merged

ci: fixes for uat janitor provider install #671

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
4 changes: 2 additions & 2 deletions tests/uat/aws/eks-cluster-config.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ iam:
withOIDC: true
serviceAccounts:
- metadata:
name: janitor
name: janitor-provider
namespace: nvsentinel
attachPolicyARNs:
- arn:aws:iam::aws:policy/AmazonEC2ReadOnlyAccess
Expand All @@ -49,7 +49,7 @@ iam:
- sts:GetCallerIdentity
- sts:DecodeAuthorizationMessage
Resource: "*"
roleName: ${CLUSTER_NAME}-janitor
roleName: ${CLUSTER_NAME}-janitor-provider
roleOnly: true

addons:
Expand Down
4 changes: 3 additions & 1 deletion tests/uat/aws/nvsentinel-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ global:
enabled: true
janitor:
enabled: true
janitorProvider:
enabled: true
mongodbStore:
enabled: true

Expand Down Expand Up @@ -74,7 +76,7 @@ csp-health-monitor:
kubernetes-object-monitor:
logLevel: debug

janitor:
janitor-provider:
csp:
provider: aws
aws:
Expand Down
4 changes: 3 additions & 1 deletion tests/uat/gcp/nvsentinel-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ global:
enabled: true
janitor:
enabled: true
janitorProvider:
enabled: true
mongodbStore:
enabled: true

Expand Down Expand Up @@ -80,7 +82,7 @@ csp-health-monitor:
kubernetes-object-monitor:
logLevel: debug

janitor:
janitor-provider:
csp:
provider: gcp

Expand Down
14 changes: 7 additions & 7 deletions tests/uat/install-apps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,18 +280,18 @@ install_nvsentinel() {
local aws_account_id
aws_account_id=$(aws sts get-caller-identity --query Account --output text)

local janitor_role_name="${CLUSTER_NAME}-janitor"
local janitor_provider_role_name="${CLUSTER_NAME}-janitor-provider"

extra_set_args+=(
"--set" "janitor.csp.aws.region=$AWS_REGION"
"--set" "janitor.csp.aws.accountId=$aws_account_id"
"--set" "janitor.csp.aws.iamRoleName=$janitor_role_name"
"--set" "janitor-provider.csp.aws.region=$AWS_REGION"
"--set" "janitor-provider.csp.aws.accountId=$aws_account_id"
"--set" "janitor-provider.csp.aws.iamRoleName=$janitor_provider_role_name"
)
elif [[ "$CSP" == "gcp" ]]; then
extra_set_args+=(
"--set" "janitor.csp.gcp.project=$GCP_PROJECT_ID"
"--set" "janitor.csp.gcp.zone=$GCP_ZONE"
"--set" "janitor.csp.gcp.serviceAccount=$GCP_SERVICE_ACCOUNT"
"--set" "janitor-provider.csp.gcp.project=$GCP_PROJECT_ID"
"--set" "janitor-provider.csp.gcp.zone=$GCP_ZONE"
"--set" "janitor-provider.csp.gcp.serviceAccount=$GCP_SERVICE_ACCOUNT"
)
else
log "Janitor extra args not defined for: $CSP"
Expand Down
4 changes: 3 additions & 1 deletion tests/uat/kind/nvsentinel-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ global:
enabled: true
janitor:
enabled: true
janitorProvider:
enabled: true
mongodbStore:
enabled: true

Expand Down Expand Up @@ -83,7 +85,7 @@ csp-health-monitor:
kubernetes-object-monitor:
logLevel: debug

janitor:
janitor-provider:
csp:
provider: kind

Expand Down
Loading