Skip to content

Commit 1b4261e

Browse files
authored
Merge pull request #218 from cloudogu/feature/fix-dev-image
Fix dev image
2 parents eb1bfcb + a076946 commit 1b4261e

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/main/groovy/com/cloudogu/gitops/features/deployment/ArgoCdApplicationStrategy.groovy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ import com.cloudogu.gitops.scmm.ScmmRepoProvider
66
import com.cloudogu.gitops.utils.FileSystemUtils
77
import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator
88
import com.fasterxml.jackson.dataformat.yaml.YAMLMapper
9+
import groovy.util.logging.Slf4j
910
import jakarta.inject.Singleton
1011

1112
import java.nio.file.Path
1213

1314
@Singleton
15+
@Slf4j
1416
class ArgoCdApplicationStrategy implements DeploymentStrategy {
1517
private FileSystemUtils fileSystemUtils
1618
private Map config
@@ -30,13 +32,14 @@ class ArgoCdApplicationStrategy implements DeploymentStrategy {
3032
@SuppressWarnings('GroovyGStringKey') // Using dynamic strings as keys seems an easy to read way to avoid more ifs
3133
void deployFeature(String repoURL, String repoName, String chartOrPath, String version, String namespace,
3234
String releaseName, Path helmValuesPath, RepoType repoType) {
35+
log.trace("Deploying helm chart via ArgoCD: ${releaseName}. Reading values from ${helmValuesPath}")
3336
def namePrefix = config.application['namePrefix']
3437

3538
ScmmRepo clusterResourcesRepo = scmmRepoProvider.getRepo('argocd/cluster-resources')
3639
clusterResourcesRepo.cloneRepo()
3740

3841
// Inline values from tmpHelmValues file into ArgoCD Application YAML
39-
def inlineValues = helmValuesPath.text
42+
def inlineValues = helmValuesPath.toFile().text
4043

4144
// Write chart, repoURL and version into a ArgoCD Application YAML
4245

0 commit comments

Comments
 (0)