Merge pull request #79 from dexhorthy/dex/chxxxx/cleanup

clean up example app.yml so it works, gitignore some things

Author: dexhorthy

.gitignore

@@ -5,3 +5,4 @@ state.json
 
 .idea
 .vscode
+installer/

app.yml

@@ -2,34 +2,16 @@
 ---
 assets:
   v1:
-  - github:
-      repo: github.com/replicatedhq/superbigtool-k8s
-      ref: 8fcaebe55af67fe6789fa678faaa76fa867fbc
-      path: '**/*.yml'
-      dest: ./k8s/
-      private: true
-  - github:
-      repo: github.com/replicatedhq/superbigtool-enterprise
-      ref: aef8fe5afe5af67fe6789fa678fe876fa867fbc
-      path: release/k8s/*.sh
-      dest: ./scripts/
-      private: true
   - inline:
       contents: |
         #!/bin/sh
         kubectl delete ns {{repl ConfigOption "namespace" }}
-      dest: ./uninstall.sh
+      dest: ./installer/scripts/uninstall.sh
       mode: 0777
-  - docker:
-      image: quay.io/superbigtool/api:2.1.0
-      private: true
-      dest: docker/api.tar
-      no_template: true
   - docker:
       image: postgres:10.1
-      dest: docker/postgres.tar
-      private: false
-      no_template: true
+      dest: installer/docker/postgres.tar
+      source: public
 
 config:
   v1:
@@ -71,5 +53,5 @@ lifecycle:
   - message:
      level: warn
      contents: |
-       A state file has been written to {{repl context "state_file_path" }} -- please store it
+       A state file has been written to {{repl Installation "state_file_path" }} -- please store it
        somewhere safe, you'll need it if you want to update or recover this installation of SuperBigTool.

e2e-retraced/ship-retraced.yml

@@ -142,8 +142,11 @@ config:
 
 lifecycle:
   v1:
-  - render:
-      skip_state_warning: true
+  - message:
+     level: info
+     contents: |
+       This script will prepare retraced to deploy to your cluster.
+  - render: {}
   - message:
      level: info
      contents: |

pkg/lifecycle/message/api.go

@@ -29,7 +29,11 @@ func (m *DaemonMessenger) Execute(ctx context.Context, release *api.Release, ste
 
 	daemonExitedChan := m.Daemon.EnsureStarted(ctx, release)
 
-	m.Daemon.PushStep(ctx, "message", api.Step{Message: step})
+	m.Daemon.PushStep(ctx, "message", api.Step{
+		Message: &api.Message{
+			Contents: step.Contents,
+			Level:    step.Level,
+		}})
 	debug.Log("event", "step.pushed")
 	return m.awaitMessageConfirmed(ctx, daemonExitedChan)
 }
@@ -71,7 +75,7 @@ func (m *DaemonMessenger) funcMap() template.FuncMap {
 	return map[string]interface{}{
 		"config":       configFunc,
 		"ConfigOption": configFunc,
-		"context": func(name string) interface{} {
+		"Installation": func(name string) interface{} {
 			switch name {
 			case "state_file_path":
 				return state.Path