fix api > 1.24

rafaelcalleja · Aug 1, 2023 · f3e49ed · f3e49ed
1 parent 1be5fb1
commit f3e49ed
Show file tree

Hide file tree

Showing 11 changed files with 113 additions and 36 deletions.
diff --git a/charts/tekton/Chart.yaml b/charts/tekton/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 description: A Helm chart for Tekton Pipelines
 name: tekton
-version: 0.0.64
+version: 0.0.65
 icon: https://avatars2.githubusercontent.com/u/47602533
 home: https://github.com/jenkins-x-charts/tekton/
diff --git a/charts/tekton/templates/101-podsecuritypolicy.yaml b/charts/tekton/templates/101-podsecuritypolicy.yaml
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "tekton.name" . }}

diff --git a/charts/tekton/templates/200-clusterrolebinding.yaml b/charts/tekton/templates/200-clusterrolebinding.yaml
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name:  {{ template "tekton.name" . }}-{{ .Release.Namespace }}

diff --git a/charts/tekton/templates/300-clustertask.yaml b/charts/tekton/templates/300-clustertask.yaml
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clustertasks.tekton.dev
@@ -22,19 +22,28 @@ spec:
   - name: v1alpha1
     served: true
     storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
   - name: v1beta1
     served: true
     storage: false
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
   names:
     kind: ClusterTask
     plural: clustertasks
     categories:
     - tekton
     - tekton-pipelines
   scope: Cluster
-  # Opt into the status subresource so metadata.generation
-  # starts to increment
-  subresources:
-    status: {}
-  version: v1alpha1
 {{- end -}}
diff --git a/charts/tekton/templates/300-condition.yaml b/charts/tekton/templates/300-condition.yaml
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: conditions.tekton.dev
@@ -27,7 +27,15 @@ spec:
   scope: Namespaced
   # Opt into the status subresource so metadata.generation
   # starts to increment
-  subresources:
-    status: {}
-  version: v1alpha1
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
+          properties:
+            spec:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
 {{- end -}}
diff --git a/charts/tekton/templates/300-imagecache.yaml b/charts/tekton/templates/300-imagecache.yaml
@@ -13,15 +13,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: images.caching.internal.knative.dev
   labels:
     knative.dev/crd-install: "true"
 spec:
   group: caching.internal.knative.dev
-  version: v1alpha1
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
+          properties:
+            spec:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
   names:
     kind: Image
     plural: images
@@ -32,6 +42,4 @@ spec:
     shortNames:
     - img
   scope: Namespaced
-  subresources:
-    status: {}
 {{- end -}}
diff --git a/charts/tekton/templates/300-pipeline.yaml b/charts/tekton/templates/300-pipeline.yaml
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: pipelines.tekton.dev
@@ -22,9 +22,23 @@ spec:
   - name: v1alpha1
     served: true
     storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
   - name: v1beta1
     served: true
     storage: false
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
   names:
     kind: Pipeline
     plural: pipelines
@@ -34,7 +48,4 @@ spec:
   scope: Namespaced
   # Opt into the status subresource so metadata.generation
   # starts to increment
-  subresources:
-    status: {}
-  version: v1alpha1
 {{- end -}}
diff --git a/charts/tekton/templates/300-pipelinerun.yaml b/charts/tekton/templates/300-pipelinerun.yaml
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: pipelineruns.tekton.dev
@@ -22,9 +22,23 @@ spec:
   - name: v1alpha1
     served: true
     storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
   - name: v1beta1
     served: true
     storage: false
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
   names:
     kind: PipelineRun
     plural: pipelineruns
@@ -50,7 +64,4 @@ spec:
     JSONPath: .status.completionTime
   # Opt into the status subresource so metadata.generation
   # starts to increment
-  subresources:
-    status: {}
-  version: v1alpha1
 {{- end -}}
diff --git a/charts/tekton/templates/300-resource.yaml b/charts/tekton/templates/300-resource.yaml
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: pipelineresources.tekton.dev
@@ -27,7 +27,15 @@ spec:
   scope: Namespaced
   # Opt into the status subresource so metadata.generation
   # starts to increment
-  subresources:
-    status: {}
-  version: v1alpha1
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
+          properties:
+            spec:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
 {{- end -}}
diff --git a/charts/tekton/templates/300-task.yaml b/charts/tekton/templates/300-task.yaml
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: tasks.tekton.dev
@@ -22,9 +22,23 @@ spec:
   - name: v1alpha1
     served: true
     storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
   - name: v1beta1
     served: true
     storage: false
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
   names:
     kind: Task
     plural: tasks
@@ -34,7 +48,4 @@ spec:
   scope: Namespaced
   # Opt into the status subresource so metadata.generation
   # starts to increment
-  subresources:
-    status: {}
-  version: v1alpha1
 {{- end -}}
diff --git a/charts/tekton/templates/300-taskrun.yaml b/charts/tekton/templates/300-taskrun.yaml
@@ -22,9 +22,23 @@ spec:
   - name: v1alpha1
     served: true
     storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
   - name: v1beta1
     served: true
     storage: false
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
   names:
     kind: TaskRun
     plural: taskruns
@@ -50,7 +64,4 @@ spec:
     JSONPath: .status.completionTime
   # Opt into the status subresource so metadata.generation
   # starts to increment
-  subresources:
-    status: {}
-  version: v1alpha1
 {{- end -}}