Skip to content

Commit

Permalink
Bump operator version to 4.11.0
Browse files Browse the repository at this point in the history
Signed-off-by: YuChen <[email protected]>
  • Loading branch information
YCShen1010 committed Dec 5, 2024
1 parent 663f903 commit 61774ed
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 24 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ OPERATOR_IMAGE_NAME ?= common-service-operator
# Current Operator bundle image name
BUNDLE_IMAGE_NAME ?= common-service-operator-bundle

CHANNELS := v4.10
DEFAULT_CHANNEL := v4.10
CHANNELS := v4.11
DEFAULT_CHANNEL := v4.11

# Options for 'bundle-build'
ifneq ($(origin CHANNELS), undefined)
Expand Down Expand Up @@ -237,7 +237,7 @@ bundle-manifests: clis

generate-all: yq kustomize operator-sdk generate manifests cloudpak-theme-version ## Generate bundle manifests, metadata and package manifests
$(OPERATOR_SDK) generate kustomize manifests -q
- make bundle-manifests CHANNELS=v4.10 DEFAULT_CHANNEL=v4.10
- make bundle-manifests CHANNELS=v4.11 DEFAULT_CHANNEL=v4.11

##@ Test

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Red Hat OpenShift Container Platform 4.3 or newer installed on one of the follow

## Operator versions

- 4.10.0
- 4.11.0

## Prerequisites

Expand Down
4 changes: 2 additions & 2 deletions bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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=ibm-common-service-operator
LABEL operators.operatorframework.io.bundle.channels.v1=v4.10
LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.10
LABEL operators.operatorframework.io.bundle.channels.v1=v4.11
LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.11
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ metadata:
description: The IBM Cloud Pak foundational services operator is used to deploy IBM foundational services.
nss.operator.ibm.com/managed-operators: ibm-common-service-operator
nss.operator.ibm.com/managed-webhooks: ""
olm.skipRange: ">=3.3.0 <4.10.0"
operatorChannel: v4.10
operatorVersion: 4.10.0
olm.skipRange: ">=3.3.0 <4.11.0"
operatorChannel: v4.11
operatorVersion: 4.11.0
operators.openshift.io/infrastructure-features: '["disconnected"]'
operators.operatorframework.io/builder: operator-sdk-v1.31.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
Expand All @@ -40,7 +40,7 @@ metadata:
operatorframework.io/arch.ppc64le: supported
operatorframework.io/arch.s390x: supported
operatorframework.io/os.linux: supported
name: ibm-common-service-operator.v4.10.0
name: ibm-common-service-operator.v4.11.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -200,7 +200,7 @@ spec:
## Operator versions
- 4.10.0
- 4.11.0
## Prerequisites
Expand Down Expand Up @@ -637,7 +637,7 @@ spec:
minKubeVersion: 1.19.0
provider:
name: IBM
version: 4.10.0
version: 4.11.0
webhookdefinitions:
- admissionReviewVersions:
- v1
Expand Down Expand Up @@ -680,5 +680,5 @@ spec:
type: ValidatingAdmissionWebhook
webhookPath: /validate-operator-ibm-com-v3-commonservice
relatedImages:
- image: icr.io/cpopen/common-service-operator:4.10.0
- image: icr.io/cpopen/common-service-operator:4.11.0
name: COMMON_SERVICE_OPERATOR_IMAGE
4 changes: 2 additions & 2 deletions bundle/metadata/annotations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ibm-common-service-operator
operators.operatorframework.io.bundle.channels.v1: v4.10
operators.operatorframework.io.bundle.channel.default.v1: v4.10
operators.operatorframework.io.bundle.channels.v1: v4.11
operators.operatorframework.io.bundle.channel.default.v1: v4.11
operators.operatorframework.io.metrics.builder: operator-sdk-v1.31.0
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
Expand Down
2 changes: 1 addition & 1 deletion common/scripts/multiarch_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ALL_PLATFORMS="amd64 ppc64le s390x"
IMAGE_REPO=${1}
IMAGE_NAME=${2}
VERSION=${3-"$(git describe --exact-match 2> /dev/null || git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)"}
RELEASE_VERSION=${4:-4.10.0}
RELEASE_VERSION=${4:-4.11.0}
MAX_PULLING_RETRY=${MAX_PULLING_RETRY-10}
RETRY_INTERVAL=${RETRY_INTERVAL-10}
# support other container tools, e.g. podman
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ metadata:
nss.operator.ibm.com/managed-operators: ibm-common-service-operator
nss.operator.ibm.com/managed-webhooks: ""
olm.skipRange: ""
operatorChannel: v4.10
operatorVersion: 4.10.0
operatorChannel: v4.11
operatorVersion: 4.11.0
operators.openshift.io/infrastructure-features: '["disconnected"]'
operators.operatorframework.io/builder: operator-sdk-v1.2.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
Expand Down Expand Up @@ -188,7 +188,7 @@ spec:
## Operator versions
- 4.10.0
- 4.11.0
## Prerequisites
Expand Down Expand Up @@ -260,6 +260,6 @@ spec:
provider:
name: IBM
relatedImages:
- image: icr.io/cpopen/common-service-operator:4.10.0
- image: icr.io/cpopen/common-service-operator:4.11.0
name: COMMON_SERVICE_OPERATOR_IMAGE
version: 0.0.0
2 changes: 1 addition & 1 deletion hack/keycloak-themes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ theme/cloudpak/login/resources/css/styles470.css
theme/cloudpak/login/theme.properies styles=css/styles470.css
NOTE: this would likely apply to any of the files - images, fonts, etc. If updated, they must be renamed.

### Style version for release 4.10.0
### Style version for release 4.11.0
theme/cloudpak/login/resources/css/styles4100.css
theme/cloudpak/login/theme.properies styles=css/styles4100.css

Expand Down
4 changes: 2 additions & 2 deletions testdata/deploy/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ spec:
name: ibm-common-service-operator
annotations:
description: The IBM Common Service Operator is used to deploy IBM Common Services
operatorChannel: v4.10
operatorVersion: 4.10.0
operatorChannel: v4.11
operatorVersion: 4.11.0
cloudPakThemesVersion: styles4100.css
spec:
affinity:
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
package version

var (
Version = "4.10.0"
Version = "4.11.0"
)

0 comments on commit 61774ed

Please sign in to comment.