Fix transpile helm hooks to kots

replicatedhq · Aug 12, 2020 · 4b3ead4 · 4b3ead4
1 parent da2ae80
commit 4b3ead4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/pkg/base/base.go b/pkg/base/base.go
@@ -61,7 +61,7 @@ func GetGVKWithNameAndNs(content []byte, baseNS string) string {
 	return fmt.Sprintf("%s-%s-%s-%s", o.APIVersion, o.Kind, o.Metadata.Name, namespace)
 }
 
-func (f BaseFile) transpileHelmHooksToKotsHooks() error {
+func (f *BaseFile) transpileHelmHooksToKotsHooks() error {
 	decode := scheme.Codecs.UniversalDeserializer().Decode
 	obj, gvk, err := decode(f.Content, nil, nil)
 	if err != nil {

diff --git a/pkg/base/base_test.go b/pkg/base/base_test.go
@@ -87,23 +87,34 @@ spec:
         - name: pi
           image: perl
           command: ["perl",  "-Mbignum=bpi", "-wle", "print bpi(2000)"]
-          restartPolicy: Never
-          backoffLimit: 4`,
+      restartPolicy: Never
+  backoffLimit: 4`,
 			expected: `apiVersion: batch/v1
 kind: Job
 metadata:
-  name: pi
   annotations:
-    "helm.sh/hook-delete-policy": "hook-succeeded"
+    helm.sh/hook-delete-policy: hook-succeeded
+    kots.io/hook-delete-policy: hook-succeeded
+  creationTimestamp: null
+  name: pi
 spec:
+  backoffLimit: 4
   template:
+    metadata:
+      creationTimestamp: null
     spec:
       containers:
-        - name: pi
-          image: perl
-          command: ["perl",  "-Mbignum=bpi", "-wle", "print bpi(2000)"]
-          restartPolicy: Never
-          backoffLimit: 4`,
+      - command:
+        - perl
+        - -Mbignum=bpi
+        - -wle
+        - print bpi(2000)
+        image: perl
+        name: pi
+        resources: {}
+      restartPolicy: Never
+status: {}
+`,
 		},
 	}