[1.41.x] Update project version to 1.41.0
diff --git a/Makefile b/Makefile
index 5e6814e..c562814 100644
--- a/Makefile
+++ b/Makefile
@@ -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.41.0-snapshot
+VERSION ?= 1.41.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")
@@ -29,7 +29,7 @@
#
# 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 ?= quay.io/kiegroup/kogito-serverless-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>)
diff --git a/buildkitd.toml b/buildkitd.toml
new file mode 100644
index 0000000..5d34ba6
--- /dev/null
+++ b/buildkitd.toml
@@ -0,0 +1,7 @@
+debug = false
+[registry."localhost:5000"]
+http = true
+[registry."docker.io"]
+mirrors = ["ba-docker-registry.usersys.redhat.com:5000"]
+[registry."ba-docker-registry.usersys.redhat.com:5000"]
+http = true
diff --git a/bundle/manifests/sonataflow-operator-builder-config_v1_configmap.yaml b/bundle/manifests/sonataflow-operator-builder-config_v1_configmap.yaml
index 8eae469..25ebaa2 100644
--- a/bundle/manifests/sonataflow-operator-builder-config_v1_configmap.yaml
+++ b/bundle/manifests/sonataflow-operator-builder-config_v1_configmap.yaml
@@ -2,14 +2,13 @@
data:
DEFAULT_BUILDER_RESOURCE_NAME: Dockerfile
DEFAULT_WORKFLOW_EXTENSION: .sw.json
- Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder-nightly:1.41 AS builder\n
- \ \n # Copy from build context to skeleton resources project\nCOPY * ./resources/\n\nRUN
- /home/kogito/launch/build-app.sh ./resources\n \n #=============================\n
- \ # Runtime Run\n #=============================\nFROM registry.access.redhat.com/ubi8/openjdk-11:latest\n\nENV
- LANG='en_US.UTF-8' LANGUAGE='en_US:en'\n \n # We make four distinct layers so
- if there are application changes the library layers can be re-used\nCOPY --from=builder
- --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/lib/ /deployments/lib/\nCOPY
- --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/*.jar
+ Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder:1.41 AS builder\n \n # Copy
+ from build context to skeleton resources project\nCOPY * ./resources/\n\nRUN /home/kogito/launch/build-app.sh
+ ./resources\n \n #=============================\n # Runtime Run\n #=============================\nFROM
+ registry.access.redhat.com/ubi8/openjdk-11:latest\n\nENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'\n
+ \ \n # We make four distinct layers so if there are application changes the library
+ layers can be re-used\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/lib/
+ /deployments/lib/\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/*.jar
/deployments/\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/app/
/deployments/app/\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/quarkus/
/deployments/quarkus/\n\nEXPOSE 8080\nUSER 185\nENV AB_JOLOKIA_OFF=\"\"\nENV JAVA_OPTS=\"-Dquarkus.http.host=0.0.0.0
diff --git a/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml b/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml
index ed7aa04..ca6e1e3 100644
--- a/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml
@@ -446,7 +446,7 @@
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: quay.io/kiegroup/kogito-serverless-operator-nightly:1.41
+ image: quay.io/kiegroup/kogito-serverless-operator:1.41
livenessProbe:
httpGet:
path: /healthz
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 43aed41..b5b3314 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -19,8 +19,8 @@
kind: Kustomization
images:
- name: controller
- newName: quay.io/kiegroup/kogito-serverless-operator-nightly
- newTag: 1.41.0-snapshot
+ newName: quay.io/kiegroup/kogito-serverless-operator
+ newTag: 1.41.0
# Patching the manager deployment file to add an env var with the operator namespace in
patchesJson6902:
- patch: |-
diff --git a/config/manager/sonataflow_builder_dockerfile.yaml b/config/manager/sonataflow_builder_dockerfile.yaml
index 3f0b209..2425e2e 100644
--- a/config/manager/sonataflow_builder_dockerfile.yaml
+++ b/config/manager/sonataflow_builder_dockerfile.yaml
@@ -1,4 +1,4 @@
-FROM quay.io/kiegroup/kogito-swf-builder-nightly:1.41 AS builder
+FROM quay.io/kiegroup/kogito-swf-builder:1.41 AS builder
# Copy from build context to skeleton resources project
COPY * ./resources/
diff --git a/container-builder/examples/api/PlatformBuild_usingKanikowithCache.yaml b/container-builder/examples/api/PlatformBuild_usingKanikowithCache.yaml
index 6cc16cc..1b818d9 100644
--- a/container-builder/examples/api/PlatformBuild_usingKanikowithCache.yaml
+++ b/container-builder/examples/api/PlatformBuild_usingKanikowithCache.yaml
@@ -1,7 +1,7 @@
name: platform-kaniko-using-cache
spec:
publishStrategy: "Kaniko"
- baseImage: quay.io/kiegroup/kogito-swf-builder-nightly:1.41
+ baseImage: quay.io/kiegroup/kogito-swf-builder:1.41
registry:
address: quay.io/kiegroup
secret: regcred
diff --git a/image.yaml b/image.yaml
index e34833e..c87f8d6 100644
--- a/image.yaml
+++ b/image.yaml
@@ -11,7 +11,7 @@
- name: org.kie.kogito.app.builder
- name: kogito-serverless-operator
- version: 1.41.0-snapshot
+ version: 1.41.0
from: registry.access.redhat.com/ubi8/ubi-micro:latest
description: Runtime Image for the Operator
diff --git a/operator.yaml b/operator.yaml
index e493be4..887f732 100644
--- a/operator.yaml
+++ b/operator.yaml
@@ -3067,14 +3067,13 @@
data:
DEFAULT_BUILDER_RESOURCE_NAME: Dockerfile
DEFAULT_WORKFLOW_EXTENSION: .sw.json
- Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder-nightly:1.41 AS builder\n
- \ \n # Copy from build context to skeleton resources project\nCOPY * ./resources/\n\nRUN
- /home/kogito/launch/build-app.sh ./resources\n \n #=============================\n
- \ # Runtime Run\n #=============================\nFROM registry.access.redhat.com/ubi8/openjdk-11:latest\n\nENV
- LANG='en_US.UTF-8' LANGUAGE='en_US:en'\n \n # We make four distinct layers so
- if there are application changes the library layers can be re-used\nCOPY --from=builder
- --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/lib/ /deployments/lib/\nCOPY
- --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/*.jar
+ Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder:1.41 AS builder\n \n # Copy
+ from build context to skeleton resources project\nCOPY * ./resources/\n\nRUN /home/kogito/launch/build-app.sh
+ ./resources\n \n #=============================\n # Runtime Run\n #=============================\nFROM
+ registry.access.redhat.com/ubi8/openjdk-11:latest\n\nENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'\n
+ \ \n # We make four distinct layers so if there are application changes the library
+ layers can be re-used\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/lib/
+ /deployments/lib/\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/*.jar
/deployments/\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/app/
/deployments/app/\nCOPY --from=builder --chown=185 /home/kogito/serverless-workflow-project/target/quarkus-app/quarkus/
/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 @@
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: quay.io/kiegroup/kogito-serverless-operator-nightly:1.41.0-snapshot
+ image: quay.io/kiegroup/kogito-serverless-operator:1.41.0
livenessProbe:
httpGet:
path: /healthz
diff --git a/test/testdata/sonataflow.org_v1alpha08_sonataflowplatform_withCache_minikube.yaml b/test/testdata/sonataflow.org_v1alpha08_sonataflowplatform_withCache_minikube.yaml
index c1fb93e..9949968 100644
--- a/test/testdata/sonataflow.org_v1alpha08_sonataflowplatform_withCache_minikube.yaml
+++ b/test/testdata/sonataflow.org_v1alpha08_sonataflowplatform_withCache_minikube.yaml
@@ -18,6 +18,6 @@
name: sonataflow-platform
spec:
platform:
- baseImage: quay.io/kiegroup/kogito-swf-builder-nightly:1.41
+ baseImage: quay.io/kiegroup/kogito-swf-builder:1.41
buildStrategyOptions:
KanikoBuildCacheEnabled: "true"
diff --git a/version/version.go b/version/version.go
index f5524ae..726c693 100644
--- a/version/version.go
+++ b/version/version.go
@@ -20,7 +20,7 @@
const (
// Current version
- OperatorVersion = "1.41.0-snapshot"
+ OperatorVersion = "1.41.0"
// Should not be changed
snapshotSuffix = "snapshot"
