[1.42.x] Update project version to 1.42.0
diff --git a/Makefile b/Makefile
index a8fe017..b431aee 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.42.0-snapshot
+VERSION ?= 1.42.0
REDUCED_VERSION ?= 1.42
# CHANNELS define the bundle channels used in the bundle.
@@ -30,7 +30,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 68b6bb9..30762c0 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.42 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.42 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 d09b3b8..4a3b36a 100644
--- a/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml
@@ -94,14 +94,14 @@
]
capabilities: Basic Install
categories: Application Runtime
- containerImage: quay.io/kiegroup/kogito-serverless-operator-nightly:1.42
+ containerImage: quay.io/kiegroup/kogito-serverless-operator:1.42
description: SonataFlow Kubernetes Operator for deploying workflow applications
based on the CNCF Serverless Workflow specification
operators.operatorframework.io/builder: operator-sdk-v1.25.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/kiegroup/kogito-serverless-operator
support: Red Hat
- name: sonataflow-operator.v1.42.0-snapshot
+ name: sonataflow-operator.v1.42.0
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -446,7 +446,7 @@
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: quay.io/kiegroup/kogito-serverless-operator-nightly:1.42
+ image: quay.io/kiegroup/kogito-serverless-operator:1.42
livenessProbe:
httpGet:
path: /healthz
@@ -537,4 +537,4 @@
minKubeVersion: 1.23.0
provider:
name: Red Hat
- version: 1.42.0-snapshot
+ version: 1.42.0
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index bc9f3dc..5d3e457 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -19,7 +19,7 @@
kind: Kustomization
images:
- name: controller
- newName: quay.io/kiegroup/kogito-serverless-operator-nightly
+ newName: quay.io/kiegroup/kogito-serverless-operator
newTag: "1.42"
# Patching the manager deployment file to add an env var with the operator namespace in
patchesJson6902:
diff --git a/config/manager/sonataflow_builder_dockerfile.yaml b/config/manager/sonataflow_builder_dockerfile.yaml
index ac142eb..e0fbf82 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.42 AS builder
+FROM quay.io/kiegroup/kogito-swf-builder:1.42 AS builder
# Copy from build context to skeleton resources project
COPY * ./resources/
diff --git a/config/manifests/bases/sonataflow-operator.clusterserviceversion.yaml b/config/manifests/bases/sonataflow-operator.clusterserviceversion.yaml
index ba76399..64b0b09 100644
--- a/config/manifests/bases/sonataflow-operator.clusterserviceversion.yaml
+++ b/config/manifests/bases/sonataflow-operator.clusterserviceversion.yaml
@@ -5,7 +5,7 @@
alm-examples: '[]'
capabilities: Basic Install
categories: Application Runtime
- containerImage: quay.io/kiegroup/kogito-serverless-operator-nightly:1.42
+ containerImage: quay.io/kiegroup/kogito-serverless-operator:1.42
description: SonataFlow Kubernetes Operator for deploying workflow applications
based on the CNCF Serverless Workflow specification
repository: https://github.com/kiegroup/kogito-serverless-operator
diff --git a/container-builder/examples/api/PlatformBuild_usingKanikowithCache.yaml b/container-builder/examples/api/PlatformBuild_usingKanikowithCache.yaml
index 1394109..9f20d9c 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.42
+ baseImage: quay.io/kiegroup/kogito-swf-builder:1.42
registry:
address: quay.io/kiegroup
secret: regcred
diff --git a/image.yaml b/image.yaml
index bc23ca5..2ef6097 100644
--- a/image.yaml
+++ b/image.yaml
@@ -11,7 +11,7 @@
- name: org.kie.kogito.app.builder
- name: kogito-serverless-operator
- version: 1.42.0-snapshot
+ version: 1.42.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 0cd7c3a..09565d9 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.42 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.42 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.42
+ image: quay.io/kiegroup/kogito-serverless-operator:1.42
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 70a6ad0..00778c9 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.42
+ baseImage: quay.io/kiegroup/kogito-swf-builder:1.42
buildStrategyOptions:
KanikoBuildCacheEnabled: "true"
diff --git a/version/version.go b/version/version.go
index 611a9bd..25772fe 100644
--- a/version/version.go
+++ b/version/version.go
@@ -20,7 +20,7 @@
const (
// Current version
- OperatorVersion = "1.42.0-snapshot"
+ OperatorVersion = "1.42.0"
// Should not be changed
snapshotSuffix = "snapshot"
