Merge remote-tracking branch 'upstream/main'

Author: moulalis

charts/rhai-on-xks-chart/templates/crds/customresourcedefinition-platforms.config.opendatahub.io.yaml

@@ -79,6 +79,24 @@ spec:
                           pattern: ^(Managed|Unmanaged|Force|Removed)$
                           type: string
                       type: object
+                    mcplifecycleoperator:
+                      description: MCPLifecycleOperator controls the MCP Lifecycle Operator module lifecycle.
+                      properties:
+                        managementState:
+                          description: |-
+                            Set to one of the following values:
+
+                            - "Managed" : the operator is actively managing the component and trying to keep it active.
+                                          It will only upgrade the component if it is safe to do so
+
+                            - "Removed" : the operator is actively managing the component and will not install it,
+                                          or if it is installed, the operator will try to remove it
+                          enum:
+                            - Managed
+                            - Removed
+                          pattern: ^(Managed|Unmanaged|Force|Removed)$
+                          type: string
+                      type: object
                     monitoring:
                       description: Monitoring controls the monitoring module operator lifecycle.
                       properties:

charts/rhai-on-xks-chart/templates/rbac/clusterrole-rhods-operator-role.yaml

@@ -282,6 +282,7 @@ rules:
       - feastoperators
       - kserves
       - kueues
+      - mcplifecycleoperators
       - mlflowoperators
       - modelcontrollers
       - modelmeshservings
@@ -310,6 +311,7 @@ rules:
       - feastoperators/finalizers
       - kserves/finalizers
       - kueues/finalizers
+      - mcplifecycleoperators/finalizers
       - mlflowoperators/finalizers
       - modelcontrollers/finalizers
       - modelmeshservings/finalizers
@@ -333,6 +335,7 @@ rules:
       - feastoperators/status
       - kserves/status
       - kueues/status
+      - mcplifecycleoperators/status
       - mlflowoperators/status
       - modelcontrollers/status
       - modelmeshservings/status

charts/rhai-on-xks-chart/templates/webhooks/mutatingwebhookconfiguration-rhai-operator-mutating-webhook-configuration.yaml

@@ -816,6 +816,24 @@ spec:
                           pattern: ^(Managed|Unmanaged|Force|Removed)$
                           type: string
                       type: object
+                    mcplifecycleoperator:
+                      description: MCPLifecycleOperator controls the MCP Lifecycle Operator module lifecycle.
+                      properties:
+                        managementState:
+                          description: |-
+                            Set to one of the following values:
+
+                            - "Managed" : the operator is actively managing the component and trying to keep it active.
+                                          It will only upgrade the component if it is safe to do so
+
+                            - "Removed" : the operator is actively managing the component and will not install it,
+                                          or if it is installed, the operator will try to remove it
+                          enum:
+                            - Managed
+                            - Removed
+                          pattern: ^(Managed|Unmanaged|Force|Removed)$
+                          type: string
+                      type: object
                     monitoring:
                       description: Monitoring controls the monitoring module operator lifecycle.
                       properties:
@@ -1472,6 +1490,7 @@ rules:
       - feastoperators
       - kserves
       - kueues
+      - mcplifecycleoperators
       - mlflowoperators
       - modelcontrollers
       - modelmeshservings
@@ -1500,6 +1519,7 @@ rules:
       - feastoperators/finalizers
       - kserves/finalizers
       - kueues/finalizers
+      - mcplifecycleoperators/finalizers
       - mlflowoperators/finalizers
       - modelcontrollers/finalizers
       - modelmeshservings/finalizers
@@ -1523,6 +1543,7 @@ rules:
       - feastoperators/status
       - kserves/status
       - kueues/status
+      - mcplifecycleoperators/status
       - mlflowoperators/status
       - modelcontrollers/status
       - modelmeshservings/status
@@ -3038,58 +3059,6 @@ spec:
             medium: Memory
             sizeLimit: 10Mi
           name: tmp
-
----
-# Source: rhai-on-xks-chart/templates/webhooks/mutatingwebhookconfiguration-rhai-operator-mutating-webhook-configuration.yaml
-apiVersion: admissionregistration.k8s.io/v1
-kind: MutatingWebhookConfiguration
-metadata:
-  annotations:
-    cert-manager.io/inject-ca-from: redhat-ods-operator/rhai-operator-webhook-cert
-  name: rhai-operator-mutating-webhook-configuration
-  namespace: redhat-ods-operator
-webhooks:
-  - admissionReviewVersions:
-      - v1
-    clientConfig:
-      service:
-        name: rhai-operator-webhook-service
-        namespace: redhat-ods-operator
-        path: /platform-connection-isvc
-    failurePolicy: Fail
-    name: connection-isvc.opendatahub.io
-    rules:
-      - apiGroups:
-          - serving.kserve.io
-        apiVersions:
-          - v1beta1
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - inferenceservices
-    sideEffects: NoneOnDryRun
-  - admissionReviewVersions:
-      - v1
-    clientConfig:
-      service:
-        name: rhai-operator-webhook-service
-        namespace: redhat-ods-operator
-        path: /platform-connection-llmisvc
-    failurePolicy: Fail
-    name: connection-llmisvc.opendatahub.io
-    rules:
-      - apiGroups:
-          - serving.kserve.io
-        apiVersions:
-          - v1alpha1
-          - v1alpha2
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - llminferenceservices
-    sideEffects: NoneOnDryRun
 ---
 # Source: rhai-on-xks-chart/templates/hooks/post-install-crs-rbac.yaml
 apiVersion: v1

charts/rhai-on-xks-chart/test/snapshots/aws-with-all-deps-managed.snap.yaml

@@ -657,6 +657,24 @@ spec:
                           pattern: ^(Managed|Unmanaged|Force|Removed)$
                           type: string
                       type: object
+                    mcplifecycleoperator:
+                      description: MCPLifecycleOperator controls the MCP Lifecycle Operator module lifecycle.
+                      properties:
+                        managementState:
+                          description: |-
+                            Set to one of the following values:
+
+                            - "Managed" : the operator is actively managing the component and trying to keep it active.
+                                          It will only upgrade the component if it is safe to do so
+
+                            - "Removed" : the operator is actively managing the component and will not install it,
+                                          or if it is installed, the operator will try to remove it
+                          enum:
+                            - Managed
+                            - Removed
+                          pattern: ^(Managed|Unmanaged|Force|Removed)$
+                          type: string
+                      type: object
                     monitoring:
                       description: Monitoring controls the monitoring module operator lifecycle.
                       properties:
@@ -1313,6 +1331,7 @@ rules:
       - feastoperators
       - kserves
       - kueues
+      - mcplifecycleoperators
       - mlflowoperators
       - modelcontrollers
       - modelmeshservings
@@ -1341,6 +1360,7 @@ rules:
       - feastoperators/finalizers
       - kserves/finalizers
       - kueues/finalizers
+      - mcplifecycleoperators/finalizers
       - mlflowoperators/finalizers
       - modelcontrollers/finalizers
       - modelmeshservings/finalizers
@@ -1364,6 +1384,7 @@ rules:
       - feastoperators/status
       - kserves/status
       - kueues/status
+      - mcplifecycleoperators/status
       - mlflowoperators/status
       - modelcontrollers/status
       - modelmeshservings/status
@@ -2879,58 +2900,6 @@ spec:
             medium: Memory
             sizeLimit: 10Mi
           name: tmp
-
----
-# Source: rhai-on-xks-chart/templates/webhooks/mutatingwebhookconfiguration-rhai-operator-mutating-webhook-configuration.yaml
-apiVersion: admissionregistration.k8s.io/v1
-kind: MutatingWebhookConfiguration
-metadata:
-  annotations:
-    cert-manager.io/inject-ca-from: redhat-ods-operator/rhai-operator-webhook-cert
-  name: rhai-operator-mutating-webhook-configuration
-  namespace: redhat-ods-operator
-webhooks:
-  - admissionReviewVersions:
-      - v1
-    clientConfig:
-      service:
-        name: rhai-operator-webhook-service
-        namespace: redhat-ods-operator
-        path: /platform-connection-isvc
-    failurePolicy: Fail
-    name: connection-isvc.opendatahub.io
-    rules:
-      - apiGroups:
-          - serving.kserve.io
-        apiVersions:
-          - v1beta1
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - inferenceservices
-    sideEffects: NoneOnDryRun
-  - admissionReviewVersions:
-      - v1
-    clientConfig:
-      service:
-        name: rhai-operator-webhook-service
-        namespace: redhat-ods-operator
-        path: /platform-connection-llmisvc
-    failurePolicy: Fail
-    name: connection-llmisvc.opendatahub.io
-    rules:
-      - apiGroups:
-          - serving.kserve.io
-        apiVersions:
-          - v1alpha1
-          - v1alpha2
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - llminferenceservices
-    sideEffects: NoneOnDryRun
 ---
 # Source: rhai-on-xks-chart/templates/hooks/post-install-crs-rbac.yaml
 apiVersion: v1