diff --git a/pom.xml b/pom.xml index 6289c40..7e7fa6f 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.icgc.argo workflow-management - 2.7.0 + 2.8.0 workflow-management ARGO Workflow Management diff --git a/src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java b/src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java index f7e6583..372f40a 100644 --- a/src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java +++ b/src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java @@ -289,7 +289,7 @@ private CmdKubeRun createCmd(@NonNull Launcher launcher, @NonNull RunParams para val workflowEngineParams = params.getWorkflowEngineParams(); // Create SecretName and K8s Secret - val rdpcSecretName = String.format("%s-%s", SECRET_SUFFIX, UUID.randomUUID()); + val rdpcSecretName = String.format("%s-%s", runName, SECRET_SUFFIX); secretProvider .generateSecret() .ifPresentOrElse( @@ -323,8 +323,7 @@ private CmdKubeRun createCmd(@NonNull Launcher launcher, @NonNull RunParams para k8sConfig.getServiceAccount(), workflowEngineParams.getLaunchDir(), workflowEngineParams.getProjectDir(), - workflowEngineParams.getWorkDir(), - rdpcSecretName); + workflowEngineParams.getWorkDir()); cmdParams.put("runConfig", List.of(config)); // Resume workflow by name/id diff --git a/src/main/java/org/icgc/argo/workflow_management/util/NextflowConfigFile.java b/src/main/java/org/icgc/argo/workflow_management/util/NextflowConfigFile.java index eb2381d..05d60da 100644 --- a/src/main/java/org/icgc/argo/workflow_management/util/NextflowConfigFile.java +++ b/src/main/java/org/icgc/argo/workflow_management/util/NextflowConfigFile.java @@ -36,8 +36,7 @@ public static String createNextflowConfigFile( String serviceAccount, String launchDir, String projectDir, - String workDir, - String rdpcSecretName) + String workDir) throws IOException { val filePath = String.format("/tmp/%s.config", filename); @@ -63,11 +62,6 @@ public static String createNextflowConfigFile( // close it off fileContent.add("}"); - // Add K8s Secret Name - fileContent.add("params {"); - writeFormattedLineIfValue(fileContent::add, "\trdpc_secret_name = '%s'", rdpcSecretName); - fileContent.add("}"); - // Write contents to file for (String line : fileContent) { writer.write(line + System.lineSeparator());