revert changes from rebase

capactio · Feb 9, 2021 · 8cd2918 · 8cd2918
1 parent bc098fc
commit 8cd2918
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 31 deletions.
diff --git a/docs/tutorial/content-creation/README.md b/docs/tutorial/content-creation/README.md
@@ -350,7 +350,6 @@ spec:
           revision: 0.1.0
     - interfaceGroupPath: cap.interface.runner.helm
       alias: helm
-      appVersion: 3.x.x
       methods:
         - name: run
           revision: 0.1.0
@@ -425,35 +424,28 @@ spec:
                       - name: template
                         raw:
                           data: |
-                            context:
-                              name: "confluence-helm-release"
-                              dryRun: false
-                              timeout: "10m"
-                              platform:
-                                namespace: "default"
-                            args:
-                              command: "install"
-                              generateName: true
-                              chart:
-                                name: "confluence-server"
-                                repo: "https://helm.mox.sh"
-                              output:{% raw %}
-                                goTemplate:
-                                  version: {{ '"{{ .Values.image.tag }}"' }}
-                                  host: {{ "'{{ template \"confluence-server.fullname\" . }}'" }}{% endraw %}
-                              values:
-                                postgresql:
-                                  enabled: false
-                                databaseConnection:
-                                  host: "{{ host }}"
-                                  user: "{{ superuser.username }}"
-                                  password: "{{ superuser.password }}"
-                                  {% raw %}database: "{{ name }}"{% endraw %}
-                                ingress:
-                                  enabled: true
-                                  hosts:
-                                  - host: confluence.voltron.local
-                                    paths: ['/']
+                            command: "install"
+                            generateName: true
+                            chart:
+                              name: "confluence-server"
+                              repo: "https://helm.mox.sh"
+                            output:{% raw %}
+                              goTemplate:
+                                version: {{ '"{{ .Values.image.tag }}"' }}
+                                host: {{ "'{{ template \"confluence-server.fullname\" . }}'" }}{% endraw %}
+                            values:
+                              postgresql:
+                                enabled: false
+                              databaseConnection:
+                                host: "{{ host }}"
+                                user: "{{ superuser.username }}"
+                                password: "{{ superuser.password }}"
+                                {% raw %}database: "{{ name }}"{% endraw %}
+                              ingress:
+                                enabled: true
+                                hosts:
+                                - host: confluence.voltron.local
+                                  paths: ['/']
                       - name: input-parameters
                         from: "{{workflow.outputs.artifacts.postgresql}}"
 

diff --git a/och-content/core/interface/runner/generic/run.yaml b/och-content/core/interface/runner/generic/run.yaml
@@ -29,6 +29,12 @@ spec:
               },
               "allOf": [ { "$ref": "#/$ocfRefs/inputType" } ]
             }
+    typeInstances:
+      runner-context:
+        typeRef:
+          path: cap.core.type.runner.generic.context
+          revision: 0.1.0
+        verbs: [ "get" ]
   output: {}
 
 signature:

diff --git a/och-content/interface/runner/argo/run.yaml b/och-content/interface/runner/argo/run.yaml
@@ -30,8 +30,13 @@ spec:
               },
               "allOf": [ { "$ref": "#/$ocfRefs/inputType" } ]
             }
+    typeInstances:
+      runner-context:
+        typeRef:
+          path: cap.core.type.runner.generic.context
+          revision: 0.1.0
+        verbs: [ "get" ]
   output: {}
 
-
 signature:
   och: eyJ0eXAiOiJKV1QiLA0KICJhbGciOiJIUzI1NiJ9
diff --git a/och-content/interface/runner/helm/run.yaml b/och-content/interface/runner/helm/run.yaml
@@ -29,6 +29,12 @@ spec:
               },
               "allOf": [ { "$ref": "#/$ocfRefs/inputType" } ]
             }
+    typeInstances:
+      runner-context:
+        typeRef:
+          path: cap.core.type.runner.generic.context
+          revision: 0.1.0
+        verbs: [ "get" ]
   output:
     typeInstances:
       helm-release: