fix(deploy): Fix baseconfig loading for jar-backed templates (#350)

spinnaker · Apr 14, 2017 · b451098 · b451098
1 parent 7dca740
commit b451098
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
diff --git a/...etflix/spinnaker/halyard/deploy/spinnaker/v1/profile/JarResourceBackedProfileFactory.java b/...etflix/spinnaker/halyard/deploy/spinnaker/v1/profile/JarResourceBackedProfileFactory.java
@@ -31,5 +31,7 @@ protected Profile getBaseProfile(String name, String version, String outputFile)
 
   @Override
   protected void setProfile(Profile profile, DeploymentConfiguration deploymentConfiguration, SpinnakerRuntimeSettings endpoints) {
+    profile.appendContents(profile.getBaseContents());
+    System.out.println(profile.getContents());
   }
 }
diff --git a/...netflix/spinnaker/halyard/deploy/spinnaker/v1/profile/VaultMountConfigProfileFactory.java b/...netflix/spinnaker/halyard/deploy/spinnaker/v1/profile/VaultMountConfigProfileFactory.java
@@ -41,6 +41,7 @@ protected String commentPrefix() {
 
   @Override
   protected void setProfile(Profile profile, DeploymentConfiguration deploymentConfiguration, SpinnakerRuntimeSettings endpoints) {
+    super.setProfile(profile, deploymentConfiguration, endpoints);
     profile.setExecutable(true);
   }
 }
diff --git a/...x/spinnaker/halyard/deploy/spinnaker/v1/profile/VaultMountGoogleConfigProfileFactory.java b/...x/spinnaker/halyard/deploy/spinnaker/v1/profile/VaultMountGoogleConfigProfileFactory.java
@@ -41,6 +41,7 @@ protected String commentPrefix() {
 
   @Override
   protected void setProfile(Profile profile, DeploymentConfiguration deploymentConfiguration, SpinnakerRuntimeSettings endpoints) {
+    super.setProfile(profile, deploymentConfiguration, endpoints);
     profile.setExecutable(true);
   }
 }
diff --git a/...com/netflix/spinnaker/halyard/deploy/spinnaker/v1/profile/VaultStartupProfileFactory.java b/...com/netflix/spinnaker/halyard/deploy/spinnaker/v1/profile/VaultStartupProfileFactory.java
@@ -41,6 +41,7 @@ protected String commentPrefix() {
 
   @Override
   protected void setProfile(Profile profile, DeploymentConfiguration deploymentConfiguration, SpinnakerRuntimeSettings endpoints) {
+    super.setProfile(profile, deploymentConfiguration, endpoints);
     profile.setExecutable(true);
   }
 }