From 8f7eaa273dc77eb3d06e94c6caca9eedbd0d062c Mon Sep 17 00:00:00 2001 From: Zoran Regvart Date: Tue, 24 Oct 2023 16:58:20 +0200 Subject: [PATCH] Replace `tekton.dev/v1beta1` with `tekton.dev/v1` I did a semi reviewed global replacement of `tekton.dev/v1beta1` with `tekton.dev/v1`. ref: EC-29 --- .tekton/pull-request.yaml | 2 +- .tekton/push.yaml | 2 +- features/validate_definition.feature | 4 ++-- hack/generate-test-signed-images.sh | 2 +- hack/rebuild.sh | 2 +- internal/test_data/pipeline_definitions/pipeline.json | 4 ++-- internal/test_data/pipeline_definitions/pipeline.yaml | 4 ++-- internal/utils/helpers_test.go | 8 ++++---- pkg/schema/examples/hacbs1_invalid.json | 2 +- tasks/verify-definition/0.1/README.md | 5 +---- .../0.1/tests/verify-definition-taskrun.yaml | 2 +- tasks/verify-definition/0.1/verify-definition.yaml | 2 +- tasks/verify-enterprise-contract/0.1/README.md | 5 +---- .../0.1/tests/verify-enterprise-contract-taskrun.yaml | 2 +- .../0.1/verify-enterprise-contract.yaml | 2 +- 15 files changed, 21 insertions(+), 27 deletions(-) diff --git a/.tekton/pull-request.yaml b/.tekton/pull-request.yaml index aab2c5c40..15eee8db1 100644 --- a/.tekton/pull-request.yaml +++ b/.tekton/pull-request.yaml @@ -14,7 +14,7 @@ # # SPDX-License-Identifier: Apache-2.0 --- -apiVersion: tekton.dev/v1beta1 +apiVersion: tekton.dev/v1 kind: PipelineRun metadata: annotations: diff --git a/.tekton/push.yaml b/.tekton/push.yaml index d1c18f767..1dc3b32c3 100644 --- a/.tekton/push.yaml +++ b/.tekton/push.yaml @@ -14,7 +14,7 @@ # # SPDX-License-Identifier: Apache-2.0 --- -apiVersion: tekton.dev/v1beta1 +apiVersion: tekton.dev/v1 kind: PipelineRun metadata: annotations: diff --git a/features/validate_definition.feature b/features/validate_definition.feature index 768960624..992f7f36e 100644 --- a/features/validate_definition.feature +++ b/features/validate_definition.feature @@ -11,7 +11,7 @@ Feature: validate pipeline definition Given a pipeline definition file named "pipeline_definition.yaml" containing """ --- - apiVersion: tekton.dev/v1beta1 + apiVersion: tekton.dev/v1 kind: Pipeline metadata: name: basic-build @@ -32,7 +32,7 @@ Feature: validate pipeline definition Given a pipeline definition file named "pipeline_definition.yaml" containing """ --- - apiVersion: tekton.dev/v1beta1 + apiVersion: tekton.dev/v1 kind: Pipeline metadata: name: basic-build diff --git a/hack/generate-test-signed-images.sh b/hack/generate-test-signed-images.sh index 93fb44c7d..a076d546b 100755 --- a/hack/generate-test-signed-images.sh +++ b/hack/generate-test-signed-images.sh @@ -153,7 +153,7 @@ provenance=' "builder": { "id": "https://tekton.dev/chains/v2" }, - "buildType": "tekton.dev/v1beta1/PipelineRun", + "buildType": "tekton.dev/v1/PipelineRun", "invocation": {}, "metadata": { "buildStartedOn": "2023-03-22T19:38:01Z", diff --git a/hack/rebuild.sh b/hack/rebuild.sh index b92660167..f5d42965f 100755 --- a/hack/rebuild.sh +++ b/hack/rebuild.sh @@ -74,7 +74,7 @@ function build() { pipeline_run="${name}-$(openssl rand --hex 8)" kubectl create -o yaml --dry-run=client -f - <&2 -apiVersion: tekton.dev/v1beta1 +apiVersion: tekton.dev/v1 kind: PipelineRun metadata: name: ${pipeline_run} diff --git a/internal/test_data/pipeline_definitions/pipeline.json b/internal/test_data/pipeline_definitions/pipeline.json index 81253dc06..5d288008b 100755 --- a/internal/test_data/pipeline_definitions/pipeline.json +++ b/internal/test_data/pipeline_definitions/pipeline.json @@ -1,10 +1,10 @@ { - "apiVersion": "tekton.dev/v1beta1", + "apiVersion": "tekton.dev/v1", "kind": "Pipeline", "metadata": { "annotations": { "argocd.argoproj.io/sync-options": "SkipDryRunOnMissingResource=true", - "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"tekton.dev/v1beta1\",\"kind\":\"Pipeline\",\"metadata\":{\"annotations\":{\"argocd.argoproj.io/sync-options\":\"SkipDryRunOnMissingResource=true\"},\"labels\":{\"app.kubernetes.io/instance\":\"build\"},\"name\":\"run-component-build\",\"namespace\":\"jvm-build-service\"},\"spec\":{\"params\":[{\"name\":\"url\",\"type\":\"string\"},{\"default\":\"\",\"name\":\"context\",\"type\":\"string\"},{\"name\":\"tag\",\"type\":\"string\"}],\"results\":[{\"description\":\"The GAVs of any community artifacts that ended up in the output\",\"name\":\"contaminants\",\"value\":\"$(tasks.maven-run.results.contaminants)\"}],\"tasks\":[{\"name\":\"fetch-repository\",\"params\":[{\"name\":\"url\",\"value\":\"$(params.url)\"},{\"name\":\"subdirectory\",\"value\":\"\"},{\"name\":\"deleteExisting\",\"value\":\"true\"},{\"name\":\"revision\",\"value\":\"$(params.tag)\"}],\"taskRef\":{\"name\":\"git-clone\"},\"workspaces\":[{\"name\":\"output\",\"workspace\":\"shared-workspace\"}]},{\"name\":\"maven-run\",\"params\":[{\"name\":\"MAVEN_MIRROR_URL\",\"value\":\"http://localhost:2000/maven2\"},{\"name\":\"CONTEXT_DIR\",\"value\":\"$(params.context)\"},{\"name\":\"GOALS\",\"value\":[\"-DskipTests\",\"clean\",\"install\",\"-Denforcer.skip\"]}],\"runAfter\":[\"fetch-repository\"],\"taskRef\":{\"name\":\"run-maven-component-build\"},\"workspaces\":[{\"name\":\"maven-settings\",\"workspace\":\"maven-settings\"},{\"name\":\"source\",\"workspace\":\"shared-workspace\"}]}],\"workspaces\":[{\"name\":\"shared-workspace\"},{\"name\":\"maven-settings\"}]}}\n" + "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"tekton.dev/v1\",\"kind\":\"Pipeline\",\"metadata\":{\"annotations\":{\"argocd.argoproj.io/sync-options\":\"SkipDryRunOnMissingResource=true\"},\"labels\":{\"app.kubernetes.io/instance\":\"build\"},\"name\":\"run-component-build\",\"namespace\":\"jvm-build-service\"},\"spec\":{\"params\":[{\"name\":\"url\",\"type\":\"string\"},{\"default\":\"\",\"name\":\"context\",\"type\":\"string\"},{\"name\":\"tag\",\"type\":\"string\"}],\"results\":[{\"description\":\"The GAVs of any community artifacts that ended up in the output\",\"name\":\"contaminants\",\"value\":\"$(tasks.maven-run.results.contaminants)\"}],\"tasks\":[{\"name\":\"fetch-repository\",\"params\":[{\"name\":\"url\",\"value\":\"$(params.url)\"},{\"name\":\"subdirectory\",\"value\":\"\"},{\"name\":\"deleteExisting\",\"value\":\"true\"},{\"name\":\"revision\",\"value\":\"$(params.tag)\"}],\"taskRef\":{\"name\":\"git-clone\"},\"workspaces\":[{\"name\":\"output\",\"workspace\":\"shared-workspace\"}]},{\"name\":\"maven-run\",\"params\":[{\"name\":\"MAVEN_MIRROR_URL\",\"value\":\"http://localhost:2000/maven2\"},{\"name\":\"CONTEXT_DIR\",\"value\":\"$(params.context)\"},{\"name\":\"GOALS\",\"value\":[\"-DskipTests\",\"clean\",\"install\",\"-Denforcer.skip\"]}],\"runAfter\":[\"fetch-repository\"],\"taskRef\":{\"name\":\"run-maven-component-build\"},\"workspaces\":[{\"name\":\"maven-settings\",\"workspace\":\"maven-settings\"},{\"name\":\"source\",\"workspace\":\"shared-workspace\"}]}],\"workspaces\":[{\"name\":\"shared-workspace\"},{\"name\":\"maven-settings\"}]}}\n" }, "creationTimestamp": "2022-05-25T09:45:35Z", "generation": 1, diff --git a/internal/test_data/pipeline_definitions/pipeline.yaml b/internal/test_data/pipeline_definitions/pipeline.yaml index bd455b7e4..14035d5f5 100644 --- a/internal/test_data/pipeline_definitions/pipeline.yaml +++ b/internal/test_data/pipeline_definitions/pipeline.yaml @@ -14,13 +14,13 @@ # # SPDX-License-Identifier: Apache-2.0 -apiVersion: tekton.dev/v1beta1 +apiVersion: tekton.dev/v1 kind: Pipeline metadata: annotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true kubectl.kubernetes.io/last-applied-configuration: | - {"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"argocd.argoproj.io/sync-options":"SkipDryRunOnMissingResource=true"},"labels":{"app.kubernetes.io/instance":"build"},"name":"run-component-build","namespace":"jvm-build-service"},"spec":{"params":[{"name":"url","type":"string"},{"default":"","name":"context","type":"string"},{"name":"tag","type":"string"}],"results":[{"description":"The GAVs of any community artifacts that ended up in the output","name":"contaminants","value":"$(tasks.maven-run.results.contaminants)"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.url)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"},{"name":"revision","value":"$(params.tag)"}],"taskRef":{"name":"git-clone"},"workspaces":[{"name":"output","workspace":"shared-workspace"}]},{"name":"maven-run","params":[{"name":"MAVEN_MIRROR_URL","value":"http://localhost:2000/maven2"},{"name":"CONTEXT_DIR","value":"$(params.context)"},{"name":"GOALS","value":["-DskipTests","clean","install","-Denforcer.skip"]}],"runAfter":["fetch-repository"],"taskRef":{"name":"run-maven-component-build"},"workspaces":[{"name":"maven-settings","workspace":"maven-settings"},{"name":"source","workspace":"shared-workspace"}]}],"workspaces":[{"name":"shared-workspace"},{"name":"maven-settings"}]}} + {"apiVersion":"tekton.dev/v1","kind":"Pipeline","metadata":{"annotations":{"argocd.argoproj.io/sync-options":"SkipDryRunOnMissingResource=true"},"labels":{"app.kubernetes.io/instance":"build"},"name":"run-component-build","namespace":"jvm-build-service"},"spec":{"params":[{"name":"url","type":"string"},{"default":"","name":"context","type":"string"},{"name":"tag","type":"string"}],"results":[{"description":"The GAVs of any community artifacts that ended up in the output","name":"contaminants","value":"$(tasks.maven-run.results.contaminants)"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.url)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"},{"name":"revision","value":"$(params.tag)"}],"taskRef":{"name":"git-clone"},"workspaces":[{"name":"output","workspace":"shared-workspace"}]},{"name":"maven-run","params":[{"name":"MAVEN_MIRROR_URL","value":"http://localhost:2000/maven2"},{"name":"CONTEXT_DIR","value":"$(params.context)"},{"name":"GOALS","value":["-DskipTests","clean","install","-Denforcer.skip"]}],"runAfter":["fetch-repository"],"taskRef":{"name":"run-maven-component-build"},"workspaces":[{"name":"maven-settings","workspace":"maven-settings"},{"name":"source","workspace":"shared-workspace"}]}],"workspaces":[{"name":"shared-workspace"},{"name":"maven-settings"}]}} creationTimestamp: "2022-05-25T09:45:35Z" generation: 1 labels: diff --git a/internal/utils/helpers_test.go b/internal/utils/helpers_test.go index 9728b6506..601c1c8a7 100644 --- a/internal/utils/helpers_test.go +++ b/internal/utils/helpers_test.go @@ -28,7 +28,7 @@ import ( ) var testJSONPipelineData = `{ - "apiVersion": "tekton.dev/v1beta1", + "apiVersion": "tekton.dev/v1", "kind": "Pipeline", "metadata": { "name": "run-component-build" @@ -36,15 +36,15 @@ var testJSONPipelineData = `{ } ` -var testYAMLPipelineData = `apiVersion: tekton.dev/v1beta1 +var testYAMLPipelineData = `apiVersion: tekton.dev/v1 kind: Pipeline metadata: name: run-component-build ` -var testYamlConvertedToJSON = `{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"name":"run-component-build"}}` +var testYamlConvertedToJSON = `{"apiVersion":"tekton.dev/v1","kind":"Pipeline","metadata":{"name":"run-component-build"}}` -var testJSONMissingPrefix = `"apiVersion": "tekton.dev/v1beta1", +var testJSONMissingPrefix = `"apiVersion": "tekton.dev/v1", "kind": "Pipeline", "metadata": { "name": "run-component-build" diff --git a/pkg/schema/examples/hacbs1_invalid.json b/pkg/schema/examples/hacbs1_invalid.json index 23f2e96a3..b66c73f81 100644 --- a/pkg/schema/examples/hacbs1_invalid.json +++ b/pkg/schema/examples/hacbs1_invalid.json @@ -13,7 +13,7 @@ "builder": { "id": "https://tekton.dev/chains/v2" }, - "buildType": "tekton.dev/v1beta1/TaskRun", + "buildType": "tekton.dev/v1/TaskRun", "invocation": { "configSource": {}, "parameters": { diff --git a/tasks/verify-definition/0.1/README.md b/tasks/verify-definition/0.1/README.md index bc3ffd01c..0a9a81ffb 100644 --- a/tasks/verify-definition/0.1/README.md +++ b/tasks/verify-definition/0.1/README.md @@ -21,7 +21,7 @@ This TaskRun runs the Task to verify the JSON string '{"kind": "Task"}'. ```yaml --- -apiVersion: tekton.dev/v1beta1 +apiVersion: tekton.dev/v1 kind: TaskRun metadata: generateName: verify-definition-run- @@ -48,6 +48,3 @@ spec: value: task timeout: 10m ``` - - - diff --git a/tasks/verify-definition/0.1/tests/verify-definition-taskrun.yaml b/tasks/verify-definition/0.1/tests/verify-definition-taskrun.yaml index 344f38306..8fab20db6 100644 --- a/tasks/verify-definition/0.1/tests/verify-definition-taskrun.yaml +++ b/tasks/verify-definition/0.1/tests/verify-definition-taskrun.yaml @@ -14,7 +14,7 @@ # # SPDX-License-Identifier: Apache-2.0 --- -apiVersion: tekton.dev/v1beta1 +apiVersion: tekton.dev/v1 kind: TaskRun metadata: generateName: verify-definition-run- diff --git a/tasks/verify-definition/0.1/verify-definition.yaml b/tasks/verify-definition/0.1/verify-definition.yaml index 5b7ff41e5..c6b054dbe 100644 --- a/tasks/verify-definition/0.1/verify-definition.yaml +++ b/tasks/verify-definition/0.1/verify-definition.yaml @@ -15,7 +15,7 @@ # SPDX-License-Identifier: Apache-2.0 --- -apiVersion: tekton.dev/v1beta1 +apiVersion: tekton.dev/v1 kind: Task metadata: name: verify-definition diff --git a/tasks/verify-enterprise-contract/0.1/README.md b/tasks/verify-enterprise-contract/0.1/README.md index 3401bdbd5..d2baff9ca 100644 --- a/tasks/verify-enterprise-contract/0.1/README.md +++ b/tasks/verify-enterprise-contract/0.1/README.md @@ -27,7 +27,7 @@ kubectl apply -f https://raw.githubusercontent.com/enterprise-contract/ec-cli/ma This TaskRun runs the Task to verify an image. This assumes a policy is created and stored on the cluster with hte namespaced name of `enterprise-contract-service/default`. For more information on creating a policy, refer to the Enterprise Contract [documentation](https://enterprise-contract.github.io/ecc/main/index.html). ```yaml -apiVersion: tekton.dev/v1beta1 +apiVersion: tekton.dev/v1 kind: TaskRun metadata: name: verify-enterprise-contract @@ -38,6 +38,3 @@ spec: - name: IMAGES value: '{"components": ["containerImage": "quay.io/example/repo:latest"]}' ``` - - - diff --git a/tasks/verify-enterprise-contract/0.1/tests/verify-enterprise-contract-taskrun.yaml b/tasks/verify-enterprise-contract/0.1/tests/verify-enterprise-contract-taskrun.yaml index 54b578d2c..0db05a376 100644 --- a/tasks/verify-enterprise-contract/0.1/tests/verify-enterprise-contract-taskrun.yaml +++ b/tasks/verify-enterprise-contract/0.1/tests/verify-enterprise-contract-taskrun.yaml @@ -14,7 +14,7 @@ # # SPDX-License-Identifier: Apache-2.0 --- -apiVersion: tekton.dev/v1beta1 +apiVersion: tekton.dev/v1 kind: TaskRun metadata: generateName: verify-enterprise-contract-run- diff --git a/tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml b/tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml index 51d20bbd3..4b89c135b 100644 --- a/tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml +++ b/tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml @@ -15,7 +15,7 @@ # SPDX-License-Identifier: Apache-2.0 --- -apiVersion: tekton.dev/v1beta1 +apiVersion: tekton.dev/v1 kind: Task metadata: name: verify-enterprise-contract