Remove YAML merge and variable from config YAML

tektoncd · Mar 18, 2021 · 0593c7b · 0593c7b
1 parent 02f5f42
commit 0593c7b
Show file tree

Hide file tree

Showing 5 changed files with 116 additions and 20 deletions.
diff --git a/config/300-clustertask.yaml b/config/300-clustertask.yaml
@@ -25,8 +25,7 @@ spec:
   group: tekton.dev
   preserveUnknownFields: false
   versions:
-  - &version
-    name: v1alpha1
+  - name: v1alpha1
     served: true
     storage: false
     schema:
@@ -44,9 +43,24 @@ spec:
     # starts to increment
     subresources:
       status: {}
-  - <<: *version
-    name: v1beta1
+  - name: v1beta1
+    served: true
     storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        # One can use x-kubernetes-preserve-unknown-fields: true
+        # at the root of the schema (and inside any properties, additionalProperties)
+        # to get the traditional CRD behaviour that nothing is pruned, despite
+        # setting spec.preserveUnknownProperties: false.
+        #
+        # See https://kubernetes.io/blog/2019/06/20/crd-structural-schema/
+        # See issue: https://github.com/knative/serving/issues/912
+        x-kubernetes-preserve-unknown-fields: true
+    # Opt into the status subresource so metadata.generation
+    # starts to increment
+    subresources:
+      status: {}
   names:
     kind: ClusterTask
     plural: clustertasks

diff --git a/config/300-pipeline.yaml b/config/300-pipeline.yaml
@@ -25,8 +25,7 @@ spec:
   group: tekton.dev
   preserveUnknownFields: false
   versions:
-  - &version
-    name: v1alpha1
+  - name: v1alpha1
     served: true
     storage: false
     # Opt into the status subresource so metadata.generation
@@ -44,9 +43,24 @@ spec:
         # See https://kubernetes.io/blog/2019/06/20/crd-structural-schema/
         # See issue: https://github.com/knative/serving/issues/912
         x-kubernetes-preserve-unknown-fields: true
-  - <<: *version
-    name: v1beta1
+  - name: v1beta1
+    served: true
     storage: true
+    # Opt into the status subresource so metadata.generation
+    # starts to increment
+    subresources:
+      status: {}
+    schema:
+      openAPIV3Schema:
+        type: object
+        # One can use x-kubernetes-preserve-unknown-fields: true
+        # at the root of the schema (and inside any properties, additionalProperties)
+        # to get the traditional CRD behaviour that nothing is pruned, despite
+        # setting spec.preserveUnknownProperties: false.
+        #
+        # See https://kubernetes.io/blog/2019/06/20/crd-structural-schema/
+        # See issue: https://github.com/knative/serving/issues/912
+        x-kubernetes-preserve-unknown-fields: true
   names:
     kind: Pipeline
     plural: pipelines

diff --git a/config/300-pipelinerun.yaml b/config/300-pipelinerun.yaml
@@ -25,8 +25,7 @@ spec:
   group: tekton.dev
   preserveUnknownFields: false
   versions:
-  - &version
-    name: v1alpha1
+  - name: v1alpha1
     served: true
     storage: false
     schema:
@@ -57,9 +56,37 @@ spec:
     # starts to increment
     subresources:
       status: {}
-  - <<: *version
-    name: v1beta1
+  - name: v1beta1
+    served: true
     storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        # One can use x-kubernetes-preserve-unknown-fields: true
+        # at the root of the schema (and inside any properties, additionalProperties)
+        # to get the traditional CRD behaviour that nothing is pruned, despite
+        # setting spec.preserveUnknownProperties: false.
+        #
+        # See https://kubernetes.io/blog/2019/06/20/crd-structural-schema/
+        # See issue: https://github.com/knative/serving/issues/912
+        x-kubernetes-preserve-unknown-fields: true
+    additionalPrinterColumns:
+    - name: Succeeded
+      type: string
+      jsonPath: ".status.conditions[?(@.type==\"Succeeded\")].status"
+    - name: Reason
+      type: string
+      jsonPath: ".status.conditions[?(@.type==\"Succeeded\")].reason"
+    - name: StartTime
+      type: date
+      jsonPath: .status.startTime
+    - name: CompletionTime
+      type: date
+      jsonPath: .status.completionTime
+    # Opt into the status subresource so metadata.generation
+    # starts to increment
+    subresources:
+      status: {}
   names:
     kind: PipelineRun
     plural: pipelineruns

diff --git a/config/300-task.yaml b/config/300-task.yaml
@@ -25,8 +25,7 @@ spec:
   group: tekton.dev
   preserveUnknownFields: false
   versions:
-  - &version
-    name: v1alpha1
+  - name: v1alpha1
     served: true
     storage: false
     schema:
@@ -44,9 +43,24 @@ spec:
     # starts to increment
     subresources:
       status: {}
-  - <<: *version
-    name: v1beta1
+  - name: v1beta1
+    served: true
     storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        # One can use x-kubernetes-preserve-unknown-fields: true
+        # at the root of the schema (and inside any properties, additionalProperties)
+        # to get the traditional CRD behaviour that nothing is pruned, despite
+        # setting spec.preserveUnknownProperties: false.
+        #
+        # See https://kubernetes.io/blog/2019/06/20/crd-structural-schema/
+        # See issue: https://github.com/knative/serving/issues/912
+        x-kubernetes-preserve-unknown-fields: true
+    # Opt into the status subresource so metadata.generation
+    # starts to increment
+    subresources:
+      status: {}
   names:
     kind: Task
     plural: tasks

diff --git a/config/300-taskrun.yaml b/config/300-taskrun.yaml
@@ -25,8 +25,7 @@ spec:
   group: tekton.dev
   preserveUnknownFields: false
   versions:
-  - &version
-    name: v1alpha1
+  - name: v1alpha1
     served: true
     storage: false
     schema:
@@ -57,9 +56,37 @@ spec:
     # starts to increment
     subresources:
       status: {}
-  - <<: *version
-    name: v1beta1
+  - name: v1beta1
+    served: true
     storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        # One can use x-kubernetes-preserve-unknown-fields: true
+        # at the root of the schema (and inside any properties, additionalProperties)
+        # to get the traditional CRD behaviour that nothing is pruned, despite
+        # setting spec.preserveUnknownProperties: false.
+        #
+        # See https://kubernetes.io/blog/2019/06/20/crd-structural-schema/
+        # See issue: https://github.com/knative/serving/issues/912
+        x-kubernetes-preserve-unknown-fields: true
+    additionalPrinterColumns:
+    - name: Succeeded
+      type: string
+      jsonPath: ".status.conditions[?(@.type==\"Succeeded\")].status"
+    - name: Reason
+      type: string
+      jsonPath: ".status.conditions[?(@.type==\"Succeeded\")].reason"
+    - name: StartTime
+      type: date
+      jsonPath: .status.startTime
+    - name: CompletionTime
+      type: date
+      jsonPath: .status.completionTime
+    # Opt into the status subresource so metadata.generation
+    # starts to increment
+    subresources:
+      status: {}
   names:
     kind: TaskRun
     plural: taskruns