[issues-133] - Upgrade Infinispan Operator CRDs to support 2.4.5.Final

Intersmash · Nov 20, 2024 · 4180b52 · 4180b52
1 parent 6091a27
commit 4180b52
Show file tree

Hide file tree

Showing 6 changed files with 832 additions and 1,002 deletions.
diff --git a/docs/Operator-Based-Provisioning.md b/docs/Operator-Based-Provisioning.md
@@ -11,9 +11,9 @@ extended easily, since Intersmash _provisioners_ are pluggable components.
 |:---------------------------------|:---------------------------|:-------------|:----------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | ActiveMQ Artemis                 | 1.0.11                     | upstream     | https://github.com/artemiscloud/activemq-artemis-operator | We are using a custom index image, i.e. quay.io/jbossqe-eap/intersmash-activemq-operator-catalog:v1.0.11, built as described in https://github.com/Intersmash/intersmash/issues/32 |
 | Red Hat AMQ Broker               | 7.11.6-opr-2               | 7.11.x       | https://github.com/rh-messaging/activemq-artemis-operator | As available on the OpenShift OperatorHub                                                                                                                                          |  
-| Infinispan                       | 2.4.3                      | stable       | https://github.com/infinispan/infinispan-operator         | As available on the OpenShift OperatorHub (community-operators)                                                                                                                    |
+| Infinispan                       | 2.4.5                      | stable       | https://github.com/infinispan/infinispan-operator         | As available on the OpenShift OperatorHub (community-operators)                                                                                                                    |
 | Red Hat DataGrid                 | 8.5.2                      | stable       | https://github.com/infinispan/infinispan-operator         | As available on the OpenShift OperatorHub                                                                                                                                          | 
-| Kafka provided by Strimzi        | 0.43.0                     | stable       | https://github.com/strimzi/strimzi-kafka-operator         |                                                                                                                                                                                    |
+| Kafka provided by Strimzi        | 0.44.0                     | stable       | https://github.com/strimzi/strimzi-kafka-operator         |                                                                                                                                                                                    |
 | Red Hat AMQ Streams              | 2.7.0-3                    | stable       | https://github.com/strimzi/strimzi-kafka-operator         | As available on the OpenShift OperatorHub                                                                                                                                          |
 | Keycloak                         | 24.0.3                     | fast         | https://github.com/keycloak/keycloak/tree/main/operator   | Latest Keycloak, based on Quarkus. Supports a limited number of CR (Keycloak and KeycloakRealmImport): more to come in upcoming versions                                           |
 | Red Hat Build of keycloak (RHBK) | 24.0.3-opr.1               | stable-v24   | https://github.com/keycloak/keycloak/tree/main/operator   | Latest Keycloak, based on Quarkus.                                                                                                                                                 |

diff --git a/provisioners/src/main/resources/crds/infinispan.org_backups.yaml b/provisioners/src/main/resources/crds/infinispan.org_backups.yaml
@@ -1,14 +1,9 @@
 ---
-# See https://raw.githubusercontent.com/k8s-operatorhub/community-operators/main/operators/infinispan/2.4.3/manifests/infinispan.org_backups.yaml
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: infinispan-operator-system/infinispan-operator-serving-cert
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
-  labels:
-    app.kubernetes.io/name: infinispan-operator
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: backups.infinispan.org
 spec:
   group: infinispan.org
@@ -25,14 +20,19 @@ spec:
         description: Backup is the Schema for the backups 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'
+            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'
+            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
@@ -125,9 +125,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: null
-  storedVersions: null
diff --git a/provisioners/src/main/resources/crds/infinispan.org_batches.yaml b/provisioners/src/main/resources/crds/infinispan.org_batches.yaml
@@ -1,14 +1,9 @@
 ---
-# See https://raw.githubusercontent.com/k8s-operatorhub/community-operators/main/operators/infinispan/2.4.3/manifests/infinispan.org_batches.yaml
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: infinispan-operator-system/infinispan-operator-serving-cert
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
-  labels:
-    app.kubernetes.io/name: infinispan-operator
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: batches.infinispan.org
 spec:
   group: infinispan.org
@@ -25,14 +20,19 @@ spec:
         description: Batch is the Schema for the batches 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'
+            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'
+            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
@@ -49,6 +49,14 @@ spec:
                 description: Name of the ConfigMap containing the batch and resource
                   files to be executed
                 type: string
+              container:
+                description: Specify resource requirements per container
+                properties:
+                  cpu:
+                    type: string
+                  memory:
+                    type: string
+                type: object
             required:
             - cluster
             type: object
@@ -73,9 +81,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: null
-  storedVersions: null
diff --git a/provisioners/src/main/resources/crds/infinispan.org_caches.yaml b/provisioners/src/main/resources/crds/infinispan.org_caches.yaml
@@ -1,14 +1,9 @@
 ---
-# See https://raw.githubusercontent.com/k8s-operatorhub/community-operators/main/operators/infinispan/2.4.3/manifests/infinispan.org_caches.yaml
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: infinispan-operator-system/infinispan-operator-serving-cert
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
-  labels:
-    app.kubernetes.io/name: infinispan-operator
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: caches.infinispan.org
 spec:
   group: infinispan.org
@@ -25,14 +20,19 @@ spec:
         description: Cache is the Schema for the caches 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'
+            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'
+            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
@@ -52,8 +52,10 @@ spec:
                           a valid secret key.
                         type: string
                       name:
-                        description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                          TODO: Add other useful fields. apiVersion, kind, uid?'
+                        description: |-
+                          Name of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          TODO: Add other useful fields. apiVersion, kind, uid?
                         type: string
                       optional:
                         description: Specify whether the Secret or its key must be
@@ -75,8 +77,10 @@ spec:
                           a valid secret key.
                         type: string
                       name:
-                        description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                          TODO: Add other useful fields. apiVersion, kind, uid?'
+                        description: |-
+                          Name of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          TODO: Add other useful fields. apiVersion, kind, uid?
                         type: string
                       optional:
                         description: Specify whether the Secret or its key must be
@@ -148,9 +152,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: null
-  storedVersions: null