From 9797fb12be1daea25efbbdbfb65a52371570c4ff Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Wed, 6 Nov 2024 09:29:22 -0500 Subject: [PATCH 1/3] set prod images version to 1.35 --- Makefile.prod | 2 +- ...erator-rhel8-controllers-config_v1_configmap.yaml | 12 ++++++------ .../logic-operator-rhel8.clusterserviceversion.yaml | 6 +++--- config/manager/prod/SonataFlow-Builder.containerfile | 2 +- config/manager/prod/controllers_cfg.yaml | 12 ++++++------ .../logic-operator-rhel8.clusterserviceversion.yaml | 8 ++++---- images/modules/com.redhat.osl.builder/module.yaml | 2 +- .../modules/com.redhat.osl.bundleinstall/module.yaml | 2 +- .../modules/com.redhat.osl.cli.artifacts/module.yaml | 2 +- .../modules/com.redhat.osl.cli.packager/module.yaml | 2 +- images/osl-cli.yaml | 8 ++++---- images/prod-bundle-image.yaml | 4 ++-- images/prod-operator-image.yaml | 6 +++--- 13 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Makefile.prod b/Makefile.prod index 2d4ee3d41..92463b55e 100644 --- a/Makefile.prod +++ b/Makefile.prod @@ -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.34.0 +VERSION ?= 1.35.0 # TODO: UPDATE THIS TO THE OPERATOR image SHA when releasing IMAGE_DIGEST ?= sha256:123456789 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 27898017e..fe64d5e36 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 @@ -11,11 +11,11 @@ data: # 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.34.0" - jobsServiceEphemeralImageTag: "registry.redhat.io/openshift-serverless-1/logic-jobs-service-ephemeral-rhel8:1.34.0" + jobsServicePostgreSQLImageTag: "registry.redhat.io/openshift-serverless-1/logic-jobs-service-postgresql-rhel8:1.35.0" + jobsServiceEphemeralImageTag: "registry.redhat.io/openshift-serverless-1/logic-jobs-service-ephemeral-rhel8:1.35.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.34.0" - dataIndexEphemeralImageTag: "registry.redhat.io/openshift-serverless-1/logic-data-index-ephemeral-rhel8:1.34.0" + dataIndexPostgreSQLImageTag: "registry.redhat.io/openshift-serverless-1/logic-data-index-postgresql-rhel8:1.35.0" + dataIndexEphemeralImageTag: "registry.redhat.io/openshift-serverless-1/logic-data-index-ephemeral-rhel8:1.35.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 @@ -23,10 +23,10 @@ data: # 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.34.0" + sonataFlowBaseBuilderImageTag: "registry.redhat.io/openshift-serverless-1/logic-swf-builder-rhel8:1.35.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.34.0" + sonataFlowDevModeImageTag: "registry.redhat.io/openshift-serverless-1/logic-swf-devmode-rhel8:1.35.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, diff --git a/bundle.prod/manifests/logic-operator-rhel8.clusterserviceversion.yaml b/bundle.prod/manifests/logic-operator-rhel8.clusterserviceversion.yaml index 4e3386235..ecef6a0ac 100644 --- a/bundle.prod/manifests/logic-operator-rhel8.clusterserviceversion.yaml +++ b/bundle.prod/manifests/logic-operator-rhel8.clusterserviceversion.yaml @@ -137,7 +137,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/kiegroup/kogito-serverless-operator/ support: Red Hat - name: logic-operator-rhel8.v1.34.0 + name: logic-operator-rhel8.v1.35.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -890,5 +890,5 @@ spec: minKubeVersion: 1.23.0 provider: name: Red Hat - replaces: logic-operator-rhel8.v1.33.0 - version: 1.34.0 + replaces: logic-operator-rhel8.v1.34.0 + version: 1.35.0 diff --git a/config/manager/prod/SonataFlow-Builder.containerfile b/config/manager/prod/SonataFlow-Builder.containerfile index 167b00216..7d15e0e0f 100644 --- a/config/manager/prod/SonataFlow-Builder.containerfile +++ b/config/manager/prod/SonataFlow-Builder.containerfile @@ -1,4 +1,4 @@ -FROM registry.redhat.io/openshift-serverless-1/logic-swf-builder-rhel8:1.34.0 AS builder +FROM registry.redhat.io/openshift-serverless-1/logic-swf-builder-rhel8:1.35.0 AS builder # variables that can be overridden by the builder # To add a Quarkus extension to your application diff --git a/config/manager/prod/controllers_cfg.yaml b/config/manager/prod/controllers_cfg.yaml index 489678eed..ef0895368 100644 --- a/config/manager/prod/controllers_cfg.yaml +++ b/config/manager/prod/controllers_cfg.yaml @@ -25,11 +25,11 @@ 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.34.0" -jobsServiceEphemeralImageTag: "registry.redhat.io/openshift-serverless-1/logic-jobs-service-ephemeral-rhel8:1.34.0" +jobsServicePostgreSQLImageTag: "registry.redhat.io/openshift-serverless-1/logic-jobs-service-postgresql-rhel8:1.35.0" +jobsServiceEphemeralImageTag: "registry.redhat.io/openshift-serverless-1/logic-jobs-service-ephemeral-rhel8:1.35.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.34.0" -dataIndexEphemeralImageTag: "registry.redhat.io/openshift-serverless-1/logic-data-index-ephemeral-rhel8:1.34.0" +dataIndexPostgreSQLImageTag: "registry.redhat.io/openshift-serverless-1/logic-data-index-postgresql-rhel8:1.35.0" +dataIndexEphemeralImageTag: "registry.redhat.io/openshift-serverless-1/logic-data-index-ephemeral-rhel8:1.35.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 @@ -37,10 +37,10 @@ dataIndexEphemeralImageTag: "registry.redhat.io/openshift-serverless-1/logic-dat # 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.34.0" +sonataFlowBaseBuilderImageTag: "registry.redhat.io/openshift-serverless-1/logic-swf-builder-rhel8:1.35.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.34.0" +sonataFlowDevModeImageTag: "registry.redhat.io/openshift-serverless-1/logic-swf-devmode-rhel8:1.35.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, diff --git a/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml b/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml index 222dc9345..a5aaee51b 100644 --- a/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml +++ b/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml @@ -289,13 +289,13 @@ spec: provider: name: Red Hat relatedImages: - - image: registry.redhat.io/openshift-serverless-1/logic-operator-rhel8:1.34.0 + - image: registry.redhat.io/openshift-serverless-1/logic-operator-rhel8:1.35.0 name: IMAGE_LOGIC_SWF_OPERATOR - - image: registry.redhat.io/openshift-serverless-1/logic-swf-devmode-rhel8:1.34.0 + - image: registry.redhat.io/openshift-serverless-1/logic-swf-devmode-rhel8:1.35.0 name: IMAGE_LOGIC_SWF_DEVMODE - - image: registry.redhat.io/openshift-serverless-1/logic-swf-builder-rhel8:1.34.0 + - image: registry.redhat.io/openshift-serverless-1/logic-swf-builder-rhel8:1.35.0 name: IMAGE_LOGIC_SWF_BUILDER - image: registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:4564ca3dc5bac80d6faddaf94c817fbbc270698a9399d8a21ee1005d85ceda56 name: IMAGE_KUBE_RBAC_PROXY - replaces: logic-operator-rhel8.v1.33.0 + replaces: logic-operator-rhel8.v1.34.0 version: 0.0.0 diff --git a/images/modules/com.redhat.osl.builder/module.yaml b/images/modules/com.redhat.osl.builder/module.yaml index 80744d064..cf3193866 100644 --- a/images/modules/com.redhat.osl.builder/module.yaml +++ b/images/modules/com.redhat.osl.builder/module.yaml @@ -13,7 +13,7 @@ # limitations under the License. name: com.redhat.osl.builder -version: "1.34.0" +version: "1.35.0" description: Builds the operator binary envs: diff --git a/images/modules/com.redhat.osl.bundleinstall/module.yaml b/images/modules/com.redhat.osl.bundleinstall/module.yaml index b1e3e2f60..a3e2b609d 100644 --- a/images/modules/com.redhat.osl.bundleinstall/module.yaml +++ b/images/modules/com.redhat.osl.bundleinstall/module.yaml @@ -13,7 +13,7 @@ # limitations under the License. name: com.redhat.osl.bundleinstall -version: "1.34.0" +version: "1.35.0" description: Copy the bund files to the target image artifacts: diff --git a/images/modules/com.redhat.osl.cli.artifacts/module.yaml b/images/modules/com.redhat.osl.cli.artifacts/module.yaml index c6dd1ba1a..e3c9aaef5 100644 --- a/images/modules/com.redhat.osl.cli.artifacts/module.yaml +++ b/images/modules/com.redhat.osl.cli.artifacts/module.yaml @@ -13,7 +13,7 @@ # limitations under the License. name: "com.redhat.osl.cli.artifacts" -version: "1.34.0" +version: "1.35.0" description: "Copy binaries from the packager image" execute: diff --git a/images/modules/com.redhat.osl.cli.packager/module.yaml b/images/modules/com.redhat.osl.cli.packager/module.yaml index 12d109c64..540e2402c 100644 --- a/images/modules/com.redhat.osl.cli.packager/module.yaml +++ b/images/modules/com.redhat.osl.cli.packager/module.yaml @@ -13,7 +13,7 @@ # limitations under the License. name: "com.redhat.osl.cli.packager" -version: "1.34.0" +version: "1.35.0" description: "Download kn-workflow cli binaries from a given repository" packages: diff --git a/images/osl-cli.yaml b/images/osl-cli.yaml index 3cada7dcf..7ccfa6244 100644 --- a/images/osl-cli.yaml +++ b/images/osl-cli.yaml @@ -13,7 +13,7 @@ # limitations under the License. - name: "packager" - version: "1.34.0" + version: "1.35.0" from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" modules: repositories: @@ -22,7 +22,7 @@ - name: com.redhat.osl.cli.packager - name: "openshift-serverless-1/logic-kn-workflow-cli-artifacts-rhel8" - version: "1.34.0" + version: "1.35.0" description: "Red Hat OpenShift Serverless Logic 1 kn-workflow CLI artifacts" from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" labels: @@ -31,7 +31,7 @@ - name: name value: "openshift-serverless-1/kn-workflow-cli-artifacts-rhel8" - name: version - value: "1.34.0" + value: "1.35.0" - name: summary value: "Red Hat OpenShift Serverless Logic 1 kn-workflow CLI artifacts" - name: description @@ -67,4 +67,4 @@ pulp_repos: true repository: name: containers/openshift-serverless-1-logic-kn-workflow-cli-artifacts - branch: openshift-serverless-1.34-rhel-8 + branch: openshift-serverless-1.35-rhel-8 diff --git a/images/prod-bundle-image.yaml b/images/prod-bundle-image.yaml index 5a89cec7b..daff18609 100644 --- a/images/prod-bundle-image.yaml +++ b/images/prod-bundle-image.yaml @@ -15,7 +15,7 @@ schema_version: 1 name: "openshift-serverless-1/logic-operator-bundle" description: "OpenShift Serverless Logic Operator Bundle" -version: "1.34.0" +version: "1.35.0" from: "scratch" labels: @@ -81,4 +81,4 @@ osbs: extra_dir: osbs-extra repository: name: containers/openshift-serverless-1-logic-operator-bundle - branch: openshift-serverless-1.34-rhel-8 \ No newline at end of file + branch: openshift-serverless-1.35-rhel-8 \ No newline at end of file diff --git a/images/prod-operator-image.yaml b/images/prod-operator-image.yaml index 6ab425fb5..c6f2d0fab 100644 --- a/images/prod-operator-image.yaml +++ b/images/prod-operator-image.yaml @@ -14,7 +14,7 @@ - schema_version: 1 name: "operator-builder" - version: "1.34.0" + version: "1.35.0" from: "registry.access.redhat.com/ubi8/go-toolset:1.21" description: "Golang builder image for the Red Hat OpenShift Serverless Logic Operator" @@ -40,7 +40,7 @@ - aarch64 - name: "openshift-serverless-1/logic-rhel8-operator" - version: "1.34.0" + version: "1.35.0" from: "registry.access.redhat.com/ubi8/ubi-micro:latest" description: "Runtime Image for the Red Hat OpenShift Serverless Logic Operator" @@ -69,7 +69,7 @@ extra_dir: osbs-extra repository: name: containers/openshift-serverless-1-logic-operator - branch: openshift-serverless-1.34-rhel-8 + branch: openshift-serverless-1.35-rhel-8 run: user: "1001" \ No newline at end of file From 6881e93eb7e5e5e1043f5b26376f9db544d10f9a Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Wed, 6 Nov 2024 11:32:55 -0500 Subject: [PATCH 2/3] Update config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml --- .../prod/bases/logic-operator-rhel8.clusterserviceversion.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml b/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml index a5aaee51b..9130c3ab3 100644 --- a/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml +++ b/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml @@ -298,4 +298,4 @@ spec: - image: registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:4564ca3dc5bac80d6faddaf94c817fbbc270698a9399d8a21ee1005d85ceda56 name: IMAGE_KUBE_RBAC_PROXY replaces: logic-operator-rhel8.v1.34.0 - version: 0.0.0 + version: logic-operator-rhel8.v1.35.0 From 81ed7a754e4a280846d5e131be8e5da25ae262bc Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Wed, 6 Nov 2024 13:38:12 -0500 Subject: [PATCH 3/3] Update config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml --- .../prod/bases/logic-operator-rhel8.clusterserviceversion.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml b/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml index 9130c3ab3..fd82a7ed0 100644 --- a/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml +++ b/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml @@ -298,4 +298,4 @@ spec: - image: registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:4564ca3dc5bac80d6faddaf94c817fbbc270698a9399d8a21ee1005d85ceda56 name: IMAGE_KUBE_RBAC_PROXY replaces: logic-operator-rhel8.v1.34.0 - version: logic-operator-rhel8.v1.35.0 + version: 1.35.0