Merge branch 'master' into ks192preverify

PROJECT

@@ -54,6 +54,14 @@ resources:
   kind: TierTemplate
   path: ../github.com/codeready-toolchain/api/api/v1alpha1
   version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  group: toolchain.dev.openshift.com
+  kind: TierTemplateRevision
+  path: ../github.com/codeready-toolchain/api/api/v1alpha1
+  version: v1alpha1
 - api:
     crdVersion: v1
     namespaced: true

config/crd/bases/toolchain.dev.openshift.com_tiertemplaterevisions.yaml

@@ -0,0 +1,60 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.10.0
+  creationTimestamp: null
+  name: tiertemplaterevisions.toolchain.dev.openshift.com
+spec:
+  group: toolchain.dev.openshift.com
+  names:
+    kind: TierTemplateRevision
+    listKind: TierTemplateRevisionList
+    plural: tiertemplaterevisions
+    singular: tiertemplaterevision
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.type
+      name: Type
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: TierTemplateRevision is the Schema for the tiertemplaterevisions
+          API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: TierTemplateRevisionSpec defines the desired state of TierTemplateRevision
+            properties:
+              templateObjects:
+                description: TemplateObjects contains list of Unstructured Objects
+                  that can be parsed at runtime and will be applied as part of the
+                  tier provisioning. The template parameters values will be defined
+                  in the NSTemplateTier CRD.
+                items:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                type: array
+                x-kubernetes-list-type: atomic
+                x-kubernetes-preserve-unknown-fields: true
+            type: object
+        type: object
+        x-kubernetes-preserve-unknown-fields: true
+    served: true
+    storage: true
+    subresources:
+      status: {}

config/crd/kustomization.yaml

@@ -11,6 +11,7 @@ resources:
 - bases/toolchain.dev.openshift.com_spaceprovisionerconfigs.yaml
 - bases/toolchain.dev.openshift.com_spaces.yaml
 - bases/toolchain.dev.openshift.com_tiertemplates.yaml
+- bases/toolchain.dev.openshift.com_tiertemplaterevisions.yaml
 - bases/toolchain.dev.openshift.com_toolchainclusters.yaml
 - bases/toolchain.dev.openshift.com_toolchainconfigs.yaml
 - bases/toolchain.dev.openshift.com_toolchainstatuses.yaml

config/manifests/bases/host-operator.clusterserviceversion.yaml

@@ -48,6 +48,11 @@ spec:
       kind: TierTemplate
       name: tiertemplates.toolchain.dev.openshift.com
       version: v1alpha1
+    - description: TierTemplateRevision is the Schema for the tiertemplaterevions API
+      displayName: Template Tier Revision
+      kind: TierTemplateRevision
+      name: tiertemplaterevions.toolchain.dev.openshift.com
+      version: v1alpha1
     - description: ToolchainCluster configures Toolchain to be aware of a Kubernetes
         cluster and encapsulates the details necessary to communicate with the cluster.
       displayName: Toolchain Cluster