From 69cd3b326783253a9d35259061ce08abac8f6bc1 Mon Sep 17 00:00:00 2001 From: parkinr Date: Mon, 10 Feb 2025 14:39:23 -0800 Subject: [PATCH] Added project id to kubeadmin user for CKS --- .../cluster/KubernetesClusterManagerImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java index bf7a2a5344a5..2f0964a70433 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java +++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java @@ -1384,7 +1384,15 @@ private String[] getServiceUserKeys(KubernetesClusterVO kubernetesCluster) { if (owner == null || owner.getType() == Account.Type.PROJECT) { owner = CallContext.current().getCallingAccount(); } - String username = owner.getAccountName() + "-" + KUBEADMIN_ACCOUNT_NAME; + + String projectId = "default"; + Account account = ApiDBUtils.findAccountById(kubernetesCluster.getAccountId()); + Project project = ApiDBUtils.findProjectByProjectAccountId(account.getId()); + if ( project != null ) { + projectId = project.getUuid(); + } + + String username = owner.getAccountName() + "-" + projectId + "-" + KUBEADMIN_ACCOUNT_NAME; UserAccount kubeadmin = accountService.getActiveUserAccount(username, owner.getDomainId()); String[] keys = null; if (kubeadmin == null) {