From 16eacf868a242ba123068cfde84f15c93761367c Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Mon, 11 Sep 2023 08:08:05 -0400 Subject: [PATCH] [1.44.x] Update project version to 1.44.1 --- Makefile | 4 ++-- buildkitd.toml | 7 +++++++ ...ataflow-operator-builder-config_v1_configmap.yaml | 10 +++++----- .../sonataflow-operator.clusterserviceversion.yaml | 8 ++++---- config/manager/kustomization.yaml | 2 +- config/manager/sonataflow_builder_dockerfile.yaml | 2 +- .../sonataflow-operator.clusterserviceversion.yaml | 2 +- .../api/PlatformBuild_usingKanikowithCache.yaml | 2 +- image.yaml | 2 +- operator.yaml | 12 ++++++------ ...lpha08_sonataflowplatform_withCache_minikube.yaml | 2 +- version/version.go | 2 +- 12 files changed, 31 insertions(+), 24 deletions(-) create mode 100644 buildkitd.toml diff --git a/Makefile b/Makefile index bdfada9b1..43875382e 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.44.0-snapshot +VERSION ?= 1.44.1 REDUCED_VERSION ?= 1.44 # CHANNELS define the bundle channels used in the bundle. @@ -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=/:) diff --git a/buildkitd.toml b/buildkitd.toml new file mode 100644 index 000000000..5d34ba640 --- /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 8922f9f3c..b7a217d13 100644 --- a/bundle/manifests/sonataflow-operator-builder-config_v1_configmap.yaml +++ b/bundle/manifests/sonataflow-operator-builder-config_v1_configmap.yaml @@ -2,11 +2,11 @@ apiVersion: v1 data: DEFAULT_BUILDER_RESOURCE_NAME: Dockerfile DEFAULT_WORKFLOW_EXTENSION: .sw.json - Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder-nightly:1.44 AS builder\n\n# - variables that can be overridden by the builder\n# To add a Quarkus extension - to your application\nARG QUARKUS_EXTENSIONS\n# Args to pass to the Quarkus CLI - add extension command\nARG QUARKUS_ADD_EXTENSION_ARGS\n\n# Copy from build context - to skeleton resources project\nCOPY --chmod=644 * ./resources/\n\nRUN /home/kogito/launch/build-app.sh + Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder:1.44 AS builder\n\n# variables + that can be overridden by the builder\n# To add a Quarkus extension to your application\nARG + QUARKUS_EXTENSIONS\n# Args to pass to the Quarkus CLI add extension command\nARG + QUARKUS_ADD_EXTENSION_ARGS\n\n# Copy from build context to skeleton resources + project\nCOPY --chmod=644 * ./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 diff --git a/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml b/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml index 591f1880a..157cf57c5 100644 --- a/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml +++ b/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml @@ -96,14 +96,14 @@ metadata: ] capabilities: Basic Install categories: Application Runtime - containerImage: quay.io/kiegroup/kogito-serverless-operator-nightly:1.44 + containerImage: quay.io/kiegroup/kogito-serverless-operator:1.44 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.44.0-snapshot + name: sonataflow-operator.v1.44.1 namespace: placeholder spec: apiservicedefinitions: {} @@ -449,7 +449,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: quay.io/kiegroup/kogito-serverless-operator-nightly:1.44 + image: quay.io/kiegroup/kogito-serverless-operator:1.44 livenessProbe: httpGet: path: /healthz @@ -540,4 +540,4 @@ spec: minKubeVersion: 1.23.0 provider: name: Red Hat - version: 1.44.0-snapshot + version: 1.44.1 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index b23d17b75..25e971a1e 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -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.44" # 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 d78c5a95b..6ebfba0aa 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.44 AS builder +FROM quay.io/kiegroup/kogito-swf-builder:1.44 AS builder # variables that can be overridden by the builder # To add a Quarkus extension to your application diff --git a/config/manifests/bases/sonataflow-operator.clusterserviceversion.yaml b/config/manifests/bases/sonataflow-operator.clusterserviceversion.yaml index f822b44c8..a058d0d25 100644 --- a/config/manifests/bases/sonataflow-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/sonataflow-operator.clusterserviceversion.yaml @@ -5,7 +5,7 @@ metadata: alm-examples: '[]' capabilities: Basic Install categories: Application Runtime - containerImage: quay.io/kiegroup/kogito-serverless-operator-nightly:1.44 + containerImage: quay.io/kiegroup/kogito-serverless-operator:1.44 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 bccdb17de..654a2ea88 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.44 + baseImage: quay.io/kiegroup/kogito-swf-builder:1.44 registry: address: quay.io/kiegroup secret: regcred diff --git a/image.yaml b/image.yaml index f4982095a..740d4446b 100644 --- a/image.yaml +++ b/image.yaml @@ -11,7 +11,7 @@ - name: org.kie.kogito.app.builder - name: kogito-serverless-operator - version: 1.44.0-snapshot + version: 1.44.1 from: registry.access.redhat.com/ubi8/ubi-micro:latest description: Runtime Image for the Operator diff --git a/operator.yaml b/operator.yaml index 514b2bf84..671a95023 100644 --- a/operator.yaml +++ b/operator.yaml @@ -3481,11 +3481,11 @@ apiVersion: v1 data: DEFAULT_BUILDER_RESOURCE_NAME: Dockerfile DEFAULT_WORKFLOW_EXTENSION: .sw.json - Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder-nightly:1.44 AS builder\n\n# - variables that can be overridden by the builder\n# To add a Quarkus extension - to your application\nARG QUARKUS_EXTENSIONS\n# Args to pass to the Quarkus CLI - add extension command\nARG QUARKUS_ADD_EXTENSION_ARGS\n\n# Copy from build context - to skeleton resources project\nCOPY --chmod=644 * ./resources/\n\nRUN /home/kogito/launch/build-app.sh + Dockerfile: "FROM quay.io/kiegroup/kogito-swf-builder:1.44 AS builder\n\n# variables + that can be overridden by the builder\n# To add a Quarkus extension to your application\nARG + QUARKUS_EXTENSIONS\n# Args to pass to the Quarkus CLI add extension command\nARG + QUARKUS_ADD_EXTENSION_ARGS\n\n# Copy from build context to skeleton resources + project\nCOPY --chmod=644 * ./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 @@ -3592,7 +3592,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: quay.io/kiegroup/kogito-serverless-operator-nightly:1.44 + image: quay.io/kiegroup/kogito-serverless-operator:1.44 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 cffbee7f3..0588eaf12 100644 --- a/test/testdata/sonataflow.org_v1alpha08_sonataflowplatform_withCache_minikube.yaml +++ b/test/testdata/sonataflow.org_v1alpha08_sonataflowplatform_withCache_minikube.yaml @@ -19,6 +19,6 @@ metadata: spec: build: config: - baseImage: quay.io/kiegroup/kogito-swf-builder-nightly:1.44 + baseImage: quay.io/kiegroup/kogito-swf-builder:1.44 strategyOptions: KanikoBuildCacheEnabled: "true" diff --git a/version/version.go b/version/version.go index 3bc102ceb..861184cd5 100644 --- a/version/version.go +++ b/version/version.go @@ -20,7 +20,7 @@ import ( const ( // Current version - OperatorVersion = "1.44.0-snapshot" + OperatorVersion = "1.44.1" // Should not be changed snapshotSuffix = "snapshot"