Skip to content
This repository was archived by the owner on Nov 3, 2025. It is now read-only.

Commit 009e7d9

Browse files
author
Jenkins CI
committed
Merge pull request #171 from kiegroup/1.40.0-s3fojwrwdo
[1.40.x] Update project version to 1.40.0
2 parents 756a9ed + ea0b1d1 commit 009e7d9

10 files changed

+33
-28
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# To re-generate a bundle for another specific version without changing the standard setup, you can:
44
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
55
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
6-
VERSION ?= 1.40.0-snapshot
6+
VERSION ?= 1.40.0
77

88
# CHANNELS define the bundle channels used in the bundle.
99
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
@@ -29,7 +29,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
2929
#
3030
# For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
3131
# kiegroup.org/kogito-serverless-operator-bundle:$VERSION and kiegroup.org/kogito-serverless-operator-catalog:$VERSION.
32-
IMAGE_TAG_BASE ?= quay.io/kiegroup/kogito-serverless-operator-nightly
32+
IMAGE_TAG_BASE ?= quay.io/kiegroup/kogito-serverless-operator
3333

3434
# BUNDLE_IMG defines the image:tag used for the bundle.
3535
# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)

‎buildkitd.toml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
debug = true
3+
[registry."docker.io"]
4+
mirrors = ["mirror.gcr.io"]
5+
[registry."localhost:5000"]
6+
http = true
7+

‎bundle/manifests/sonataflow-operator-builder-config_v1_configmap.yaml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ apiVersion: v1
22
data:
33
DEFAULT_BUILDER_RESOURCE_NAME: Dockerfile
44
DEFAULT_WORKFLOW_EXTENSION: .sw.json
5-
Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder-nightly:1.40 AS builder\n
6-
\ \n # Copy from build context to skeleton resources project\nCOPY * ./resources/\n\nRUN
7-
/home/kogito/launch/build-app.sh ./resources\n \n #=============================\n
8-
\ # Runtime Run\n #=============================\nFROM registry.access.redhat.com/ubi8/openjdk-11:latest\n\nENV
9-
LANG='en_US.UTF-8' LANGUAGE='en_US:en'\n \n # We make four distinct layers so
10-
if there are application changes the library layers can be re-used\nCOPY --from=builder
11-
--chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/lib/ /deployments/lib/\nCOPY
12-
--from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/*.jar
5+
Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder:1.40 AS builder\n \n # Copy
6+
from build context to skeleton resources project\nCOPY * ./resources/\n\nRUN /home/kogito/launch/build-app.sh
7+
./resources\n \n #=============================\n # Runtime Run\n #=============================\nFROM
8+
registry.access.redhat.com/ubi8/openjdk-11:latest\n\nENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'\n
9+
\ \n # We make four distinct layers so if there are application changes the library
10+
layers can be re-used\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/lib/
11+
/deployments/lib/\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/*.jar
1312
/deployments/\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/app/
1413
/deployments/app/\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/quarkus/
1514
/deployments/quarkus/\n\nEXPOSE 8080\nUSER 185\nENV AB_JOLOKIA_OFF=\"\"\nENV JAVA_OPTS=\"-Dquarkus.http.host=0.0.0.0

‎bundle/manifests/sonataflow-operator.clusterserviceversion.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ metadata:
9595
capabilities: Basic Install
9696
operators.operatorframework.io/builder: operator-sdk-v1.25.0
9797
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
98-
name: sonataflow-operator.v1.40.0-snapshot
98+
name: sonataflow-operator.v1.40.0
9999
namespace: placeholder
100100
spec:
101101
apiservicedefinitions: {}
@@ -435,7 +435,7 @@ spec:
435435
valueFrom:
436436
fieldRef:
437437
fieldPath: metadata.namespace
438-
image: quay.io/kiegroup/kogito-serverless-operator-nightly:1.40.0-snapshot
438+
image: quay.io/kiegroup/kogito-serverless-operator:1.40.0
439439
livenessProbe:
440440
httpGet:
441441
path: /healthz
@@ -522,4 +522,4 @@ spec:
522522
maturity: alpha
523523
provider:
524524
name: sonataflow-operator
525-
version: 1.40.0-snapshot
525+
version: 1.40.0

‎config/manager/kustomization.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
1919
kind: Kustomization
2020
images:
2121
- name: controller
22-
newName: quay.io/kiegroup/kogito-serverless-operator-nightly
23-
newTag: 1.40.0-snapshot
22+
newName: quay.io/kiegroup/kogito-serverless-operator
23+
newTag: 1.40.0
2424
# Patching the manager deployment file to add an env var with the operator namespace in
2525
patchesJson6902:
2626
- patch: |-

‎config/manager/sonataflow_builder_dockerfile.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/kiegroup/kogito-swf-builder-nightly:1.40 AS builder
1+
FROM quay.io/kiegroup/kogito-swf-builder:1.40 AS builder
22

33
# Copy from build context to skeleton resources project
44
COPY * ./resources/

‎container-builder/examples/api/PlatformBuild_usingKanikowithCache.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: platform-kaniko-using-cache
22
spec:
33
publishStrategy: "Kaniko"
4-
baseImage: quay.io/kiegroup/kogito-swf-builder-nightly:1.40
4+
baseImage: quay.io/kiegroup/kogito-swf-builder:1.40
55
registry:
66
address: quay.io/kiegroup
77
secret: regcred

‎operator.yaml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3067,14 +3067,13 @@ apiVersion: v1
30673067
data:
30683068
DEFAULT_BUILDER_RESOURCE_NAME: Dockerfile
30693069
DEFAULT_WORKFLOW_EXTENSION: .sw.json
3070-
Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder-nightly:1.40 AS builder\n
3071-
\ \n # Copy from build context to skeleton resources project\nCOPY * ./resources/\n\nRUN
3072-
/home/kogito/launch/build-app.sh ./resources\n \n #=============================\n
3073-
\ # Runtime Run\n #=============================\nFROM registry.access.redhat.com/ubi8/openjdk-11:latest\n\nENV
3074-
LANG='en_US.UTF-8' LANGUAGE='en_US:en'\n \n # We make four distinct layers so
3075-
if there are application changes the library layers can be re-used\nCOPY --from=builder
3076-
--chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/lib/ /deployments/lib/\nCOPY
3077-
--from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/*.jar
3070+
Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder:1.40 AS builder\n \n # Copy
3071+
from build context to skeleton resources project\nCOPY * ./resources/\n\nRUN /home/kogito/launch/build-app.sh
3072+
./resources\n \n #=============================\n # Runtime Run\n #=============================\nFROM
3073+
registry.access.redhat.com/ubi8/openjdk-11:latest\n\nENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'\n
3074+
\ \n # We make four distinct layers so if there are application changes the library
3075+
layers can be re-used\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/lib/
3076+
/deployments/lib/\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/*.jar
30783077
/deployments/\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/app/
30793078
/deployments/app/\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/quarkus/
30803079
/deployments/quarkus/\n\nEXPOSE 8080\nUSER 185\nENV AB_JOLOKIA_OFF=\"\"\nENV JAVA_OPTS=\"-Dquarkus.http.host=0.0.0.0
@@ -3175,7 +3174,7 @@ spec:
31753174
valueFrom:
31763175
fieldRef:
31773176
fieldPath: metadata.namespace
3178-
image: quay.io/kiegroup/kogito-serverless-operator-nightly:1.40.0-snapshot
3177+
image: quay.io/kiegroup/kogito-serverless-operator:1.40.0
31793178
livenessProbe:
31803179
httpGet:
31813180
path: /healthz

‎test/testdata/sonataflow.org_v1alpha08_sonataflowplatform_withCache_minikube.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ metadata:
1818
name: sonataflow-platform
1919
spec:
2020
platform:
21-
baseImage: quay.io/kiegroup/kogito-swf-builder-nightly:1.40
21+
baseImage: quay.io/kiegroup/kogito-swf-builder:1.40
2222
buildStrategyOptions:
2323
KanikoBuildCacheEnabled: "true"

‎version/version.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
const (
2222
// Current version
23-
OperatorVersion = "1.40.0-snapshot"
23+
OperatorVersion = "1.40.0"
2424

2525
// Should not be changed
2626
snapshotSuffix = "snapshot"

0 commit comments

Comments
 (0)