From 91607ef086d5697f8593e36b77d7e5e84ce51e54 Mon Sep 17 00:00:00 2001 From: Ricardo Zanini Date: Thu, 12 Sep 2024 13:43:01 -0400 Subject: [PATCH] [9.101.x-prod] Update Bundle to OSL 1.34 Signed-off-by: Ricardo Zanini --- ...rhel8-controllers-config_v1_configmap.yaml | 6 +- ...-operator-rhel8.clusterserviceversion.yaml | 13 +- ...taflow.org_sonataflowclusterplatforms.yaml | 133 ++++++++++++++++++ .../sonataflow.org_sonataflowplatforms.yaml | 10 +- .../manifests/sonataflow.org_sonataflows.yaml | 19 ++- config/manager/prod/kustomization.yaml | 2 +- ...-operator-rhel8.clusterserviceversion.yaml | 11 +- 7 files changed, 178 insertions(+), 16 deletions(-) create mode 100644 bundle.prod/manifests/sonataflow.org_sonataflowclusterplatforms.yaml diff --git a/bundle.prod/manifests/logic-operator-rhel8-controllers-config_v1_configmap.yaml b/bundle.prod/manifests/logic-operator-rhel8-controllers-config_v1_configmap.yaml index ad3895c77..f968b15c2 100644 --- a/bundle.prod/manifests/logic-operator-rhel8-controllers-config_v1_configmap.yaml +++ b/bundle.prod/manifests/logic-operator-rhel8-controllers-config_v1_configmap.yaml @@ -1,6 +1,6 @@ apiVersion: v1 data: - controllers_cfg.yaml: | + controllers_cfg.yaml: |- # The default size of Kaniko PVC when using the internal operator builder manager defaultPvcKanikoSize: 1Gi # How much time (in seconds) to wait for a devmode workflow to start. @@ -32,10 +32,10 @@ data: # Quarkus extensions required for workflows persistence. These extensions are used by the SonataFlow build system, # in cases where the workflow being built has configured postgresql persistence. postgreSQLPersistenceExtensions: - - groupId: io.quarkus + - groupId: com.redhat.quarkus.platform artifactId: quarkus-jdbc-postgresql version: 3.8.6.redhat-00004 - - groupId: io.quarkus + - groupId: com.redhat.quarkus.platform artifactId: quarkus-agroal version: 3.8.6.redhat-00004 - groupId: org.kie diff --git a/bundle.prod/manifests/logic-operator-rhel8.clusterserviceversion.yaml b/bundle.prod/manifests/logic-operator-rhel8.clusterserviceversion.yaml index d0fc94e06..ff57d5f36 100644 --- a/bundle.prod/manifests/logic-operator-rhel8.clusterserviceversion.yaml +++ b/bundle.prod/manifests/logic-operator-rhel8.clusterserviceversion.yaml @@ -145,7 +145,7 @@ spec: owned: - description: SonataFlowBuild is an internal custom resource to control workflow build instances in the target platform - displayName: Sonata Flow Build + displayName: SonataFlowBuild kind: SonataFlowBuild name: sonataflowbuilds.sonataflow.org resources: @@ -192,7 +192,7 @@ spec: version: v1alpha08 - description: SonataFlowClusterPlatform is the Schema for the sonataflowclusterplatforms API - displayName: Sonata Flow Cluster Platform + displayName: SonataFlowClusterPlatform kind: SonataFlowClusterPlatform name: sonataflowclusterplatforms.sonataflow.org resources: @@ -221,7 +221,7 @@ spec: version: v1alpha08 - description: SonataFlowPlatform is the descriptor for the workflow platform infrastructure. - displayName: Sonata Flow Platform + displayName: SonataFlowPlatform kind: SonataFlowPlatform name: sonataflowplatforms.sonataflow.org resources: @@ -291,7 +291,7 @@ spec: version: v1alpha08 - description: SonataFlow is the descriptor representation for a workflow application based on the CNCF Serverless Workflow specification. - displayName: Sonata Flow + displayName: SonataFlow kind: SonataFlow name: sonataflows.sonataflow.org resources: @@ -338,6 +338,9 @@ spec: path: endpoint - displayName: lastTimeRecoverAttempt path: lastTimeRecoverAttempt + - description: Platform displays which platform is being used by this workflow + displayName: platform + path: platform - description: keeps track of how many failure recovers a given workflow had so far displayName: recoverFailureAttempts @@ -767,7 +770,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: registry.redhat.io/openshift-serverless-1/logic-rhel8-operator@sha256:123456789 + image: registry.redhat.io/openshift-serverless-1/logic-rhel8-operator@sha256:717da9df5809ac2094ddeaff9d237b273bd0c6fec5e548f9a8a7de27370e741e livenessProbe: httpGet: path: /healthz diff --git a/bundle.prod/manifests/sonataflow.org_sonataflowclusterplatforms.yaml b/bundle.prod/manifests/sonataflow.org_sonataflowclusterplatforms.yaml new file mode 100644 index 000000000..a5071d1e3 --- /dev/null +++ b/bundle.prod/manifests/sonataflow.org_sonataflowclusterplatforms.yaml @@ -0,0 +1,133 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.9.2 + creationTimestamp: null + name: sonataflowclusterplatforms.sonataflow.org +spec: + group: sonataflow.org + names: + kind: SonataFlowClusterPlatform + listKind: SonataFlowClusterPlatformList + plural: sonataflowclusterplatforms + singular: sonataflowclusterplatform + scope: Cluster + versions: + - additionalPrinterColumns: + - jsonPath: .spec.platformRef.name + name: Platform_Name + type: string + - jsonPath: .spec.platformRef.namespace + name: Platform_NS + type: string + - jsonPath: .status.conditions[?(@.type=='Succeed')].status + name: Ready + type: string + - jsonPath: .status.conditions[?(@.type=='Succeed')].reason + name: Reason + type: string + name: v1alpha08 + schema: + openAPIV3Schema: + description: SonataFlowClusterPlatform is the Schema for the sonataflowclusterplatforms + 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: SonataFlowClusterPlatformSpec defines the desired state of + SonataFlowClusterPlatform + properties: + capabilities: + description: Capabilities defines which platform capabilities should + be applied cluster-wide. If nil, defaults to `capabilities.workflows["services"]` + properties: + workflows: + description: Workflows defines which platform capabilities should + be applied to workflows cluster-wide. + items: + enum: + - services + type: string + type: array + type: object + platformRef: + description: PlatformRef defines which existing SonataFlowPlatform's + supporting services should be used cluster-wide. + properties: + name: + description: Name of the SonataFlowPlatform + type: string + namespace: + description: Namespace of the SonataFlowPlatform + type: string + required: + - name + - namespace + type: object + required: + - platformRef + type: object + status: + description: SonataFlowClusterPlatformStatus defines the observed state + of SonataFlowClusterPlatform + properties: + conditions: + description: The latest available observations of a resource's current + state. + items: + description: Condition describes the common structure for conditions + in our types + properties: + lastUpdateTime: + description: The last time this condition was updated. + format: date-time + type: string + message: + description: A human-readable message indicating details about + the transition. + type: string + reason: + description: The reason for the condition's last transition. + type: string + status: + description: Status of the condition, one of True, False, Unknown. + type: string + type: + description: Type condition for the given object + type: string + required: + - status + - type + type: object + type: array + observedGeneration: + description: The generation observed by the deployment controller. + format: int64 + type: integer + version: + description: Version the operator version controlling this ClusterPlatform + type: string + type: object + type: object + served: true + storage: true + subresources: + status: {} +status: + acceptedNames: + kind: "" + plural: "" + conditions: null + storedVersions: null diff --git a/bundle.prod/manifests/sonataflow.org_sonataflowplatforms.yaml b/bundle.prod/manifests/sonataflow.org_sonataflowplatforms.yaml index 09a2f2544..ccc538c82 100644 --- a/bundle.prod/manifests/sonataflow.org_sonataflowplatforms.yaml +++ b/bundle.prod/manifests/sonataflow.org_sonataflowplatforms.yaml @@ -567,8 +567,11 @@ spec: persistence: description: Persists service to a datasource of choice. Ephemeral by default. - maxProperties: 1 + maxProperties: 2 properties: + migrateDBOnStartUp: + description: Whether to migrate database on service startup? + type: boolean postgresql: description: Connect configured services to a postgresql database. @@ -8439,8 +8442,11 @@ spec: persistence: description: Persists service to a datasource of choice. Ephemeral by default. - maxProperties: 1 + maxProperties: 2 properties: + migrateDBOnStartUp: + description: Whether to migrate database on service startup? + type: boolean postgresql: description: Connect configured services to a postgresql database. diff --git a/bundle.prod/manifests/sonataflow.org_sonataflows.yaml b/bundle.prod/manifests/sonataflow.org_sonataflows.yaml index 6f2cb2e75..4dc1ae28b 100644 --- a/bundle.prod/manifests/sonataflow.org_sonataflows.yaml +++ b/bundle.prod/manifests/sonataflow.org_sonataflows.yaml @@ -2105,8 +2105,11 @@ spec: persistence: description: Persistence defines the database persistence configuration for the workflow - maxProperties: 1 + maxProperties: 2 properties: + migrateDBOnStartUp: + description: Whether to migrate database on service startup? + type: boolean postgresql: description: Connect configured services to a postgresql database. maxProperties: 2 @@ -9461,6 +9464,20 @@ spec: description: The generation observed by the deployment controller. format: int64 type: integer + platform: + description: Platform displays which platform is being used by this + workflow + properties: + name: + description: Name of the SonataFlowPlatform + type: string + namespace: + description: Namespace of the SonataFlowPlatform + type: string + required: + - name + - namespace + type: object recoverFailureAttempts: description: keeps track of how many failure recovers a given workflow had so far diff --git a/config/manager/prod/kustomization.yaml b/config/manager/prod/kustomization.yaml index cca96aa2b..6a8bf24ad 100644 --- a/config/manager/prod/kustomization.yaml +++ b/config/manager/prod/kustomization.yaml @@ -20,7 +20,7 @@ configMapGenerator: apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: -- digest: sha256:123456789 +- digest: sha256:717da9df5809ac2094ddeaff9d237b273bd0c6fec5e548f9a8a7de27370e741e name: controller newName: registry.redhat.io/openshift-serverless-1/logic-rhel8-operator # Patching the manager deployment file to add an env var with the operator namespace in diff --git a/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml b/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml index 3db562df7..8708d5bd1 100644 --- a/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml +++ b/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml @@ -31,7 +31,7 @@ spec: owned: - description: SonataFlowBuild is an internal custom resource to control workflow build instances in the target platform - displayName: Sonata Flow Build + displayName: SonataFlowBuild kind: SonataFlowBuild name: sonataflowbuilds.sonataflow.org resources: @@ -78,7 +78,7 @@ spec: version: v1alpha08 - description: SonataFlowClusterPlatform is the Schema for the sonataflowclusterplatforms API - displayName: Sonata Flow Cluster Platform + displayName: SonataFlowClusterPlatform kind: SonataFlowClusterPlatform name: sonataflowclusterplatforms.sonataflow.org resources: @@ -107,7 +107,7 @@ spec: version: v1alpha08 - description: SonataFlowPlatform is the descriptor for the workflow platform infrastructure. - displayName: Sonata Flow Platform + displayName: SonataFlowPlatform kind: SonataFlowPlatform name: sonataflowplatforms.sonataflow.org resources: @@ -177,7 +177,7 @@ spec: version: v1alpha08 - description: SonataFlow is the descriptor representation for a workflow application based on the CNCF Serverless Workflow specification. - displayName: Sonata Flow + displayName: SonataFlow kind: SonataFlow name: sonataflows.sonataflow.org resources: @@ -224,6 +224,9 @@ spec: path: endpoint - displayName: lastTimeRecoverAttempt path: lastTimeRecoverAttempt + - description: Platform displays which platform is being used by this workflow + displayName: platform + path: platform - description: keeps track of how many failure recovers a given workflow had so far displayName: recoverFailureAttempts