Merge branch 'main' into operator-sdk-139

Author: halim-lee

Dockerfile

@@ -39,7 +39,7 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
 ARG USER_ID=65532
 ARG GROUP_ID=65532
 
-ARG VERSION_LABEL=1.4.4
+ARG VERSION_LABEL=1.5.0
 ARG RELEASE_LABEL=XX
 ARG VCS_REF=0123456789012345678901234567890123456789
 ARG VCS_URL="https://github.com/application-stacks/runtime-component-operator"

Makefile

@@ -3,15 +3,15 @@
 # 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.4.4
+VERSION ?= 1.5.0
 OPERATOR_SDK_RELEASE_VERSION ?= v1.39.2
 
 # 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 = "preview,fast,stable")
 # To re-generate a bundle for other specific channels without changing the standard setup, you can:
 # - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=preview,fast,stable)
 # - use environment variables to overwrite this value (e.g export CHANNELS="preview,fast,stable")
-CHANNELS ?= v1.4
+CHANNELS ?= v1.5
 ifneq ($(origin CHANNELS), undefined)
 BUNDLE_CHANNELS := --channels=$(CHANNELS)
 endif
@@ -21,7 +21,7 @@ endif
 # To re-generate a bundle for any other default channel without changing the default setup, you can:
 # - use the DEFAULT_CHANNEL as arg of the bundle target (e.g make bundle DEFAULT_CHANNEL=stable)
 # - use environment variables to overwrite this value (e.g export DEFAULT_CHANNEL="stable")
-DEFAULT_CHANNEL ?= v1.4
+DEFAULT_CHANNEL ?= v1.5
 ifneq ($(origin DEFAULT_CHANNEL), undefined)
 BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL)
 endif

bundle.Dockerfile

@@ -5,8 +5,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=runtime-component
-LABEL operators.operatorframework.io.bundle.channels.v1=v1.4
-LABEL operators.operatorframework.io.bundle.channel.default.v1=v1.4
+LABEL operators.operatorframework.io.bundle.channels.v1=v1.5
+LABEL operators.operatorframework.io.bundle.channel.default.v1=v1.5
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.39.2
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4

bundle/manifests/runtime-component.clusterserviceversion.yaml

@@ -80,7 +80,7 @@ metadata:
     features.operators.openshift.io/token-auth-aws: "false"
     features.operators.openshift.io/token-auth-azure: "false"
     features.operators.openshift.io/token-auth-gcp: "false"
-    olm.skipRange: '>=0.8.0 <1.4.4'
+    olm.skipRange: '>=0.8.0 <1.5.0'
     operators.operatorframework.io/builder: operator-sdk-v1.39.2
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
     repository: https://github.com/application-stacks/runtime-component-operator
@@ -90,7 +90,7 @@ metadata:
     operatorframework.io/arch.ppc64le: supported
     operatorframework.io/arch.s390x: supported
     operatorframework.io/os.linux: supported
-  name: runtime-component.v1.4.4
+  name: runtime-component.v1.5.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -1337,4 +1337,4 @@ spec:
     name: liberty-sample-app
   - image: icr.io/appcafe/runtime-component-operator:daily
     name: runtime-component-operator
-  version: 1.4.4
+  version: 1.5.0

bundle/metadata/annotations.yaml

@@ -4,8 +4,8 @@ annotations:
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: runtime-component
-  operators.operatorframework.io.bundle.channels.v1: v1.4
-  operators.operatorframework.io.bundle.channel.default.v1: v1.4
+  operators.operatorframework.io.bundle.channels.v1: v1.5
+  operators.operatorframework.io.bundle.channel.default.v1: v1.5
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.39.2
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4

catalog.Dockerfile

@@ -2,7 +2,7 @@ FROM registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.18 AS builder
 FROM registry.redhat.io/ubi9/ubi-minimal
 
 # Add label for location of Declarative Config root directory & required OpenShift labels
-ARG VERSION_LABEL=1.4.4
+ARG VERSION_LABEL=1.5.0
 ARG RELEASE_LABEL=XX
 ARG VCS_REF=0123456789012345678901234567890123456789
 ARG VCS_URL="https://github.com/application-stacks/runtime-component-operator"

config/manifests/bases/runtime-component.clusterserviceversion.yaml

@@ -16,7 +16,7 @@ metadata:
     features.operators.openshift.io/token-auth-aws: "false"
     features.operators.openshift.io/token-auth-azure: "false"
     features.operators.openshift.io/token-auth-gcp: "false"
-    olm.skipRange: '>=0.8.0 <1.4.4'
+    olm.skipRange: '>=0.8.0 <1.5.0'
     repository: https://github.com/application-stacks/runtime-component-operator
     support: Community
   labels:

utils/utils.go

@@ -41,7 +41,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
-const RCOOperandVersion = "1.4.4"
+const RCOOperandVersion = "1.5.0"
 
 var APIVersionNotFoundError = errors.New("APIVersion is not available")