[Merged by Bors] - Product image selection

CHANGELOG.md

@@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file.
 - `operator-rs` `0.25.0` -> `0.27.1` ([#344]).
 - LDAP integration tests create all resources in their namespace and not some in the default namespace ([#344]).
 - Don't run init container as root and avoid chmod and chowning ([#353]).
+- [BREAKING] Use Product image selection instead of version. `spec.version` has been replaced by `spec.image` ([#356]).
 
 ### Fixed
 
@@ -26,6 +27,7 @@ All notable changes to this project will be documented in this file.
 [#347]: https://github.com/stackabletech/trino-operator/pull/347
 [#348]: https://github.com/stackabletech/trino-operator/pull/348
 [#353]: https://github.com/stackabletech/trino-operator/pull/353
+[#356]: https://github.com/stackabletech/trino-operator/pull/356
 
 ## [0.8.0] - 2022-11-07
 

deploy/crd/trinocluster.crd.yaml

@@ -623,6 +623,49 @@ spec:
                 required:
                 - roleGroups
                 type: object
+              image:
+                anyOf:
+                - required:
+                  - custom
+                  - productVersion
+                - required:
+                  - productVersion
+                  - stackableVersion
+                description: Trino product image to use
+                properties:
+                  custom:
+                    description: Overwrite the docker image. Specify the full docker image name, e.g. `docker.stackable.tech/stackable/superset:1.4.1-stackable2.1.0`
+                    type: string
+                  productVersion:
+                    description: Version of the product, e.g. `1.4.1`.
+                    type: string
+                  pullPolicy:
+                    default: IfNotPresent
+                    description: '[Pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) used when pulling the Images'
+                    enum:
+                    - IfNotPresent
+                    - Always
+                    - Never
+                    type: string
+                  pullSecrets:
+                    description: '[Image pull secrets](https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod) to pull images from a private registry'
+                    items:
+                      description: LocalObjectReference contains enough information to let you locate the referenced object inside the same namespace.
+                      properties:
+                        name:
+                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                          type: string
+                      type: object
+                    nullable: true
+                    type: array
+                  repo:
+                    description: Name of the docker repo, e.g. `docker.stackable.tech/stackable`
+                    nullable: true
+                    type: string
+                  stackableVersion:
+                    description: Stackable version of the product, e.g. 2.1.0
+                    type: string
+                type: object
               opa:
                 description: The discovery ConfigMap name of the OPA cluster (usually the same as the OPA cluster name).
                 nullable: true
@@ -646,10 +689,6 @@ spec:
                 description: Emergency stop button, if `true` then all pods are stopped without affecting configuration (as setting `replicas` to `0` would).
                 nullable: true
                 type: boolean
-              version:
-                description: The provided trino image version in the form `xxx-stackableY.Y.Y` e.g. `387-stackable0.1.0`.
-                nullable: true
-                type: string
               workers:
                 description: Settings for the Worker Role/Process.
                 nullable: true
@@ -1154,6 +1193,7 @@ spec:
                 type: object
             required:
             - catalogLabelSelector
+            - image
             type: object
           status:
             nullable: true

deploy/helm/trino-operator/crds/crds.yaml

@@ -625,6 +625,49 @@ spec:
                   required:
                     - roleGroups
                   type: object
+                image:
+                  anyOf:
+                    - required:
+                        - custom
+                        - productVersion
+                    - required:
+                        - productVersion
+                        - stackableVersion
+                  description: Trino product image to use
+                  properties:
+                    custom:
+                      description: Overwrite the docker image. Specify the full docker image name, e.g. `docker.stackable.tech/stackable/superset:1.4.1-stackable2.1.0`
+                      type: string
+                    productVersion:
+                      description: Version of the product, e.g. `1.4.1`.
+                      type: string
+                    pullPolicy:
+                      default: IfNotPresent
+                      description: '[Pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) used when pulling the Images'
+                      enum:
+                        - IfNotPresent
+                        - Always
+                        - Never
+                      type: string
+                    pullSecrets:
+                      description: '[Image pull secrets](https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod) to pull images from a private registry'
+                      items:
+                        description: LocalObjectReference contains enough information to let you locate the referenced object inside the same namespace.
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                            type: string
+                        type: object
+                      nullable: true
+                      type: array
+                    repo:
+                      description: Name of the docker repo, e.g. `docker.stackable.tech/stackable`
+                      nullable: true
+                      type: string
+                    stackableVersion:
+                      description: Stackable version of the product, e.g. 2.1.0
+                      type: string
+                  type: object
                 opa:
                   description: The discovery ConfigMap name of the OPA cluster (usually the same as the OPA cluster name).
                   nullable: true
@@ -648,10 +691,6 @@ spec:
                   description: Emergency stop button, if `true` then all pods are stopped without affecting configuration (as setting `replicas` to `0` would).
                   nullable: true
                   type: boolean
-                version:
-                  description: The provided trino image version in the form `xxx-stackableY.Y.Y` e.g. `387-stackable0.1.0`.
-                  nullable: true
-                  type: string
                 workers:
                   description: Settings for the Worker Role/Process.
                   nullable: true
@@ -1156,6 +1195,7 @@ spec:
                   type: object
               required:
                 - catalogLabelSelector
+                - image
               type: object
             status:
               nullable: true

deploy/manifests/crds.yaml

@@ -626,6 +626,49 @@ spec:
                   required:
                     - roleGroups
                   type: object
+                image:
+                  anyOf:
+                    - required:
+                        - custom
+                        - productVersion
+                    - required:
+                        - productVersion
+                        - stackableVersion
+                  description: Trino product image to use
+                  properties:
+                    custom:
+                      description: Overwrite the docker image. Specify the full docker image name, e.g. `docker.stackable.tech/stackable/superset:1.4.1-stackable2.1.0`
+                      type: string
+                    productVersion:
+                      description: Version of the product, e.g. `1.4.1`.
+                      type: string
+                    pullPolicy:
+                      default: IfNotPresent
+                      description: '[Pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) used when pulling the Images'
+                      enum:
+                        - IfNotPresent
+                        - Always
+                        - Never
+                      type: string
+                    pullSecrets:
+                      description: '[Image pull secrets](https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod) to pull images from a private registry'
+                      items:
+                        description: LocalObjectReference contains enough information to let you locate the referenced object inside the same namespace.
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                            type: string
+                        type: object
+                      nullable: true
+                      type: array
+                    repo:
+                      description: Name of the docker repo, e.g. `docker.stackable.tech/stackable`
+                      nullable: true
+                      type: string
+                    stackableVersion:
+                      description: Stackable version of the product, e.g. 2.1.0
+                      type: string
+                  type: object
                 opa:
                   description: The discovery ConfigMap name of the OPA cluster (usually the same as the OPA cluster name).
                   nullable: true
@@ -649,10 +692,6 @@ spec:
                   description: Emergency stop button, if `true` then all pods are stopped without affecting configuration (as setting `replicas` to `0` would).
                   nullable: true
                   type: boolean
-                version:
-                  description: The provided trino image version in the form `xxx-stackableY.Y.Y` e.g. `387-stackable0.1.0`.
-                  nullable: true
-                  type: string
                 workers:
                   description: Settings for the Worker Role/Process.
                   nullable: true
@@ -1157,6 +1196,7 @@ spec:
                   type: object
               required:
                 - catalogLabelSelector
+                - image
               type: object
             status:
               nullable: true

docs/modules/getting_started/examples/code/trino.yaml

@@ -4,7 +4,9 @@ kind: TrinoCluster
 metadata:
   name: simple-trino
 spec:
-  version: 396-stackable0.2.0
+  image:
+    productVersion: 396
+    stackableVersion: 0.2.0
   catalogLabelSelector:
     matchLabels:
       trino: simple-trino

docs/modules/usage_guide/examples/code/trino-file-authentication.yaml

@@ -14,7 +14,9 @@ kind: TrinoCluster
 metadata:
   name: simple-trino
 spec:
-  version: 396-stackable0.2.0
+  image:
+    productVersion: 396
+    stackableVersion: 0.2.0
   catalogLabelSelector: {}
   authentication:
     method:

docs/modules/usage_guide/examples/code/trino-insecure.yaml

@@ -16,7 +16,9 @@ kind: TrinoCluster
 metadata:
   name: simple-trino
 spec:
-  version: 396-stackable0.2.0
+  image:
+    productVersion: 396
+    stackableVersion: 0.2.0
   catalogLabelSelector:
     matchLabels:
       trino: simple-trino
@@ -34,7 +36,9 @@ kind: HiveCluster
 metadata:
   name: simple-hive-derby
 spec:
-  version: 3.1.3-stackable0.2.0
+  image:
+    productVersion: 3.1.3
+    stackableVersion: 0.2.0
   metastore:
     roleGroups:
       default:

docs/modules/usage_guide/examples/code/trino-ldap-authentication.yaml

@@ -42,9 +42,10 @@ kind: TrinoCluster
 metadata:
   name: simple-trino-with-ldap
 spec:
-  version: 396-stackable0.2.0
+  image:
+    productVersion: 396
+    stackableVersion: 0.2.0
   catalogLabelSelector: {}
-  config:
   authentication:
     method:
       ldap:

docs/modules/usage_guide/examples/code/trino-secure-internal-tls.yaml

@@ -16,7 +16,9 @@ kind: TrinoCluster
 metadata:
   name: simple-trino
 spec:
-  version: 396-stackable0.2.0
+  image:
+    productVersion: 396
+    stackableVersion: 0.2.0
   config:
     internalTls:
       secretClass: trino-internal-tls # <1>
@@ -64,7 +66,9 @@ kind: HiveCluster
 metadata:
   name: simple-hive-derby
 spec:
-  version: 3.1.3-stackable0.2.0
+  image:
+    productVersion: 3.1.3
+    stackableVersion: 0.2.0
   metastore:
     roleGroups:
       default:

docs/modules/usage_guide/examples/code/trino-secure-tls-only.yaml

@@ -16,7 +16,9 @@ kind: TrinoCluster
 metadata:
   name: simple-trino
 spec:
-  version: 396-stackable0.2.0
+  image:
+    productVersion: 396
+    stackableVersion: 0.2.0
   config:
     tls:
       secretClass: trino-tls # <1>
@@ -50,7 +52,9 @@ kind: HiveCluster
 metadata:
   name: simple-hive-derby
 spec:
-  version: 3.1.3-stackable0.2.0
+  image:
+    productVersion: 3.1.3
+    stackableVersion: 0.2.0
   metastore:
     roleGroups:
       default:

docs/modules/usage_guide/examples/code/trino-secure-tls.yaml

@@ -16,7 +16,9 @@ kind: TrinoCluster
 metadata:
   name: simple-trino
 spec:
-  version: 396-stackable0.2.0
+  image:
+    productVersion: 396
+    stackableVersion: 0.2.0
   config:
     tls:
       secretClass: trino-tls # <1>
@@ -64,7 +66,9 @@ kind: HiveCluster
 metadata:
   name: simple-hive-derby
 spec:
-  version: 3.1.3-stackable0.2.0
+  image:
+    productVersion: 3.1.3
+    stackableVersion: 0.2.0
   metastore:
     roleGroups:
       default:

docs/modules/usage_guide/pages/catalogs/index.adoc

@@ -69,7 +69,9 @@ kind: TrinoCluster
 metadata:
   name: simple-trino
 spec:
-  version: 396-stackable0.2.0
+  image:
+    productVersion: 396
+    stackableVersion: 0.2.0
   catalogLabelSelector:
     matchLabels:
       trino: simple-trino

examples/simple-trino-cluster-authentication-opa-authorization-s3.yaml

@@ -4,7 +4,9 @@ kind: TrinoCluster
 metadata:
   name: simple-trino
 spec:
-  version: 396-stackable0.2.0
+  image:
+    productVersion: 396
+    stackableVersion: 0.2.0
   opa:
     configMapName: simple-opa
     package: trino
@@ -43,7 +45,9 @@ kind: OpaCluster
 metadata:
   name: simple-opa
 spec:
-  version: 0.45.0-stackable0.2.0
+  image:
+    productVersion: 0.45.0
+    stackableVersion: 0.2.0
   servers:
     roleGroups:
       default: {}
@@ -100,7 +104,9 @@ kind: HiveCluster
 metadata:
   name: simple-hive-derby
 spec:
-  version: 3.1.3-stackable0.2.0
+  image:
+    productVersion: 3.1.3
+    stackableVersion: 0.2.0
   metastore:
     roleGroups:
       default: