Skip to content

Commit

Permalink
Merge pull request #142 from kiegroup/1.39.0-mwk3ot1tda
Browse files Browse the repository at this point in the history
[1.39.x] Update project version to 1.39.0
  • Loading branch information
Jenkins CI committed May 30, 2023
2 parents cf0c3e7 + f88dd93 commit 2f25158
Show file tree
Hide file tree
Showing 11 changed files with 26 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.39.0-snapshot
VERSION ?= 1.39.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")
Expand All @@ -29,7 +29,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
2 changes: 0 additions & 2 deletions api/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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.39 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.39 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,7 +96,7 @@ metadata:
capabilities: Basic Install
operators.operatorframework.io/builder: operator-sdk-v1.25.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
name: kogito-serverless-operator.v1.39.0-snapshot
name: kogito-serverless-operator.v1.39.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -365,7 +365,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: quay.io/kiegroup/kogito-serverless-operator-nightly:1.39.0-snapshot
image: quay.io/kiegroup/kogito-serverless-operator:1.39.0
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -451,4 +451,4 @@ spec:
maturity: alpha
provider:
name: kogito-serverlessworkflow-operator
version: 1.39.0-snapshot
version: 1.39.0
2 changes: 1 addition & 1 deletion config/manager/kogito_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.39 AS builder
FROM quay.io/kiegroup/kogito-swf-builder:1.39 AS builder

# Copy from build context to skeleton resources project
COPY * ./resources/
Expand Down
4 changes: 2 additions & 2 deletions config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: quay.io/kiegroup/kogito-serverless-operator-nightly
newTag: 1.39.0-snapshot
newName: quay.io/kiegroup/kogito-serverless-operator
newTag: 1.39.0
# Patching the manager deployment file to add an env var with the operator namespace in
patchesJson6902:
- patch: |-
Expand Down
2 changes: 1 addition & 1 deletion container-builder/api/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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.39
baseImage: quay.io/kiegroup/kogito-swf-builder:1.39
registry:
address: quay.io/kiegroup
secret: regcred
Expand Down
Binary file added minikube-1.30.1-0.x86_64.rpm
Binary file not shown.
17 changes: 8 additions & 9 deletions operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5569,14 +5569,13 @@ apiVersion: v1
data:
DEFAULT_BUILDER_RESOURCE_NAME: Dockerfile
DEFAULT_WORKFLOW_EXTENSION: .sw.json
Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder-nightly:1.39 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.39 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 @@ -5677,7 +5676,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: quay.io/kiegroup/kogito-serverless-operator-nightly:1.39.0-snapshot
image: quay.io/kiegroup/kogito-serverless-operator:1.39.0
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

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

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

0 comments on commit 2f25158

Please sign in to comment.