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
enterprise-contract · Oct 24, 2023 · 8f7eaa2 · 8f7eaa2
1 parent 76b78d3
commit 8f7eaa2
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 27 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -74,7 +74,7 @@ function build() {
     pipeline_run="${name}-$(openssl rand --hex 8)"
 
     kubectl create -o yaml --dry-run=client -f - <<EOF | kubectl apply -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
@@ -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
@@ -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
@@ -28,23 +28,23 @@ import (
 )
 
 var testJSONPipelineData = `{
-    "apiVersion": "tekton.dev/v1beta1",
+    "apiVersion": "tekton.dev/v1",
     "kind": "Pipeline",
     "metadata": {
         "name": "run-component-build"
     }
 }
 `
 
-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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