From 6e40b8284e3e043fb0241af6281e4b9212a79294 Mon Sep 17 00:00:00 2001 From: Walter Medvedeo Date: Fri, 31 May 2024 10:27:08 +0200 Subject: [PATCH] SRVLOGIC-318: Data index ephemeral OSL deployment takes image from quiay.io/kiegroup instead of registry.redhat.io/openshift-serverless-1 --- ...rhel8-controllers-config_v1_configmap.yaml | 46 +++++++++++++++++++ ...rator-controllers-config_v1_configmap.yaml | 2 +- config/manager/controllers_cfg.yaml | 2 +- config/manager/prod/controllers_cfg.yaml | 2 +- operator.yaml | 2 +- 5 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 bundle.prod/manifests/logic-operator-rhel8-controllers-config_v1_configmap.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 new file mode 100644 index 000000000..b44bfd1b8 --- /dev/null +++ b/bundle.prod/manifests/logic-operator-rhel8-controllers-config_v1_configmap.yaml @@ -0,0 +1,46 @@ +apiVersion: v1 +data: + 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. + # This information is used for the controller manager to create new devmode containers and setup the healthcheck probes. + healthFailureThresholdDevMode: 50 + # Default image used internally by the Operator Managed Kaniko builder to create the warmup pods + kanikoDefaultWarmerImageTag: gcr.io/kaniko-project/warmer:v1.9.0 + # Default image used internally by the Operator Managed Kaniko builder to create the executor pods + kanikoExecutorImageTag: gcr.io/kaniko-project/executor:v1.9.0 + # The Jobs Service image to use, if empty the operator will use the default Apache Community one based on the current operator's version + jobsServicePostgreSQLImageTag: "registry.redhat.io/openshift-serverless-1/logic-jobs-service-postgresql-rhel8:1.33.0" + jobsServiceEphemeralImageTag: "registry.redhat.io/openshift-serverless-1/logic-jobs-service-ephemeral-rhel8:1.33.0" + # The Data Index image to use, if empty the operator will use the default Apache Community one based on the current operator's version + dataIndexPostgreSQLImageTag: "registry.redhat.io/openshift-serverless-1/logic-data-index-postgresql-rhel8:1.33.0" + dataIndexEphemeralImageTag: "registry.redhat.io/openshift-serverless-1/logic-data-index-ephemeral-rhel8:1.33.0" + # SonataFlow base builder image used in the internal Dockerfile to build workflow applications in preview profile + # Order of precedence is: + # 1. SonataFlowPlatform in the given namespace + # 2. This configuration + # 3. The FROM in the Dockerfile in the operator's namespace "sonataflow-operator-builder-config" configMap. + # If 1 or 2, the FROM tag will be replaced by the tag se there. + # If empty the operator will use the default Apache Community one based on the current operator's version. + sonataFlowBaseBuilderImageTag: "registry.redhat.io/openshift-serverless-1/logic-swf-builder-rhel8:1.33.0" + # The image to use to deploy SonataFlow workflow images in devmode profile. + # If empty the operator will use the default Apache Community one based on the current operator's version. + sonataFlowDevModeImageTag: "registry.redhat.io/openshift-serverless-1/logic-swf-devmode-rhel8:1.33.0" + # The default name of the builder configMap in the operator's namespace + builderConfigMapName: "logic-operator-rhel8-builder-config" + # 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 + artifactId: quarkus-jdbc-postgresql + version: 3.8.4.redhat-00002 + - groupId: io.quarkus + artifactId: quarkus-agroal + version: 3.8.4.redhat-00002 + - groupId: org.kie + artifactId: kie-addons-quarkus-persistence-jdbc + version: 9.100.0.redhat-00004 +kind: ConfigMap +metadata: + name: logic-operator-rhel8-controllers-config diff --git a/bundle/manifests/sonataflow-operator-controllers-config_v1_configmap.yaml b/bundle/manifests/sonataflow-operator-controllers-config_v1_configmap.yaml index 5d75cf670..4d26bda68 100644 --- a/bundle/manifests/sonataflow-operator-controllers-config_v1_configmap.yaml +++ b/bundle/manifests/sonataflow-operator-controllers-config_v1_configmap.yaml @@ -15,7 +15,7 @@ data: jobsServiceEphemeralImageTag: "" # The Data Index image to use, if empty the operator will use the default Apache Community one based on the current operator's version dataIndexPostgreSQLImageTag: "" - dataIndexEphemeralTag: "" + dataIndexEphemeralImageTag: "" # SonataFlow base builder image used in the internal Dockerfile to build workflow applications in preview profile # Order of precedence is: # 1. SonataFlowPlatform in the given namespace diff --git a/config/manager/controllers_cfg.yaml b/config/manager/controllers_cfg.yaml index 989a78873..f9f76a958 100644 --- a/config/manager/controllers_cfg.yaml +++ b/config/manager/controllers_cfg.yaml @@ -12,7 +12,7 @@ jobsServicePostgreSQLImageTag: "" jobsServiceEphemeralImageTag: "" # The Data Index image to use, if empty the operator will use the default Apache Community one based on the current operator's version dataIndexPostgreSQLImageTag: "" -dataIndexEphemeralTag: "" +dataIndexEphemeralImageTag: "" # SonataFlow base builder image used in the internal Dockerfile to build workflow applications in preview profile # Order of precedence is: # 1. SonataFlowPlatform in the given namespace diff --git a/config/manager/prod/controllers_cfg.yaml b/config/manager/prod/controllers_cfg.yaml index bf25ecebe..d30a94b26 100644 --- a/config/manager/prod/controllers_cfg.yaml +++ b/config/manager/prod/controllers_cfg.yaml @@ -12,7 +12,7 @@ jobsServicePostgreSQLImageTag: "registry.redhat.io/openshift-serverless-1/logic- jobsServiceEphemeralImageTag: "registry.redhat.io/openshift-serverless-1/logic-jobs-service-ephemeral-rhel8:1.33.0" # The Data Index image to use, if empty the operator will use the default Apache Community one based on the current operator's version dataIndexPostgreSQLImageTag: "registry.redhat.io/openshift-serverless-1/logic-data-index-postgresql-rhel8:1.33.0" -dataIndexEphemeralTag: "registry.redhat.io/openshift-serverless-1/logic-data-index-ephemeral-rhel8:1.33.0" +dataIndexEphemeralImageTag: "registry.redhat.io/openshift-serverless-1/logic-data-index-ephemeral-rhel8:1.33.0" # SonataFlow base builder image used in the internal Dockerfile to build workflow applications in preview profile # Order of precedence is: # 1. SonataFlowPlatform in the given namespace diff --git a/operator.yaml b/operator.yaml index e9995c511..debd5bff4 100644 --- a/operator.yaml +++ b/operator.yaml @@ -27011,7 +27011,7 @@ data: jobsServiceEphemeralImageTag: "" # The Data Index image to use, if empty the operator will use the default Apache Community one based on the current operator's version dataIndexPostgreSQLImageTag: "" - dataIndexEphemeralTag: "" + dataIndexEphemeralImageTag: "" # SonataFlow base builder image used in the internal Dockerfile to build workflow applications in preview profile # Order of precedence is: # 1. SonataFlowPlatform in the given namespace