fix(devenv): detect kpt in skaffold.yaml

pkgxdev · Oct 21, 2023 · b1ab140 · b1ab140
1 parent f8991b6
commit b1ab140
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/fixtures/skaffold.yaml/manifests/skaffold.yaml b/fixtures/skaffold.yaml/manifests/skaffold.yaml
@@ -3,7 +3,6 @@ kind: Config
 metadata:
   name: skaffold-fixture
 manifests:
-  # FIXME: ktp cli isn't yet on pkgx pantry
   kpt: []
   kustomize: {}
   helm:

diff --git a/fixtures/skaffold.yaml/std/skaffold.yaml b/fixtures/skaffold.yaml/std/skaffold.yaml
@@ -9,12 +9,10 @@ deploy:
   kubeContext: minikube
   kubectl: {}
   helm: {}
-  # FIXME: ktp cli isn't yet on pkgx pantry
   kpt: {}
   docker:
     images: []
 manifests:
-  # FIXME: ktp cli isn't yet on pkgx pantry
   kpt: []
   kustomize: {}
   helm:

diff --git a/src/utils/devenv.test.ts b/src/utils/devenv.test.ts
@@ -146,14 +146,16 @@ Deno.test("devenv.ts", async runner => {
       const f = Path.mktemp().join('skaffold.yaml').touch()
       f.parent().join("skaffold.yaml").rm().write({text: ""})
       const {env, pkgs} = await specimen(f.parent())
-      console.assert(pkgs.length === 0, "invalid skaffold.yaml should not return any dep")
+      // only skafflold.dev, no other dep expected
+      assert(pkgs.length === 1, "invalid skaffold.yaml should not return any dep")
 
       const keyfiles = [
         [
           'skaffold.yaml/std/skaffold.yaml',
           'skaffold.dev',
           'kubernetes.io/kubectl',
           'helm.sh',
+          'kpt.dev',
           'kubernetes.io/minikube',
           'docker.com/cli',
           'kubernetes.io/kustomize'
@@ -166,6 +168,7 @@ Deno.test("devenv.ts", async runner => {
           'skaffold.yaml/manifests/skaffold.yaml',
           'skaffold.dev',
           'helm.sh',
+          'kpt.dev',
           'kubernetes.io/kustomize'
         ],
       ]

diff --git a/src/utils/devenv.ts b/src/utils/devenv.ts
@@ -201,6 +201,12 @@ export default async function(dir: Path) {
         constraint: new semver.Range(`*`)
       })
     }
+    if (yaml.deploy?.kpt || yaml.manifests?.kpt){
+      pkgs.push({
+        project: "kpt.dev",
+        constraint: new semver.Range(`*`)
+      })
+    }
     if (yaml.manifests?.kustomize){
       pkgs.push({
         project: "kubernetes.io/kustomize",