bump ResourceList from v1alpha1 to v1

2026-06-11 17:12:51 +00:00 · 2021-10-19 15:31:11 -07:00
parent 5765ab4dbc
commit c3c02887ec
17 changed files with 90 additions and 90 deletions
--- a/kyaml/fn/framework/command/example_test.go
+++ b/kyaml/fn/framework/command/example_test.go
@@ -37,7 +37,7 @@ func ExampleBuild_modify() {

 	// for testing purposes only -- normally read from stdin when Executing
 	cmd.SetIn(bytes.NewBufferString(`
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 # items are provided as nodes
 items:
@@ -61,7 +61,7 @@ functionConfig:
 	}

 	// Output:
-	// apiVersion: config.kubernetes.io/v1alpha1
+	// apiVersion: config.kubernetes.io/v1
 	// kind: ResourceList
 	// items:
 	// - apiVersion: apps/v1
@@ -133,7 +133,7 @@ metadata:

 	// for testing purposes only -- normally read from stdin when Executing
 	cmd.SetIn(bytes.NewBufferString(`
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 # items are provided as nodes
 items:
@@ -154,7 +154,7 @@ functionConfig:
 	}

 	// Output:
-	// apiVersion: config.kubernetes.io/v1alpha1
+	// apiVersion: config.kubernetes.io/v1
 	// kind: ResourceList
 	// items:
 	// - apiVersion: apps/v1
@@ -241,7 +241,7 @@ metadata:

 	// for testing purposes only -- normally read from stdin when Executing
 	cmd.SetIn(bytes.NewBufferString(`
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 # items are provided as nodes
 items:
@@ -268,7 +268,7 @@ functionConfig:
 	}

 	// Output:
-	// apiVersion: config.kubernetes.io/v1alpha1
+	// apiVersion: config.kubernetes.io/v1
 	// kind: ResourceList
 	// items:
 	// - apiVersion: apps/v1
@@ -346,7 +346,7 @@ func ExampleBuild_validate() {
 	cmd := command.Build(framework.ResourceListProcessorFunc(fn), command.StandaloneDisabled, true)
 	// for testing purposes only -- normally read from stdin when Executing
 	cmd.SetIn(bytes.NewBufferString(`
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 # items are provided as nodes
 items:
@@ -362,7 +362,7 @@ items:
 	}

 	// Output:
-	// apiVersion: config.kubernetes.io/v1alpha1
+	// apiVersion: config.kubernetes.io/v1
 	// kind: ResourceList
 	// items:
 	// - apiVersion: apps/v1
--- a/kyaml/fn/framework/example_test.go
+++ b/kyaml/fn/framework/example_test.go
@@ -23,7 +23,7 @@ const service = "Service"
 // ExampleSimpleProcessor_modify implements a function that sets an annotation on each resource.
 func ExampleSimpleProcessor_modify() {
 	input := bytes.NewBufferString(`
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 # items are provided as nodes
 items:
@@ -60,7 +60,7 @@ functionConfig:
 	}

 	// Output:
-	// apiVersion: config.kubernetes.io/v1alpha1
+	// apiVersion: config.kubernetes.io/v1
 	// kind: ResourceList
 	// items:
 	// - apiVersion: apps/v1
@@ -86,7 +86,7 @@ functionConfig:
 // If the resource already exists, it replaces the resource with a new copy.
 func ExampleSimpleProcessor_generateReplace() {
 	input := bytes.NewBufferString(`
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 # items are provided as nodes
 items:
@@ -150,7 +150,7 @@ metadata:
 	}

 	// Output:
-	// apiVersion: config.kubernetes.io/v1alpha1
+	// apiVersion: config.kubernetes.io/v1
 	// kind: ResourceList
 	// items:
 	// - apiVersion: apps/v1
@@ -471,7 +471,7 @@ spec:
 	// The second resource will be treated as a patch since its metadata matches the resource
 	// generated by ResourceTemplates and MergeResources is true.
 	rw := kio.ByteReadWriter{Reader: bytes.NewBufferString(`
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - kind: Deployment
@@ -501,7 +501,7 @@ functionConfig:
 	}

 	// Output:
-	// apiVersion: config.kubernetes.io/v1alpha1
+	// apiVersion: config.kubernetes.io/v1
 	// kind: ResourceList
 	// items:
 	// - apiVersion: apps/v1
@@ -543,7 +543,7 @@ func ExampleSelector_templatizeKinds() {
 	}
 	rw := &kio.ByteReadWriter{
 		Reader: bytes.NewBufferString(`
-apiVersion: config.kubernetes.io/v1beta1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 functionConfig:
  kindName: Deployment
@@ -575,7 +575,7 @@ items:
 	}

 	// Output:
-	// apiVersion: config.kubernetes.io/v1beta1
+	// apiVersion: config.kubernetes.io/v1
 	// kind: ResourceList
 	// items:
 	// - apiVersion: apps/v1
@@ -595,7 +595,7 @@ func ExampleSelector_templatizeAnnotations() {
 		Value string `yaml:"value"`
 	}
 	rw := &kio.ByteReadWriter{Reader: bytes.NewBufferString(`
-apiVersion: config.kubernetes.io/v1beta1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 functionConfig:
  value: bar
@@ -629,7 +629,7 @@ items:
 	}

 	// Output:
-	// apiVersion: config.kubernetes.io/v1beta1
+	// apiVersion: config.kubernetes.io/v1
 	// kind: ResourceList
 	// items:
 	// - apiVersion: apps/v1
@@ -995,7 +995,7 @@ func ExampleVersionedAPIProcessor() {
 		}}}

 	source := &kio.ByteReadWriter{Reader: bytes.NewBufferString(`
-apiVersion: config.kubernetes.io/v1beta1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 functionConfig:
  apiVersion: example.com/v1alpha1 
@@ -1011,7 +1011,7 @@ functionConfig:
 	}

 	// Output:
-	// apiVersion: config.kubernetes.io/v1beta1
+	// apiVersion: config.kubernetes.io/v1
 	// kind: ResourceList
 	// items:
 	// - apiVersion: apps/v1
--- a/kyaml/fn/framework/framework_test.go
+++ b/kyaml/fn/framework/framework_test.go
@@ -48,7 +48,7 @@ func TestExecute_Result(t *testing.T) {
 	out := new(bytes.Buffer)
 	source := &kio.ByteReadWriter{Reader: bytes.NewBufferString(`
 kind: ResourceList
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 items:
 - kind: Deployment
  apiVersion: v1
@@ -63,7 +63,7 @@ items:

 [error] : some error`)
 	assert.Equal(t, 1, err.(*framework.Result).ExitCode())
-	assert.Equal(t, `apiVersion: config.kubernetes.io/v1alpha1
+	assert.Equal(t, `apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - kind: Deployment
--- a/kyaml/fn/framework/processors_test.go
+++ b/kyaml/fn/framework/processors_test.go
@@ -35,7 +35,7 @@ func TestTemplateProcessor_ResourceTemplates(t *testing.T) {

 	out := new(bytes.Buffer)
 	rw := &kio.ByteReadWriter{Reader: bytes.NewBufferString(`
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: v1
@@ -47,7 +47,7 @@ functionConfig:

 	require.NoError(t, framework.Execute(p, rw))
 	require.Equal(t, strings.TrimSpace(`
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: v1
@@ -98,7 +98,7 @@ metadata:
 	out := new(bytes.Buffer)

 	rw := &kio.ByteReadWriter{Reader: bytes.NewBufferString(`
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: apps/v1
@@ -130,7 +130,7 @@ functionConfig:

 	require.NoError(t, framework.Execute(p, rw))
 	require.Equal(t, strings.TrimSpace(`
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: apps/v1
@@ -194,7 +194,7 @@ env:

 	out := new(bytes.Buffer)
 	rw := &kio.ByteReadWriter{Reader: bytes.NewBufferString(`
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: apps/v1
@@ -231,7 +231,7 @@ functionConfig:

 	require.NoError(t, framework.Execute(p, rw))
 	require.Equal(t, strings.TrimSpace(`
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: apps/v1
@@ -300,7 +300,7 @@ func TestTemplateProcessor_ContainerPatchTemplates_MultipleWorkloadKinds(t *test

 	out := new(bytes.Buffer)
 	rw := &kio.ByteReadWriter{Writer: out, Reader: bytes.NewBufferString(`
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items: []
 functionConfig:
@@ -591,7 +591,7 @@ func TestTemplateProcessor_AdditionalSchemas(t *testing.T) {
 	out := new(bytes.Buffer)

 	rw := &kio.ByteReadWriter{Reader: bytes.NewBufferString(`
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: example.com/v1
@@ -606,7 +606,7 @@ items:
 		Writer: out}
 	require.NoError(t, framework.Execute(p, rw))
 	require.Equal(t, strings.TrimSpace(`
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: example.com/v1
--- a/kyaml/fn/framework/testdata/validation/error/input.yaml
+++ b/kyaml/fn/framework/testdata/validation/error/input.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0

 kind: ResourceList
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 functionConfig:
  apiVersion: example.com/v1alpha1
  kind: JavaSpringBoot
--- a/kyaml/fn/runtime/runtimeutil/runtimeutil_test.go
+++ b/kyaml/fn/runtime/runtimeutil/runtimeutil_test.go
@@ -62,7 +62,7 @@ func TestFunctionFilter_Filter(t *testing.T) {
 			name: "default_file_path_annotation",
 			run: testRun{
 				output: `
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: apps/v1
@@ -103,7 +103,7 @@ metadata:
 			name: "no_default_file_path_annotation",
 			run: testRun{
 				output: `
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: apps/v1
@@ -146,7 +146,7 @@ metadata:
 			name: "write_read",
 			run: testRun{
 				output: `
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: v1
@@ -203,7 +203,7 @@ metadata:
 		{
 			name: "write_results_file",
 			run: testRun{
-				output: `apiVersion: config.kubernetes.io/v1alpha1
+				output: `apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: apps/v1
@@ -283,7 +283,7 @@ metadata:
 			run: testRun{
 				err: fmt.Errorf("failed"),
 				output: `
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: apps/v1
@@ -363,7 +363,7 @@ metadata:
 			run: testRun{
 				err: fmt.Errorf("failed"),
 				output: `
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: apps/v1
@@ -440,7 +440,7 @@ metadata:
 			noMakeResultsFile: true,
 			run: testRun{
 				output: `
-apiVersion: config.kubernetes.io/v1alpha1
+apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: apps/v1
@@ -487,7 +487,7 @@ metadata:
 		{
 			name: "scope_resources_by_directory",
 			run: testRun{
-				expectedInput: `apiVersion: config.kubernetes.io/v1alpha1
+				expectedInput: `apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: v1
@@ -506,7 +506,7 @@ functionConfig:
    annotations:
      config.kubernetes.io/path: 'foo/bar.yaml'
 `,
-				output: `apiVersion: config.kubernetes.io/v1alpha1
+				output: `apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: v1
@@ -578,7 +578,7 @@ metadata:
 		{
 			name: "scope_resources_by_directory_resources_missing_path",
 			run: testRun{
-				expectedInput: `apiVersion: config.kubernetes.io/v1alpha1
+				expectedInput: `apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: v1
@@ -597,7 +597,7 @@ functionConfig:
    annotations:
      config.kubernetes.io/path: 'foo/bar.yaml'
 `,
-				output: `apiVersion: config.kubernetes.io/v1alpha1
+				output: `apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: v1
@@ -666,7 +666,7 @@ metadata:
 			name:     "scope_resources_global",
 			instance: FunctionFilter{GlobalScope: true},
 			run: testRun{
-				expectedInput: `apiVersion: config.kubernetes.io/v1alpha1
+				expectedInput: `apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: apps/v1
@@ -693,7 +693,7 @@ functionConfig:
    annotations:
      config.kubernetes.io/path: 'foo/bar.yaml'
 `,
-				output: `apiVersion: config.kubernetes.io/v1alpha1
+				output: `apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: apps/v1
@@ -770,7 +770,7 @@ metadata:
 		{
 			name: "scope_no_resources",
 			run: testRun{
-				expectedInput: `apiVersion: config.kubernetes.io/v1alpha1
+				expectedInput: `apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items: []
 functionConfig:
@@ -781,7 +781,7 @@ functionConfig:
    annotations:
      config.kubernetes.io/path: 'foo/bar.yaml'
 `,
-				output: `apiVersion: config.kubernetes.io/v1alpha1
+				output: `apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items: []
 functionConfig:
@@ -840,7 +840,7 @@ metadata:
 		{
 			name: "scope_functions_dir",
 			run: testRun{
-				expectedInput: `apiVersion: config.kubernetes.io/v1alpha1
+				expectedInput: `apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: v1
@@ -859,7 +859,7 @@ functionConfig:
    annotations:
      config.kubernetes.io/path: 'foo/functions/bar.yaml'
 `,
-				output: `apiVersion: config.kubernetes.io/v1alpha1
+				output: `apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: v1
@@ -931,7 +931,7 @@ metadata:
 		{
 			name: "copy_comments",
 			run: testRun{
-				expectedInput: `apiVersion: config.kubernetes.io/v1alpha1
+				expectedInput: `apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: apps/v1
@@ -959,7 +959,7 @@ functionConfig:
      config.kubernetes.io/path: 'foo/f.yaml'
 `,
 				// delete the comment
-				output: `apiVersion: config.kubernetes.io/v1alpha1
+				output: `apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:
 - apiVersion: apps/v1