diff --git a/Dockerfile b/Dockerfile index 646f9040..d6643e73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest ARG USER_ID=65532 ARG GROUP_ID=65532 -ARG VERSION_LABEL=1.2.0 +ARG VERSION_LABEL=1.2.1 ARG RELEASE_LABEL=XX ARG VCS_REF=0123456789012345678901234567890123456789 ARG VCS_URL="https://github.com/application-stacks/runtime-component-operator" diff --git a/Makefile b/Makefile index dd094459..83937128 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.2.0 +VERSION ?= 1.2.1 OPERATOR_SDK_RELEASE_VERSION ?= v1.24.0 # CHANNELS define the bundle channels used in the bundle. diff --git a/bundle/manifests/runtime-component.clusterserviceversion.yaml b/bundle/manifests/runtime-component.clusterserviceversion.yaml index a2d5dba0..eaeaaf23 100644 --- a/bundle/manifests/runtime-component.clusterserviceversion.yaml +++ b/bundle/manifests/runtime-component.clusterserviceversion.yaml @@ -11,7 +11,7 @@ metadata: "name": "runtimecomponent-sample" }, "spec": { - "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:e22dd56a05e44618a10d275d3ff07a38eb364c0f04f86ffe9618d83dd5467860", + "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:b0d658e07e656a8cb3b02bf7194f788f4456c7ffe9d3361f96ac2807045dad80", "expose": true, "manageTLS": true, "replicas": 1, @@ -41,7 +41,7 @@ metadata: "name": "runtimecomponent-sample" }, "spec": { - "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:e22dd56a05e44618a10d275d3ff07a38eb364c0f04f86ffe9618d83dd5467860", + "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:b0d658e07e656a8cb3b02bf7194f788f4456c7ffe9d3361f96ac2807045dad80", "expose": true, "replicas": 1, "service": { @@ -68,9 +68,9 @@ metadata: categories: Application Runtime certified: "true" containerImage: icr.io/appcafe/runtime-component-operator:daily - createdAt: "2023-05-01T09:45:40Z" + createdAt: "2023-06-15T17:18:00Z" description: Deploys any runtime component with dynamic and auto-tuning configuration - olm.skipRange: '>=0.8.0 <1.2.0' + olm.skipRange: '>=0.8.0 <1.2.1' operators.openshift.io/infrastructure-features: '["disconnected"]' operators.operatorframework.io/builder: operator-sdk-v1.24.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 @@ -81,7 +81,7 @@ metadata: operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported operatorframework.io/os.linux: supported - name: runtime-component.v1.2.0 + name: runtime-component.v1.2.1 namespace: placeholder spec: apiservicedefinitions: {} @@ -976,7 +976,7 @@ spec: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP - value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:e22dd56a05e44618a10d275d3ff07a38eb364c0f04f86ffe9618d83dd5467860 + value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:b0d658e07e656a8cb3b02bf7194f788f4456c7ffe9d3361f96ac2807045dad80 image: icr.io/appcafe/runtime-component-operator:daily livenessProbe: failureThreshold: 3 @@ -1257,6 +1257,6 @@ spec: provider: name: Community relatedImages: - - image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:e22dd56a05e44618a10d275d3ff07a38eb364c0f04f86ffe9618d83dd5467860 + - image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:b0d658e07e656a8cb3b02bf7194f788f4456c7ffe9d3361f96ac2807045dad80 name: liberty-sample-app - version: 1.2.0 + version: 1.2.1 diff --git a/bundle/tests/scorecard/kuttl/basic/00-assert.yaml b/bundle/tests/scorecard/kuttl/basic/00-assert.yaml index 0dd9c724..27f7c569 100644 --- a/bundle/tests/scorecard/kuttl/basic/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/basic/00-assert.yaml @@ -13,4 +13,4 @@ metadata: name: example-runtime-component status: versions: - reconciled: 1.2.0 + reconciled: 1.2.1 diff --git a/bundle/tests/scorecard/kuttl/day2operation/01-assert.yaml b/bundle/tests/scorecard/kuttl/day2operation/01-assert.yaml index 6af6199f..14fefef6 100644 --- a/bundle/tests/scorecard/kuttl/day2operation/01-assert.yaml +++ b/bundle/tests/scorecard/kuttl/day2operation/01-assert.yaml @@ -12,4 +12,4 @@ status: - status: 'True' type: Completed versions: - reconciled: 1.2.0 + reconciled: 1.2.1 diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 0f9c38e6..3a0c829a 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -67,7 +67,7 @@ spec: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP - value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:e22dd56a05e44618a10d275d3ff07a38eb364c0f04f86ffe9618d83dd5467860 + value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:b0d658e07e656a8cb3b02bf7194f788f4456c7ffe9d3361f96ac2807045dad80 securityContext: allowPrivilegeEscalation: false privileged: false diff --git a/config/manifests/bases/runtime-component.clusterserviceversion.yaml b/config/manifests/bases/runtime-component.clusterserviceversion.yaml index 96c64a34..f71de84c 100644 --- a/config/manifests/bases/runtime-component.clusterserviceversion.yaml +++ b/config/manifests/bases/runtime-component.clusterserviceversion.yaml @@ -9,7 +9,7 @@ metadata: containerImage: icr.io/appcafe/runtime-component-operator:daily createdAt: "2022-02-25T09:00:00Z" description: Deploys any runtime component with dynamic and auto-tuning configuration - olm.skipRange: '>=0.8.0 <1.2.0' + olm.skipRange: '>=0.8.0 <1.2.1' operators.openshift.io/infrastructure-features: '["disconnected"]' repository: https://github.com/application-stacks/runtime-component-operator support: Community diff --git a/config/samples/rc.app.stacks_v1_runtimecomponent.yaml b/config/samples/rc.app.stacks_v1_runtimecomponent.yaml index 13099b68..22fd504e 100644 --- a/config/samples/rc.app.stacks_v1_runtimecomponent.yaml +++ b/config/samples/rc.app.stacks_v1_runtimecomponent.yaml @@ -3,7 +3,7 @@ kind: RuntimeComponent metadata: name: runtimecomponent-sample spec: - applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:e22dd56a05e44618a10d275d3ff07a38eb364c0f04f86ffe9618d83dd5467860 + applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:b0d658e07e656a8cb3b02bf7194f788f4456c7ffe9d3361f96ac2807045dad80 expose: true manageTLS: true replicas: 1 diff --git a/config/samples/rc.app.stacks_v1beta2_runtimecomponent.yaml b/config/samples/rc.app.stacks_v1beta2_runtimecomponent.yaml index 1f98771d..4be6d8a6 100644 --- a/config/samples/rc.app.stacks_v1beta2_runtimecomponent.yaml +++ b/config/samples/rc.app.stacks_v1beta2_runtimecomponent.yaml @@ -4,7 +4,7 @@ metadata: name: runtimecomponent-sample spec: # Add fields here - applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:e22dd56a05e44618a10d275d3ff07a38eb364c0f04f86ffe9618d83dd5467860 + applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:b0d658e07e656a8cb3b02bf7194f788f4456c7ffe9d3361f96ac2807045dad80 expose: true replicas: 1 service: diff --git a/ebcDockerBuilderRCO.jenkinsfile b/ebcDockerBuilderRCO.jenkinsfile index 9551ded2..425bbe0d 100644 --- a/ebcDockerBuilderRCO.jenkinsfile +++ b/ebcDockerBuilderRCO.jenkinsfile @@ -11,7 +11,7 @@ properties([ string(name: 'command', defaultValue: "make build-operator-pipeline REGISTRY=cp.stg.icr.io", description: 'Build command to execute on target arch machine, e.g. make build-pipeline-releases'), string(name: 'PIPELINE_OPERATOR_IMAGE', defaultValue: "cp/runtime-component-operator", description: 'namespace to push image to in registry'), string(name: 'RELEASE_TARGET', defaultValue: "main", description: 'release branch to use'), - string(name: 'OPM_VERSION', defaultValue: "4.10", description: 'Redhat CLI OPM version'), + string(name: 'OPM_VERSION', defaultValue: "4.12", description: 'Redhat CLI OPM version'), string(name: 'PIPELINE_PRODUCTION_IMAGE', defaultValue: "icr.io/cpopen/runtime-component-operator", description: 'namespace in prod registry'), string(name: 'REDHAT_BASE_IMAGE', defaultValue: "registry.redhat.io/openshift4/ose-operator-registry", description: 'base image for operator'), string(name: 'REDHAT_REGISTRY', defaultValue: "registry.redhat.io", description: 'RH registry used for docker login'), diff --git a/index.Dockerfile b/index.Dockerfile index 2bafb382..b9a9ed8e 100644 --- a/index.Dockerfile +++ b/index.Dockerfile @@ -1,8 +1,8 @@ -FROM registry.redhat.io/openshift4/ose-operator-registry:v4.10 AS builder +FROM registry.redhat.io/openshift4/ose-operator-registry:v4.12 AS builder FROM registry.redhat.io/ubi8/ubi-minimal -ARG VERSION_LABEL=1.2.0 +ARG VERSION_LABEL=1.2.1 ARG RELEASE_LABEL=XX ARG VCS_REF=0123456789012345678901234567890123456789 ARG VCS_URL="https://github.com/application-stacks/runtime-component-operator" diff --git a/internal/deploy/kubectl/runtime-component-operator.yaml b/internal/deploy/kubectl/runtime-component-operator.yaml index 7d81c200..a82789ca 100644 --- a/internal/deploy/kubectl/runtime-component-operator.yaml +++ b/internal/deploy/kubectl/runtime-component-operator.yaml @@ -303,7 +303,7 @@ spec: - name: WATCH_NAMESPACE value: RUNTIME_COMPONENT_WATCH_NAMESPACE - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP - value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:e22dd56a05e44618a10d275d3ff07a38eb364c0f04f86ffe9618d83dd5467860 + value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:b0d658e07e656a8cb3b02bf7194f788f4456c7ffe9d3361f96ac2807045dad80 image: icr.io/appcafe/runtime-component-operator:daily livenessProbe: failureThreshold: 3 diff --git a/internal/deploy/kustomize/daily/base/runtime-component-operator.yaml b/internal/deploy/kustomize/daily/base/runtime-component-operator.yaml index 45104874..a5d1784a 100644 --- a/internal/deploy/kustomize/daily/base/runtime-component-operator.yaml +++ b/internal/deploy/kustomize/daily/base/runtime-component-operator.yaml @@ -50,7 +50,7 @@ spec: fieldRef: fieldPath: metadata.namespace - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP - value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:e22dd56a05e44618a10d275d3ff07a38eb364c0f04f86ffe9618d83dd5467860 + value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:b0d658e07e656a8cb3b02bf7194f788f4456c7ffe9d3361f96ac2807045dad80 image: icr.io/appcafe/runtime-component-operator:daily livenessProbe: failureThreshold: 3 diff --git a/scripts/installers/install-opm.sh b/scripts/installers/install-opm.sh index 4f450e58..7df53567 100755 --- a/scripts/installers/install-opm.sh +++ b/scripts/installers/install-opm.sh @@ -9,7 +9,7 @@ main() { exit 0 fi - readonly DEFAULT_RELEASE_VERSION=latest-4.10 + readonly DEFAULT_RELEASE_VERSION=latest-4.12 readonly RELEASE_VERSION=${1:-$DEFAULT_RELEASE_VERSION} readonly base_url="https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/${RELEASE_VERSION}" diff --git a/utils/utils.go b/utils/utils.go index 76e88f26..da4ce305 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -42,7 +42,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" ) -const RCOOperandVersion = "1.2.0" +const RCOOperandVersion = "1.2.1" var APIVersionNotFoundError = errors.New("APIVersion is not available")