Skip to content

Commit

Permalink
Merge pull request #236 from kiegroup/kogito-1.43.0
Browse files Browse the repository at this point in the history
[1.43.x] Update project version to 1.43.0
  • Loading branch information
Jenkins CI committed Aug 22, 2023
2 parents 09964fa + 47e5c67 commit 21559b7
Show file tree
Hide file tree
Showing 12 changed files with 35 additions and 30 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.43.0-snapshot
VERSION ?= 1.43.0
REDUCED_VERSION ?= 1.43

# CHANNELS define the bundle channels used in the bundle.
Expand All @@ -30,7 +30,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
#
# 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>)
Expand Down
7 changes: 7 additions & 0 deletions buildkitd.toml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@ apiVersion: v1
data:
DEFAULT_BUILDER_RESOURCE_NAME: Dockerfile
DEFAULT_WORKFLOW_EXTENSION: .sw.json
Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder-nightly:1.43 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.43 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ metadata:
]
capabilities: Basic Install
categories: Application Runtime
containerImage: quay.io/kiegroup/kogito-serverless-operator-nightly:1.43
containerImage: quay.io/kiegroup/kogito-serverless-operator:1.43
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.43.0-snapshot
name: sonataflow-operator.v1.43.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -449,7 +449,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: quay.io/kiegroup/kogito-serverless-operator-nightly:1.43
image: quay.io/kiegroup/kogito-serverless-operator:1.43
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -540,4 +540,4 @@ spec:
minKubeVersion: 1.23.0
provider:
name: Red Hat
version: 1.43.0-snapshot
version: 1.43.0
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: quay.io/kiegroup/kogito-serverless-operator-nightly
newName: quay.io/kiegroup/kogito-serverless-operator
newTag: "1.43"
# Patching the manager deployment file to add an env var with the operator namespace in
patchesJson6902:
Expand Down
2 changes: 1 addition & 1 deletion config/manager/sonataflow_builder_dockerfile.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/kiegroup/kogito-swf-builder-nightly:1.43 AS builder
FROM quay.io/kiegroup/kogito-swf-builder:1.43 AS builder

# Copy from build context to skeleton resources project
COPY * ./resources/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
alm-examples: '[]'
capabilities: Basic Install
categories: Application Runtime
containerImage: quay.io/kiegroup/kogito-serverless-operator-nightly:1.43
containerImage: quay.io/kiegroup/kogito-serverless-operator:1.43
description: SonataFlow Kubernetes Operator for deploying workflow applications
based on the CNCF Serverless Workflow specification
repository: https://github.com/kiegroup/kogito-serverless-operator
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: platform-kaniko-using-cache
spec:
publishStrategy: "Kaniko"
baseImage: quay.io/kiegroup/kogito-swf-builder-nightly:1.43
baseImage: quay.io/kiegroup/kogito-swf-builder:1.43
registry:
address: quay.io/kiegroup
secret: regcred
Expand Down
2 changes: 1 addition & 1 deletion image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
- name: org.kie.kogito.app.builder

- name: kogito-serverless-operator
version: 1.43.0-snapshot
version: 1.43.0
from: registry.access.redhat.com/ubi8/ubi-micro:latest
description: Runtime Image for the Operator

Expand Down
17 changes: 8 additions & 9 deletions operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3018,14 +3018,13 @@ apiVersion: v1
data:
DEFAULT_BUILDER_RESOURCE_NAME: Dockerfile
DEFAULT_WORKFLOW_EXTENSION: .sw.json
Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder-nightly:1.43 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.43 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
Expand Down Expand Up @@ -3127,7 +3126,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: quay.io/kiegroup/kogito-serverless-operator-nightly:1.43
image: quay.io/kiegroup/kogito-serverless-operator:1.43
livenessProbe:
httpGet:
path: /healthz
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ metadata:
spec:
build:
config:
baseImage: quay.io/kiegroup/kogito-swf-builder-nightly:1.43
baseImage: quay.io/kiegroup/kogito-swf-builder:1.43
strategyOptions:
KanikoBuildCacheEnabled: "true"
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

const (
// Current version
OperatorVersion = "1.43.0-snapshot"
OperatorVersion = "1.43.0"

// Should not be changed
snapshotSuffix = "snapshot"
Expand Down

0 comments on commit 21559b7

Please sign in to comment.