Srvlogic 229

.github/workflows/check-container-builder.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Setup golang
         uses: actions/setup-go@v2
         with:
-          go-version: 1.21
+          go-version: '1.20'
       - name: Checkout code
         uses: actions/checkout@v2
         with:
@@ -65,7 +65,7 @@ jobs:
       - name: Setup golang
         uses: actions/setup-go@v2
         with:
-          go-version: 1.21
+          go-version: '1.20'
       - name: Checkout code
         uses: actions/checkout@v2
         with:

.github/workflows/checks.yml

@@ -12,7 +12,7 @@ on:
       - ".ci/jenkins/**"
 
 env:
-  GO_VERSION: 1.21
+  GO_VERSION: '1.20'
 
 jobs:
   unit-tests:

.github/workflows/e2e.yml

@@ -12,7 +12,7 @@ on:
       - ".ci/jenkins/**"
 
 env:
-  GO_VERSION: 1.21
+  GO_VERSION: '1.20'
   KIND_VERSION: v0.20.0
 
 jobs:

Dockerfile

@@ -16,7 +16,7 @@
 # under the License.
 
 # Build the manager binary
-FROM docker.io/library/golang:1.21.6 as builder
+FROM docker.io/library/golang:1.20.14 as builder
 
 ARG SOURCE_DATE_EPOCH
 

Makefile

@@ -4,7 +4,7 @@
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
 VERSION ?= 2.0.0-snapshot
-REDUCED_VERSION ?= latest
+REDUCED_VERSION ?= 1.32.0
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
@@ -30,7 +30,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 #
 # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
 # kiegroup.org/kogito-serverless-operator-bundle:$VERSION and kiegroup.org/kogito-serverless-operator-catalog:$VERSION.
-IMAGE_TAG_BASE ?= quay.io/kiegroup/kogito-serverless-operator-nightly
+IMAGE_TAG_BASE ?= registry.redhat.io/openshift-serverless-1-tech-preview/logic-rhel8-operator
 
 # BUNDLE_IMG defines the image:tag used for the bundle.
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)

Makefile.osl

@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 1.30.0
+VERSION ?= 1.32.0
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

api/go.mod

@@ -1,6 +1,6 @@
 module github.com/apache/incubator-kie-kogito-serverless-operator/api
 
-go 1.21
+go 1.20
 
 require (
 	github.com/serverlessworkflow/sdk-go/v2 v2.2.5

bddframework/go.mod

@@ -1,8 +1,6 @@
 module github.com/apache/incubator-kie-kogito-serverless-operator/bddframework
 
-go 1.21
-
-toolchain go1.21.6
+go 1.20
 
 // Internal dependencies
 replace github.com/apache/incubator-kie-kogito-serverless-operator v0.0.0 => ../

bundle.osl/manifests/logic-operator-rhel8-builder-config_v1_configmap.yaml

@@ -6,7 +6,7 @@ data:
     AS builder\n\n# variables that can be overridden by the builder\n# To add a Quarkus
     extension to your application\nARG QUARKUS_EXTENSIONS\n# Args to pass to the Quarkus
     CLI add extension command\nARG QUARKUS_ADD_EXTENSION_ARGS\n  \n# Copy from build
-    context to skeleton resources project\nCOPY --chmod=644 * ./resources/\n\nRUN
+    context to skeleton resources project\nCOPY --chown=1001 . ./resources\n\nRUN
     /home/kogito/launch/build-app.sh ./resources\n  \n#=============================\n#
     Runtime Run\n#=============================\nFROM registry.access.redhat.com/ubi9/openjdk-17:latest\n\nENV
     LANG='en_US.UTF-8' LANGUAGE='en_US:en'\n  \n# We make four distinct layers so

bundle.osl/manifests/logic-operator-rhel8.clusterserviceversion.yaml

@@ -86,6 +86,19 @@ metadata:
             "timeout": "360s"
           }
         },
+        {
+          "apiVersion": "sonataflow.org/v1alpha08",
+          "kind": "SonataFlowClusterPlatform",
+          "metadata": {
+            "name": "sonataflow-clusterplatform"
+          },
+          "spec": {
+            "platformRef": {
+              "name": "sonataflow-platform",
+              "namespace": "sonataflow-operator-system"
+            }
+          }
+        },
         {
           "apiVersion": "sonataflow.org/v1alpha08",
           "kind": "SonataFlowPlatform",
@@ -106,14 +119,16 @@ metadata:
       ]
     capabilities: Basic Install
     categories: Application Runtime
-    description: OpenShift Serverless Logic Kubernetes Operator for deploying workflow applications based on the CNCF Serverless Workflow specification
+    description: OpenShift Serverless Logic Operator for deploying workflow applications based on the CNCF Serverless Workflow specification
     operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift Platform Plus"]'
     operators.operatorframework.io/builder: operator-sdk-v1.25.0
     operators.operatorframework.io/internal-objects: '["sonataflowbuilds.sonataflow.org"]'
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
-    repository: https://github.com/apache/incubator-kie-kogito-serverless-operator
+    operatorframework.io/suggested-namespace: "openshift-serverless-logic"
+    certified: "false"
+    repository: https://github.com/kiegroup/kogito-serverless-operator/
     support: Red Hat
-  name: logic-operator-rhel8.v1.30.0
+  name: logic-operator-rhel8.v1.32.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -157,6 +172,22 @@ spec:
             displayName: InnerBuild
             path: innerBuild
         version: v1alpha08
+      - description: SonataFlowClusterPlatform is the Schema for the sonataflowclusterplatforms API
+        displayName: Sonata Flow Cluster Platform
+        kind: SonataFlowClusterPlatform
+        name: sonataflowclusterplatforms.sonataflow.org
+        specDescriptors:
+          - description: Name of the SonataFlowPlatform
+            displayName: Platform_Name
+            path: platformRef.name
+          - description: Namespace of the SonataFlowPlatform
+            displayName: Platform_NS
+            path: platformRef.namespace
+        statusDescriptors:
+          - description: Version the operator version controlling this ClusterPlatform
+            displayName: version
+            path: version
+        version: v1alpha08
       - description: SonataFlowPlatform is the descriptor for the workflow platform infrastructure.
         displayName: Sonata Flow Platform
         kind: SonataFlowPlatform
@@ -187,6 +218,12 @@ spec:
           - description: DevMode Attributes for running workflows in devmode (immutable, no build required)
             displayName: DevMode
             path: devMode
+          - description: PodTemplate describes the deployment details of this platform service instance.
+            displayName: podTemplate
+            path: services.dataIndex.podTemplate
+          - description: PodTemplate describes the deployment details of this platform service instance.
+            displayName: podTemplate
+            path: services.jobService.podTemplate
         statusDescriptors:
           - description: Cluster what kind of cluster you're running (ie, plain Kubernetes or OpenShift)
             displayName: cluster
@@ -243,11 +280,14 @@ spec:
         version: v1alpha08
   description: |-
     OpenShift Serverless Logic Kubernetes Operator for deploying workflow applications
-    based on the [CNCF Serverless Workflow specification](https://serverlessworkflow.io/):
-
-    * Deploy workflow applications using the [dev profile](https://sonataflow.org/serverlessworkflow/latest/cloud/operator/developing-workflows.html), suited for the your development cycle
-    * Build workflow applications based on the platform you're currently working on.
-  displayName: SonataFlow Operator
+    based on the [CNCF Serverless Workflow specification](https://serverlessworkflow.io/) to deploy workflow applications
+    [suited for the your development cycle](https://openshift-knative.github.io/docs/docs/latest/serverless-logic/cloud/operator/developing-workflows.html).
+
+    Please follow our [documentation for more information about the OpenShift Serverless Logic Operator Tech Preview](https://openshift-knative.github.io/docs/docs/latest/serverless-logic/about.html).
+  displayName: OpenShift Serverless Logic Operator
+  icon:
+    - base64data: PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzOCIgaGVpZ2h0PSIzOCIgdmlld0JveD0iMCAwIDM4IDM4Ij48ZGVmcz48c3R5bGU+LmF7ZmlsbDojZmZmO30uYntmaWxsOiNlMDA7fTwvc3R5bGU+PC9kZWZzPjxwYXRoIGNsYXNzPSJhIiBkPSJNMjgsMUgxMGE5LDksMCwwLDAtOSw5VjI4YTksOSwwLDAsMCw5LDlIMjhhOSw5LDAsMCwwLDktOVYxMGE5LDksMCwwLDAtOS05WiIvPjxwYXRoIGQ9Ik0yOCwyLjI1QTcuNzU4Nyw3Ljc1ODcsMCwwLDEsMzUuNzUsMTBWMjhBNy43NTg3LDcuNzU4NywwLDAsMSwyOCwzNS43NUgxMEE3Ljc1ODcsNy43NTg3LDAsMCwxLDIuMjUsMjhWMTBBNy43NTg3LDcuNzU4NywwLDAsMSwxMCwyLjI1SDI4TTI4LDFIMTBhOSw5LDAsMCwwLTksOVYyOGE5LDksMCwwLDAsOSw5SDI4YTksOSwwLDAsMCw5LTlWMTBhOSw5LDAsMCwwLTktOVoiLz48cGF0aCBjbGFzcz0iYiIgZD0iTTE0LDIzLjQ3NjZIMTBhLjYyNTMuNjI1MywwLDAsMS0uNjI1LS42MjV2LTRhLjYyNTIuNjI1MiwwLDAsMSwuNjI1LS42MjVoNGEuNjI1Mi42MjUyLDAsMCwxLC42MjUuNjI1djRBLjYyNTMuNjI1MywwLDAsMSwxNCwyMy40NzY2Wm0tMy4zNzUtMS4yNWgyLjc1di0yLjc1aC0yLjc1WiIvPjxwYXRoIGNsYXNzPSJiIiBkPSJNMjEsMjMuNDc2NkgxN2EuNjI1My42MjUzLDAsMCwxLS42MjUtLjYyNXYtNGEuNjI1Mi42MjUyLDAsMCwxLC42MjUtLjYyNWg0YS42MjUyLjYyNTIsMCwwLDEsLjYyNS42MjV2NEEuNjI1My42MjUzLDAsMCwxLDIxLDIzLjQ3NjZabS0zLjM3NS0xLjI1aDIuNzV2LTIuNzVoLTIuNzVaIi8+PHBhdGggY2xhc3M9ImIiIGQ9Ik0xNy41LDE2LjQ3NjZoLTRhLjYyNTMuNjI1MywwLDAsMS0uNjI1LS42MjV2LTRhLjYyNTIuNjI1MiwwLDAsMSwuNjI1LS42MjVoNGEuNjI1Mi42MjUyLDAsMCwxLC42MjUuNjI1djRBLjYyNTMuNjI1MywwLDAsMSwxNy41LDE2LjQ3NjZabS0zLjM3NS0xLjI1aDIuNzV2LTIuNzVoLTIuNzVaIi8+PHBhdGggY2xhc3M9ImIiIGQ9Ik0yNC41LDE2LjQ3NjZoLTRhLjYyNTMuNjI1MywwLDAsMS0uNjI1LS42MjV2LTRhLjYyNTIuNjI1MiwwLDAsMSwuNjI1LS42MjVoNGEuNjI1Mi42MjUyLDAsMCwxLC42MjUuNjI1djRBLjYyNTMuNjI1MywwLDAsMSwyNC41LDE2LjQ3NjZabS0zLjM3NS0xLjI1aDIuNzV2LTIuNzVoLTIuNzVaIi8+PHBhdGggY2xhc3M9ImIiIGQ9Ik0yOCwyMy40NzY2SDI0YS42MjUzLjYyNTMsMCwwLDEtLjYyNS0uNjI1di00YS42MjUyLjYyNTIsMCwwLDEsLjYyNS0uNjI1aDRhLjYyNTIuNjI1MiwwLDAsMSwuNjI1LjYyNXY0QS42MjUzLjYyNTMsMCwwLDEsMjgsMjMuNDc2NlptLTMuMzc1LTEuMjVoMi43NXYtMi43NWgtMi43NVoiLz48cGF0aCBkPSJNMjksMjYuNDc2Nkg5YS42MjUuNjI1LDAsMCwxLDAtMS4yNUgyOWEuNjI1LjYyNSwwLDAsMSwwLDEuMjVaIi8+PC9zdmc+
+      mediatype: image/svg+xml
   install:
     spec:
       clusterPermissions:
@@ -353,6 +393,32 @@ spec:
                 - get
                 - patch
                 - update
+            - apiGroups:
+                - sonataflow.org
+              resources:
+                - sonataflowclusterplatforms
+              verbs:
+                - create
+                - delete
+                - get
+                - list
+                - patch
+                - update
+                - watch
+            - apiGroups:
+                - sonataflow.org
+              resources:
+                - sonataflowclusterplatforms/finalizers
+              verbs:
+                - update
+            - apiGroups:
+                - sonataflow.org
+              resources:
+                - sonataflowclusterplatforms/status
+              verbs:
+                - get
+                - patch
+                - update
             - apiGroups:
                 - sonataflow.org
               resources:
@@ -507,6 +573,58 @@ spec:
                 - subjectaccessreviews
               verbs:
                 - create
+            - apiGroups:
+                - apps
+              resources:
+                - statefulset
+                - statefulsets
+              verbs:
+                - get
+                - list
+                - watch
+            - apiGroups:
+                - networking.k8s.io
+              resources:
+                - ingress
+                - ingresses
+              verbs:
+                - get
+                - list
+                - watch
+            - apiGroups:
+                - serving.knative.dev
+              resources:
+                - service
+                - services
+              verbs:
+                - get
+                - list
+                - watch
+            - apiGroups:
+                - eventing.knative.dev
+              resources:
+                - broker
+                - brokers
+              verbs:
+                - get
+                - list
+                - watch
+            - apiGroups:
+                - apps.openshift.io
+              resources:
+                - deploymentconfigs
+              verbs:
+                - get
+                - list
+                - watch
+            - apiGroups:
+                - route.openshift.io
+              resources:
+                - routes
+              verbs:
+                - get
+                - list
+                - watch
           serviceAccountName: logic-operator-rhel8-controller-manager
       deployments:
         - label:
@@ -560,7 +678,7 @@ spec:
                         valueFrom:
                           fieldRef:
                             fieldPath: metadata.namespace
-                    image: registry.redhat.io/openshift-serverless-1-tech-preview/logic-operator-rhel8@sha256:24c2e62bff1f2f7e5579b990e44206ac019bd00f5ca546b069471fc1af34ed75
+                    image: registry.redhat.io/openshift-serverless-1-tech-preview/logic-rhel8-operator@sha256:33653cf4c48121a7a0d1e109c3fe93b8050f9deb80b6bb00425b62c77917a9ad
                     livenessProbe:
                       httpGet:
                         path: /healthz
@@ -639,9 +757,12 @@ spec:
     - cncf
     - serverless
     - serverlessworkflow
+    - workflows
   links:
-    - name: Product Page
-      url: https://sonataflow.org/serverlessworkflow/latest/index.html
+    - name: Documentation
+      url: https://openshift-knative.github.io/docs/docs/latest/serverless-logic/about.html
+    - name: Source Repository
+      url: https://github.com/kiegroup/kogito-serverless-operator/
   maintainers:
     - email: [email protected]
       name: Red Hat
@@ -652,6 +773,6 @@ spec:
   relatedImages:
     - image: registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:4564ca3dc5bac80d6faddaf94c817fbbc270698a9399d8a21ee1005d85ceda56
       name: kube-rbac-proxy
-    - image: registry.redhat.io/openshift-serverless-1-tech-preview/logic-operator-rhel8@sha256:24c2e62bff1f2f7e5579b990e44206ac019bd00f5ca546b069471fc1af34ed75
+    - image: registry.redhat.io/openshift-serverless-1-tech-preview/logic-rhel8-operator@sha256:33653cf4c48121a7a0d1e109c3fe93b8050f9deb80b6bb00425b62c77917a9ad
       name: manager
-  version: 1.30.0
+  version: 1.32.0