[1.40.x] Update snapshot version to 1.40.2-snapshot Committed by build jenkins-KIE-kogito-1.40.x-release-kogito-serverless-operator-promote-2: https://eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com/job/KIE/job/kogito/job/1.40.x/job/release/job/kogito-serverless-operator-promote/2/
diff --git a/Makefile b/Makefile index 63b2293..1d86c6d 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.40.1 +VERSION ?= 1.40.2-snapshot REDUCED_VERSION ?= 1.40 # 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 +IMAGE_TAG_BASE ?= quay.io/kiegroup/kogito-serverless-operator-nightly # 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/bundle/manifests/sonataflow-operator-builder-config_v1_configmap.yaml b/bundle/manifests/sonataflow-operator-builder-config_v1_configmap.yaml index a33403f..b59118b 100644 --- a/bundle/manifests/sonataflow-operator-builder-config_v1_configmap.yaml +++ b/bundle/manifests/sonataflow-operator-builder-config_v1_configmap.yaml
@@ -2,13 +2,14 @@ data: DEFAULT_BUILDER_RESOURCE_NAME: Dockerfile DEFAULT_WORKFLOW_EXTENSION: .sw.json - Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder:1.40 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-nightly:1.40 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 410d7c6..9beccc7 100644 --- a/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml +++ b/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml
@@ -95,7 +95,7 @@ capabilities: Basic Install operators.operatorframework.io/builder: operator-sdk-v1.25.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - name: sonataflow-operator.v1.40.1 + name: sonataflow-operator.v1.40.2-snapshot namespace: placeholder spec: apiservicedefinitions: {} @@ -435,7 +435,7 @@ valueFrom: fieldRef: fieldPath: metadata.namespace - image: quay.io/kiegroup/kogito-serverless-operator:1.40 + image: quay.io/kiegroup/kogito-serverless-operator-nightly:1.40 livenessProbe: httpGet: path: /healthz @@ -522,4 +522,4 @@ maturity: alpha provider: name: sonataflow-operator - version: 1.40.1 + version: 1.40.2-snapshot
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index f109e14..aa49150 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 + newName: quay.io/kiegroup/kogito-serverless-operator-nightly newTag: "1.40" # 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 1a7459a..52de029 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:1.40 AS builder +FROM quay.io/kiegroup/kogito-swf-builder-nightly:1.40 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 166dee3..6f515f1 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:1.40 + baseImage: quay.io/kiegroup/kogito-swf-builder-nightly:1.40 registry: address: quay.io/kiegroup secret: regcred
diff --git a/operator.yaml b/operator.yaml index d47e0c3..35ee59e 100644 --- a/operator.yaml +++ b/operator.yaml
@@ -3065,13 +3065,14 @@ data: DEFAULT_BUILDER_RESOURCE_NAME: Dockerfile DEFAULT_WORKFLOW_EXTENSION: .sw.json - Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder:1.40 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-nightly:1.40 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 @@ -3172,7 +3173,7 @@ valueFrom: fieldRef: fieldPath: metadata.namespace - image: quay.io/kiegroup/kogito-serverless-operator:1.40 + image: quay.io/kiegroup/kogito-serverless-operator-nightly:1.40 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 e92f765..0b77927 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:1.40 + baseImage: quay.io/kiegroup/kogito-swf-builder-nightly:1.40 buildStrategyOptions: KanikoBuildCacheEnabled: "true"
diff --git a/version/version.go b/version/version.go index ab40118..f355aac 100644 --- a/version/version.go +++ b/version/version.go
@@ -20,7 +20,7 @@ const ( // Current version - OperatorVersion = "1.40.1" + OperatorVersion = "1.40.2-snapshot" // Should not be changed snapshotSuffix = "snapshot"