fix renamed fn image names (#2339)

Mengqi Yu · web-flow · commit ebdff7bf8645 · 2021-06-25T14:14:35.000-07:00
* fix renamed fn image names

* no unstable tags
diff --git a/e2e/testdata/fn-eval/image-pull-policy-never/.expected/config.yaml b/e2e/testdata/fn-eval/image-pull-policy-never/.expected/config.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 testType: eval
-image: gcr.io/kpt-fn/not-exist:unstable
+image: gcr.io/kpt-fn/not-exist:v0.1
 imagePullPolicy: never
 exitCode: 1
 stdErr: "No such image"
diff --git a/e2e/testdata/fn-eval/preserve-comments/.expected/config.yaml b/e2e/testdata/fn-eval/preserve-comments/.expected/config.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 
 testType: eval
-image: gcr.io/kpt-fn-demo/drop-comments:unstable
+image: gcr.io/kpt-fn-demo/drop-comments:v0.1
diff --git a/e2e/testdata/fn-render/fnconfig-cannot-refer-subpkgs/Kptfile b/e2e/testdata/fn-render/fnconfig-cannot-refer-subpkgs/Kptfile
@@ -4,5 +4,5 @@ metadata:
   name: app-with-db
 pipeline:
   mutators:
-    - image: gcr.io/kpt-fn/set-label:unstable
+    - image: gcr.io/kpt-fn/set-labels:v0.1
       configPath: db/labelconfig.yaml
diff --git a/e2e/testdata/fn-render/fnconfig-missing-name/Kptfile b/e2e/testdata/fn-render/fnconfig-missing-name/Kptfile
@@ -4,8 +4,8 @@ metadata:
   name: app-with-db
 pipeline:
   mutators:
-    - image: gcr.io/kpt-fn/set-namespace:unstable
+    - image: gcr.io/kpt-fn/set-namespace:v0.1
       configMap:
         namespace: staging
-    - image: gcr.io/kpt-fn/set-label:unstable
+    - image: gcr.io/kpt-fn/set-labels:v0.1
       configPath: labelconfig.yaml
diff --git a/e2e/testdata/fn-render/generator-subpkgs/Kptfile b/e2e/testdata/fn-render/generator-subpkgs/Kptfile
@@ -4,5 +4,5 @@ metadata:
   name: app-with-generator
 pipeline:
   mutators:
-    - image: gcr.io/kpt-fn/upsert-resource:unstable
+    - image: gcr.io/kpt-fn/upsert-resource:v0.1
       configPath: fn-config.yaml
diff --git a/e2e/testdata/fn-render/generator-subpkgs/db/Kptfile b/e2e/testdata/fn-render/generator-subpkgs/db/Kptfile
@@ -4,5 +4,5 @@ metadata:
   name: db
 pipeline:
   mutators:
-    - image: gcr.io/kpt-fn/upsert-resource:unstable
+    - image: gcr.io/kpt-fn/upsert-resource:v0.1
       configPath: fn-config.yaml
diff --git a/e2e/testdata/fn-render/image-pull-policy-never/Kptfile b/e2e/testdata/fn-render/image-pull-policy-never/Kptfile
@@ -4,4 +4,4 @@ metadata:
   name: app
 pipeline:
   mutators:
-    - image: gcr.io/kpt-fn/not-exist:unstable
+    - image: gcr.io/kpt-fn/not-exist:v0.1
diff --git a/e2e/testdata/fn-render/preserve-comments/Kptfile b/e2e/testdata/fn-render/preserve-comments/Kptfile
@@ -4,4 +4,4 @@ metadata:
   name: app
 pipeline:
   mutators:
-    - image: gcr.io/kpt-fn-demo/drop-comments:unstable
+    - image: gcr.io/kpt-fn-demo/drop-comments:v0.1
diff --git a/e2e/testdata/fn-render/structured-results-from-muiltiple-fns/.expected/results.yaml b/e2e/testdata/fn-render/structured-results-from-muiltiple-fns/.expected/results.yaml
@@ -4,7 +4,7 @@ metadata:
   name: fnresults
 exitCode: 1
 items:
-  - image: gcr.io/kpt-fn/enforce-gatekeeper:0.1.0
+  - image: gcr.io/kpt-fn/gatekeeper:0.1.0
     exitCode: 0
     results:
       - message: |-
diff --git a/e2e/testdata/fn-render/structured-results-from-muiltiple-fns/Kptfile b/e2e/testdata/fn-render/structured-results-from-muiltiple-fns/Kptfile
@@ -4,7 +4,7 @@ metadata:
   name: app
 pipeline:
   validators:
-    - image: gcr.io/kpt-fn/enforce-gatekeeper:0.1.0
+    - image: gcr.io/kpt-fn/gatekeeper:0.1.0
     - image: gcr.io/kpt-fn/kubeval:v0.1.1
       configMap:
         ignore_missing_schemas: "true"
diff --git a/internal/pkg/pkg_test.go b/internal/pkg/pkg_test.go
@@ -255,7 +255,7 @@ metadata:
   name: mysql
 pipeline:
   mutators:
-    - image: gcr.io/kpt-fn/apply-setters:unstable
+    - image: gcr.io/kpt-fn/apply-setters:v0.1
       configMap:
         replicas: 5
 `,
diff --git a/package-examples/wordpress/Kptfile b/package-examples/wordpress/Kptfile
@@ -8,7 +8,7 @@ info:
   description: This is an example wordpress package with mysql subpackage.
 pipeline:
   mutators:
-    - image: gcr.io/kpt-fn/set-label:v0.1
+    - image: gcr.io/kpt-fn/set-labels:v0.1
       configMap:
         app: wordpress
   validators:
diff --git a/package-examples/wordpress/mysql/Kptfile b/package-examples/wordpress/mysql/Kptfile
@@ -8,6 +8,6 @@ info:
   description: This is an example mysql package.
 pipeline:
   mutators:
-    - image: gcr.io/kpt-fn/set-label:v0.1
+    - image: gcr.io/kpt-fn/set-labels:v0.1
       configMap:
         tier: mysql
diff --git a/pkg/api/kptfile/v1/validation_test.go b/pkg/api/kptfile/v1/validation_test.go
@@ -49,7 +49,7 @@ func TestKptfileValidate(t *testing.T) {
 					},
 					Validators: []Function{
 						{
-							Image: "gcr.io/kpt-functions/policy-controller-validate",
+							Image: "gcr.io/kpt-fn/gatekeeper",
 						},
 					},
 				},
@@ -166,23 +166,23 @@ func TestValidateFunctionName(t *testing.T) {
 	}
 	inputs := []input{
 		{
-			"gcr.io/kpt-functions/generate-folders",
+			"gcr.io/kpt-fn/generate-folders",
 			true,
 		},
 		{
 			"patch-strategic-merge",
 			true,
 		},
 		{
-			"gcr.io/kpt-functions/generate-folders:unstable",
+			"gcr.io/kpt-fn/generate-folders:unstable",
 			true,
 		},
 		{
 			"patch-strategic-merge:v1.3_beta",
 			true,
 		},
 		{
-			"gcr.io/kpt-functions/generate-folders:v1.2.3-alpha1",
+			"gcr.io/kpt-fn/generate-folders:v1.2.3-alpha1",
 			true,
 		},
 		{
diff --git a/site/book/03-packages/01-getting-a-package.md b/site/book/03-packages/01-getting-a-package.md
@@ -41,7 +41,7 @@ info:
   description: This is an example wordpress package with mysql subpackage.
 pipeline:
   mutators:
-    - image: gcr.io/kpt-fn/set-label:v0.1
+    - image: gcr.io/kpt-fn/set-labels:v0.1
       configMap:
         app: wordpress
   validators:
@@ -75,7 +75,7 @@ info:
   description: This is an example mysql package.
 pipeline:
   mutators:
-    - image: gcr.io/kpt-fn/set-label:v0.1
+    - image: gcr.io/kpt-fn/set-labels:v0.1
       configMap:
         tier: mysql
 ```
diff --git a/site/book/04-using-functions/01-declarative-function-execution.md b/site/book/04-using-functions/01-declarative-function-execution.md
@@ -24,7 +24,7 @@ metadata:
   name: wordpress
 pipeline:
   mutators:
-    - image: gcr.io/kpt-fn/set-label:v0.1
+    - image: gcr.io/kpt-fn/set-labels:v0.1
       configMap:
         app: wordpress
   validators:
@@ -55,7 +55,7 @@ metadata:
   name: mysql
 pipeline:
   mutators:
-    - image: gcr.io/kpt-fn/set-label:v0.1
+    - image: gcr.io/kpt-fn/set-labels:v0.1
       configMap:
         tier: mysql
 ```
@@ -66,11 +66,11 @@ Now, let's render the package hierarchy:
 $ kpt fn render wordpress
 Package "wordpress/mysql":
 
-[PASS] "gcr.io/kpt-fn/set-label:v0.1"
+[PASS] "gcr.io/kpt-fn/set-labels:v0.1"
 
 Package "wordpress":
 
-[PASS] "gcr.io/kpt-fn/set-label:v0.1"
+[PASS] "gcr.io/kpt-fn/set-labels:v0.1"
 [PASS] "gcr.io/kpt-fn/kubeval:v0.1"
 
 Successfully executed 3 function(s) in 2 package(s).
@@ -136,7 +136,7 @@ metadata:
   name: mysql
 pipeline:
   mutators:
-    - image: gcr.io/kpt-fn/set-label:v0.1
+    - image: gcr.io/kpt-fn/set-labels:v0.1
       configPath: labels.yaml
 ```
 
@@ -166,7 +166,7 @@ metadata:
   name: mysql
 pipeline:
   mutators:
-    - image: gcr.io/kpt-fn/set-label:v0.1
+    - image: gcr.io/kpt-fn/set-labels:v0.1
       configMap:
         tier: mysql
 ```
diff --git a/site/book/04-using-functions/03-function-results.md b/site/book/04-using-functions/03-function-results.md
@@ -15,11 +15,11 @@ For example:
 $ kpt fn render wordpress --results-dir /tmp
 Package "wordpress/mysql":
 
-[PASS] "gcr.io/kpt-fn/set-label:v0.1"
+[PASS] "gcr.io/kpt-fn/set-labels:v0.1"
 
 Package "wordpress":
 
-[PASS] "gcr.io/kpt-fn/set-label:v0.1"
+[PASS] "gcr.io/kpt-fn/set-labels:v0.1"
 [PASS] "gcr.io/kpt-fn/kubeval:v0.1"
 
 Successfully executed 3 function(s) in 2 package(s).
@@ -36,9 +36,9 @@ metadata:
   name: fnresults
 exitCode: 0
 items:
-  - image: gcr.io/kpt-fn/set-label:v0.1
+  - image: gcr.io/kpt-fn/set-labels:v0.1
     exitCode: 0
-  - image: gcr.io/kpt-fn/set-label:v0.1
+  - image: gcr.io/kpt-fn/set-labels:v0.1
     exitCode: 0
   - image: gcr.io/kpt-fn/kubeval:v0.1
     exitCode: 0
@@ -52,11 +52,11 @@ rerun:
 $ kpt fn render wordpress --results-dir /tmp
 Package "wordpress/mysql":
 
-[PASS] "gcr.io/kpt-fn/set-label:v0.1"
+[PASS] "gcr.io/kpt-fn/set-labels:v0.1"
 
 Package "wordpress":
 
-[PASS] "gcr.io/kpt-fn/set-label:v0.1"
+[PASS] "gcr.io/kpt-fn/set-labels:v0.1"
 [FAIL] "gcr.io/kpt-fn/kubeval:v0.1"
   Results:
     [ERROR] Invalid type. Expected: integer, given: string in object "v1/Service/wordpress" in file "service.yaml" in field "spec.ports.0.port"
@@ -75,9 +75,9 @@ metadata:
   name: fnresults
 exitCode: 1
 items:
-  - image: gcr.io/kpt-fn/set-label:v0.1
+  - image: gcr.io/kpt-fn/set-labels:v0.1
     exitCode: 0
-  - image: gcr.io/kpt-fn/set-label:v0.1
+  - image: gcr.io/kpt-fn/set-labels:v0.1
     exitCode: 0
   - image: gcr.io/kpt-fn/kubeval:v0.1
     exitCode: 1
diff --git a/site/installation/migration.md b/site/installation/migration.md
@@ -73,7 +73,7 @@ directory by default.
 | `kpt pkg fix DIR [flags]`                                                                         | `kpt fn eval --image gcr.io/kpt-fn/fix:v0.2` <br> Fix a local package which is using deprecated features.                                                                                                                                        |
 | `kpt pkg desc DIR [flags]`                                                                        | Deprecated in favor of reading Kptfile directly                                                                                                                                                                                                      |
 | `kpt pkg diff DIR[@VERSION] [flags]`                                                              | `kpt pkg diff [PKG_PATH][@version] [flags]` <br> Display differences between upstream and local packages.                                                                                                                                            |
-| `kpt cfg fmt DIR/STDIN [flags]`                                                                   | `kpt fn eval --image gcr.io/kpt-fn/format:unstable`                                                                                                                                                                                                  |
+| `kpt cfg fmt DIR/STDIN [flags]`                                                                   | `kpt fn eval --image gcr.io/kpt-fn/format:v0.1`                                                                                                                                                                                                  |
 | `kpt cfg tree DIR/STDIN [flags]`                                                                  | `kpt pkg tree [DIR] [flags]` <br> Displays resources, files and packages in a tree structure.                                                                                                                                                        |
 | `kpt cfg cat DIR/STDIN [flags]`                                                                   | Deprecated. Will be added back soon.                                                                                                                                                                                                                 |
 | `kpt fn run DIR/STDIN [flags]`                                                                    | `kpt fn eval [DIR / -] [flags]` <br> Executes a single function on resources in a directory. <br> <br> `kpt fn render [PKG_PATH]` <br> Executes the pipeline of functions on resources in the package and writes the output to the local filesystem. |
@@ -91,7 +91,7 @@ directory by default.
 | `kpt cfg create-subst DIR subst_name --field-value nginx:1.7.1 --pattern ${image}:${tag} [flags]` | `kpt fn eval --image gcr.io/kpt-fn/search-replace:v0.1 -- 'by-value=nginx:1.7.1' 'put-comment=kpt-set: ${image}:${tag}'`                                                                                                                             |
 | `kpt cfg delete-setter DIR setter_name`                                                           | `kpt fn eval --image gcr.io/kpt-fn/search-replace:v0.1 -- 'by-value=nginx' put-comment=''`                                                                                                                                                           |
 | `kpt cfg delete-subst DIR subst_name [flags]`                                                     | `kpt fn eval --image gcr.io/kpt-fn/search-replace:0.1 -- 'by-value=nginx:1.7.1' put-comment=''`                                                                                                                                                      |
-| `kpt cfg annotate DIR/STDIN [flags]`                                                              | `kpt fn eval --image gcr.io/kpt-fn/set-annotation:v0.1 -- 'name=foo' 'value=bar'`                                                                                                                                                                    |
+| `kpt cfg annotate DIR/STDIN [flags]`                                                              | `kpt fn eval --image gcr.io/kpt-fn/set-annotations:v0.1 -- 'name=foo' 'value=bar'`                                                                                                                                                                   |
 | `kpt cfg grep DIR/STDIN [flags]`                                                                  | `kpt fn eval --image gcr.io/kpt-fn/search-replace:v0.1 -- 'by-value=foo' 'by-path=bar'`                                                                                                                                                              |
 | `kpt cfg count DIR/STDIN [flags]`                                                                 | Deprecated.                                                                                                                                                                                                                                          |
 
