From 47e5c6796cfba2b5c8616f1cac9175834e508e89 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Mon, 21 Aug 2023 10:12:18 -0400 Subject: [PATCH] [1.43.x] Update project version to 1.43.0 --- Makefile | 4 ++-- buildkitd.toml | 7 +++++++ ...ow-operator-builder-config_v1_configmap.yaml | 15 +++++++-------- ...nataflow-operator.clusterserviceversion.yaml | 8 ++++---- config/manager/kustomization.yaml | 2 +- .../manager/sonataflow_builder_dockerfile.yaml | 2 +- ...nataflow-operator.clusterserviceversion.yaml | 2 +- .../api/PlatformBuild_usingKanikowithCache.yaml | 2 +- image.yaml | 2 +- operator.yaml | 17 ++++++++--------- ...8_sonataflowplatform_withCache_minikube.yaml | 2 +- version/version.go | 2 +- 12 files changed, 35 insertions(+), 30 deletions(-) create mode 100644 buildkitd.toml diff --git a/Makefile b/Makefile index e018763a7..9f2486c54 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.43.0-snapshot +VERSION ?= 1.43.0 REDUCED_VERSION ?= 1.43 # 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 1bbf67be9..f10cd54b3 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 @@ 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 diff --git a/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml b/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml index 33a99a124..79ed70dc1 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.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: {} @@ -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 @@ -540,4 +540,4 @@ spec: minKubeVersion: 1.23.0 provider: name: Red Hat - version: 1.43.0-snapshot + version: 1.43.0 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index ffcf100ea..18053949f 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.43" # 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 3182f5931..b6be2e95d 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.43 AS builder +FROM quay.io/kiegroup/kogito-swf-builder:1.43 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 79fbc15a7..50b9ceebd 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.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 diff --git a/container-builder/examples/api/PlatformBuild_usingKanikowithCache.yaml b/container-builder/examples/api/PlatformBuild_usingKanikowithCache.yaml index 9bd6207b4..06e37c009 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.43 + baseImage: quay.io/kiegroup/kogito-swf-builder:1.43 registry: address: quay.io/kiegroup secret: regcred diff --git a/image.yaml b/image.yaml index f7a9e2b2d..744c80512 100644 --- a/image.yaml +++ b/image.yaml @@ -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 diff --git a/operator.yaml b/operator.yaml index f14265125..dfe3a12cb 100644 --- a/operator.yaml +++ b/operator.yaml @@ -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 @@ -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 diff --git a/test/testdata/sonataflow.org_v1alpha08_sonataflowplatform_withCache_minikube.yaml b/test/testdata/sonataflow.org_v1alpha08_sonataflowplatform_withCache_minikube.yaml index b661e9dc6..509ff1855 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.43 + baseImage: quay.io/kiegroup/kogito-swf-builder:1.43 strategyOptions: KanikoBuildCacheEnabled: "true" diff --git a/version/version.go b/version/version.go index eca4bc3e9..957ca9463 100644 --- a/version/version.go +++ b/version/version.go @@ -20,7 +20,7 @@ import ( const ( // Current version - OperatorVersion = "1.43.0-snapshot" + OperatorVersion = "1.43.0" // Should not be changed snapshotSuffix = "snapshot"