update kyaml and cli-utils to latest (#2523)

e2e/testdata/fn-eval/out-of-place-fnchain-stdout/.expected/config.yaml

@@ -29,6 +29,8 @@ stdOut: |
       annotations:
         config.kubernetes.io/index: "0"
         config.kubernetes.io/path: resources.yaml
+        internal.config.kubernetes.io/index: "0"
+        internal.config.kubernetes.io/path: resources.yaml
         internal.config.kubernetes.io/seqindent: compact
         foo: bar
       namespace: staging
@@ -52,6 +54,8 @@ stdOut: |
       annotations:
         config.kubernetes.io/index: "1"
         config.kubernetes.io/path: resources.yaml
+        internal.config.kubernetes.io/index: "1"
+        internal.config.kubernetes.io/path: resources.yaml
         internal.config.kubernetes.io/seqindent: compact
         foo: bar
       namespace: staging

e2e/testdata/fn-eval/output-to-stdout/.expected/config.yaml

@@ -36,6 +36,8 @@ stdOut: |
       annotations:
         config.kubernetes.io/index: "0"
         config.kubernetes.io/path: resources.yaml
+        internal.config.kubernetes.io/index: "0"
+        internal.config.kubernetes.io/path: resources.yaml
         internal.config.kubernetes.io/seqindent: compact
       namespace: staging
     spec:
@@ -47,6 +49,8 @@ stdOut: |
       annotations:
         config.kubernetes.io/index: "1"
         config.kubernetes.io/path: resources.yaml
+        internal.config.kubernetes.io/index: "1"
+        internal.config.kubernetes.io/path: resources.yaml
         internal.config.kubernetes.io/seqindent: compact
       namespace: staging
     spec:

e2e/testdata/fn-render/generator-absolute-path/starlark-httpbin.yaml

@@ -22,9 +22,9 @@ source: |-
      "metadata": {
         "name": "httpbin",
         "annotations": {
-          "config.kubernetes.io/index": 0,
+          "internal.config.kubernetes.io/index": 0,
           # generates resource in parent directory
-          "config.kubernetes.io/path": "/another/file/out.yaml"
+          "internal.config.kubernetes.io/path": "/another/file/out.yaml"
         }
      },
      "spec": {

e2e/testdata/fn-render/mutate-legacy-path-index/.expected/diff.patch

@@ -0,0 +1,29 @@
+diff --git a/x.yaml b/y.yaml
+similarity index 100%
+rename from x.yaml
+rename to y.yaml
+index 7a494c9..e284e52 100644
+--- a/x.yaml
++++ b/y.yaml
+@@ -1,3 +1,10 @@
++apiVersion: custom.io/v1
++kind: Custom
++metadata:
++  name: custom
++spec:
++  image: nginx:1.2.3
++---
+ # Copyright 2021 Google LLC
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+@@ -17,10 +24,3 @@ metadata:
+   name: nginx-deployment
+ spec:
+   replicas: 3
+----
+-apiVersion: custom.io/v1
+-kind: Custom
+-metadata:
+-  name: custom
+-spec:
+-  image: nginx:1.2.3

e2e/testdata/fn-render/mutate-legacy-path-index/.krmignore

@@ -0,0 +1 @@
+.expected

e2e/testdata/fn-render/mutate-legacy-path-index/Kptfile

@@ -0,0 +1,8 @@
+apiVersion: kpt.dev/v1
+kind: Kptfile
+metadata:
+  name: app
+pipeline:
+  mutators:
+    - image: gcr.io/kpt-fn/starlark:v0.3.0
+      configPath: starlark-mutate-path-index.yaml

e2e/testdata/fn-render/mutate-legacy-path-index/starlark-mutate-path-index.yaml

@@ -0,0 +1,34 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+apiVersion: fn.kpt.dev/v1alpha1
+kind: StarlarkRun
+metadata:
+  name: httpbin-gen
+source: |-
+  def change_path_index(resources):
+    for r in resources:
+      pathElems = r["metadata"]["annotations"]["config.kubernetes.io/path"].split("/")
+      if pathElems[-1] == "y.yaml":
+        return
+
+      pathElems[-1] = "y.yaml"
+      r["metadata"]["annotations"]["config.kubernetes.io/path"] = "/".join(pathElems)
+
+      index = r["metadata"]["annotations"]["config.kubernetes.io/index"]
+      if index == "0":
+        r["metadata"]["annotations"]["config.kubernetes.io/index"] = "1"
+      else:
+        r["metadata"]["annotations"]["config.kubernetes.io/index"] = "0"
+
+  change_path_index(ctx.resource_list["items"])

e2e/testdata/fn-render/mutate-legacy-path-index/x.yaml

@@ -0,0 +1,26 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nginx-deployment
+spec:
+  replicas: 3
+---
+apiVersion: custom.io/v1
+kind: Custom
+metadata:
+  name: custom
+spec:
+  image: nginx:1.2.3

e2e/testdata/fn-render/mutate-path-index/.expected/diff.patch

@@ -0,0 +1,29 @@
+diff --git a/x.yaml b/y.yaml
+similarity index 100%
+rename from x.yaml
+rename to y.yaml
+index 7a494c9..e284e52 100644
+--- a/x.yaml
++++ b/y.yaml
+@@ -1,3 +1,10 @@
++apiVersion: custom.io/v1
++kind: Custom
++metadata:
++  name: custom
++spec:
++  image: nginx:1.2.3
++---
+ # Copyright 2021 Google LLC
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+@@ -17,10 +24,3 @@ metadata:
+   name: nginx-deployment
+ spec:
+   replicas: 3
+----
+-apiVersion: custom.io/v1
+-kind: Custom
+-metadata:
+-  name: custom
+-spec:
+-  image: nginx:1.2.3

e2e/testdata/fn-render/mutate-path-index/.krmignore

@@ -0,0 +1 @@
+.expected

e2e/testdata/fn-render/mutate-path-index/Kptfile

@@ -0,0 +1,8 @@
+apiVersion: kpt.dev/v1
+kind: Kptfile
+metadata:
+  name: app
+pipeline:
+  mutators:
+    - image: gcr.io/kpt-fn/starlark:v0.3.0
+      configPath: starlark-mutate-path-index.yaml

e2e/testdata/fn-render/mutate-path-index/starlark-mutate-path-index.yaml

@@ -0,0 +1,34 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+apiVersion: fn.kpt.dev/v1alpha1
+kind: StarlarkRun
+metadata:
+  name: httpbin-gen
+source: |-
+  def change_path_index(resources):
+    for r in resources:
+      pathElems = r["metadata"]["annotations"]["internal.config.kubernetes.io/path"].split("/")
+      if pathElems[-1] == "y.yaml":
+        return
+
+      pathElems[-1] = "y.yaml"
+      r["metadata"]["annotations"]["internal.config.kubernetes.io/path"] = "/".join(pathElems)
+
+      index = r["metadata"]["annotations"]["internal.config.kubernetes.io/index"]
+      if index == "0":
+        r["metadata"]["annotations"]["internal.config.kubernetes.io/index"] = "1"
+      else:
+        r["metadata"]["annotations"]["internal.config.kubernetes.io/index"] = "0"
+
+  change_path_index(ctx.resource_list["items"])

e2e/testdata/fn-render/mutate-path-index/x.yaml

@@ -0,0 +1,26 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nginx-deployment
+spec:
+  replicas: 3
+---
+apiVersion: custom.io/v1
+kind: Custom
+metadata:
+  name: custom
+spec:
+  image: nginx:1.2.3

e2e/testdata/fn-render/no-resources/.expected/diff.patch

@@ -1,9 +1,9 @@
 diff --git a/another/file/out.yaml b/another/file/out.yaml
 new file mode 100644
-index 0000000..f36c98e
+index 0000000..fe3c0c6
 --- /dev/null
 +++ b/another/file/out.yaml
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,27 @@
 +apiVersion: apps/v1
 +kind: Deployment
 +metadata:
@@ -17,3 +17,17 @@ index 0000000..f36c98e
 +        name: httpbin
 +        ports:
 +        - containerPort: 9876
++---
++apiVersion: apps/v1
++kind: Deployment
++metadata:
++  name: httpbin-2
++spec:
++  replicas: 4
++  template:
++    spec:
++      containers:
++      - image: kennethreitz/httpbin
++        name: httpbin
++        ports:
++        - containerPort: 9876

e2e/testdata/fn-render/no-resources/starlark-httpbin.yaml

@@ -16,13 +16,43 @@ kind: StarlarkRun
 metadata:
   name: httpbin-gen
 source: |-
-  httpbin_deployment = {
+  httpbin_deployment_internal = {
      "apiVersion": "apps/v1",
      "kind": "Deployment",
      "metadata": {
         "name": "httpbin",
         "annotations": {
-          "config.kubernetes.io/index": 0,
+          "internal.config.kubernetes.io/index": 0,
+          # generates resource in parent directory
+          "internal.config.kubernetes.io/path": "/another/file/out.yaml"
+        }
+     },
+     "spec": {
+        "replicas": 4,
+        "template": {
+           "spec": {
+              "containers": [
+                {
+                  "name": "httpbin",
+                  "image": "kennethreitz/httpbin",
+                  "ports": [
+                    {
+                       "containerPort": 9876
+                    }
+                  ]
+                }
+              ]
+           }
+        }
+    }
+  }
+  httpbin_deployment_legacy = {
+     "apiVersion": "apps/v1",
+     "kind": "Deployment",
+     "metadata": {
+        "name": "httpbin-2",
+        "annotations": {
+          "config.kubernetes.io/index": 1,
           # generates resource in parent directory
           "config.kubernetes.io/path": "/another/file/out.yaml"
         }
@@ -55,6 +85,7 @@ source: |-
       if is_httpbin(r):
         return
 
-    resources.append(httpbin_deployment)
+    resources.append(httpbin_deployment_internal)
+    resources.append(httpbin_deployment_legacy)
 
   ensure_httpbin(ctx.resource_list["items"])

e2e/testdata/fn-render/out-of-place-fnchain-stdout-results/.expected/config.yaml

@@ -22,6 +22,8 @@ stdOut: |
       annotations:
         config.kubernetes.io/index: "0"
         config.kubernetes.io/path: resources.yaml
+        internal.config.kubernetes.io/index: "0"
+        internal.config.kubernetes.io/path: resources.yaml
         internal.config.kubernetes.io/seqindent: compact
         foo: bar
       namespace: staging
@@ -45,6 +47,8 @@ stdOut: |
       annotations:
         config.kubernetes.io/index: "1"
         config.kubernetes.io/path: resources.yaml
+        internal.config.kubernetes.io/index: "1"
+        internal.config.kubernetes.io/path: resources.yaml
         internal.config.kubernetes.io/seqindent: compact
         foo: bar
       namespace: staging

e2e/testdata/fn-render/out-of-place-fnchain-stdout/.expected/config.yaml

@@ -31,6 +31,8 @@ stdOut: |
       annotations:
         config.kubernetes.io/index: "0"
         config.kubernetes.io/path: resources.yaml
+        internal.config.kubernetes.io/index: "0"
+        internal.config.kubernetes.io/path: resources.yaml
         internal.config.kubernetes.io/seqindent: compact
         foo: bar
       namespace: staging
@@ -54,6 +56,8 @@ stdOut: |
       annotations:
         config.kubernetes.io/index: "1"
         config.kubernetes.io/path: resources.yaml
+        internal.config.kubernetes.io/index: "1"
+        internal.config.kubernetes.io/path: resources.yaml
         internal.config.kubernetes.io/seqindent: compact
         foo: bar
       namespace: staging

e2e/testdata/fn-render/out-of-place-stdout/.expected/config.yaml

@@ -26,6 +26,8 @@ stdOut: |
       annotations:
         config.kubernetes.io/index: "0"
         config.kubernetes.io/path: resources.yaml
+        internal.config.kubernetes.io/index: "0"
+        internal.config.kubernetes.io/path: resources.yaml
         internal.config.kubernetes.io/seqindent: compact
       namespace: staging
     spec:
@@ -37,6 +39,8 @@ stdOut: |
       annotations:
         config.kubernetes.io/index: "1"
         config.kubernetes.io/path: resources.yaml
+        internal.config.kubernetes.io/index: "1"
+        internal.config.kubernetes.io/path: resources.yaml
         internal.config.kubernetes.io/seqindent: compact
       namespace: staging
     spec: