Skip to content

Commit

Permalink
Update operator version to 1.4.0 and channel to v1.4 (#673)
Browse files Browse the repository at this point in the history
Signed-off-by: Leo Christy Jesuraj <leojc@ca.ibm.com>
  • Loading branch information
leochr authored Aug 29, 2024
1 parent 3fe139e commit bdb963e
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
ARG USER_ID=65532
ARG GROUP_ID=65532

ARG VERSION_LABEL=1.3.3
ARG VERSION_LABEL=1.4.0
ARG RELEASE_LABEL=XX
ARG VCS_REF=0123456789012345678901234567890123456789
ARG VCS_URL="https://github.com/WASdev/websphere-liberty-operator"
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.3
VERSION ?= 1.4.0
OPERATOR_SDK_RELEASE_VERSION ?= v1.35.0

# 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.3
CHANNELS ?= v1.4
ifneq ($(origin CHANNELS), undefined)
BUNDLE_CHANNELS := --channels=$(CHANNELS)
endif
Expand All @@ -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.3
DEFAULT_CHANNEL ?= v1.4
ifneq ($(origin DEFAULT_CHANNEL), undefined)
BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL)
endif
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-websphere-liberty
LABEL operators.operatorframework.io.bundle.channels.v1=v1.3
LABEL operators.operatorframework.io.bundle.channel.default.v1=v1.3
LABEL operators.operatorframework.io.bundle.channels.v1=v1.4
LABEL operators.operatorframework.io.bundle.channel.default.v1=v1.4
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.35.0
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ metadata:
capabilities: Auto Pilot
categories: Application Runtime
containerImage: icr.io/cpopen/websphere-liberty-operator:daily
createdAt: "2024-08-28T20:45:12Z"
createdAt: "2024-08-28T22:07:39Z"
description: Deploy and manage containerized Liberty applications
olm.skipRange: '>=1.0.0 <1.3.3'
olm.skipRange: '>=1.0.0 <1.4.0'
operators.openshift.io/infrastructure-features: '["disconnected"]'
operators.operatorframework.io/builder: operator-sdk-v1.35.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
Expand All @@ -74,7 +74,7 @@ metadata:
operatorframework.io/arch.ppc64le: supported
operatorframework.io/arch.s390x: supported
operatorframework.io/os.linux: supported
name: ibm-websphere-liberty.v1.3.3
name: ibm-websphere-liberty.v1.4.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -1223,4 +1223,4 @@ spec:
name: liberty-sample-app
- image: icr.io/cpopen/websphere-liberty-operator:daily
name: websphere-liberty-operator
version: 1.3.3
version: 1.4.0
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-websphere-liberty
operators.operatorframework.io.bundle.channels.v1: v1.3
operators.operatorframework.io.bundle.channel.default.v1: v1.3
operators.operatorframework.io.bundle.channels.v1: v1.4
operators.operatorframework.io.bundle.channel.default.v1: v1.4
operators.operatorframework.io.metrics.builder: operator-sdk-v1.35.0
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4
Expand Down
2 changes: 1 addition & 1 deletion catalog.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM registry.redhat.io/openshift4/ose-operator-registry:v4.14 AS builder
FROM registry.redhat.io/ubi8/ubi-minimal

# Add label for location of Declarative Config root directory & required OpenShift labels
ARG VERSION_LABEL=1.3.3
ARG VERSION_LABEL=1.4.0
ARG RELEASE_LABEL=XX
ARG VCS_REF=0123456789012345678901234567890123456789
ARG VCS_URL="https://github.com/WASdev/websphere-liberty-operator"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
categories: Application Runtime
createdAt: "2021-11-25T14:00:00Z"
description: Deploy and manage containerized Liberty applications
olm.skipRange: '>=1.0.0 <1.3.3'
olm.skipRange: '>=1.0.0 <1.4.0'
operators.openshift.io/infrastructure-features: '["disconnected"]'
repository: https://github.com/WASdev/websphere-liberty-operator
support: IBM
Expand Down
2 changes: 1 addition & 1 deletion utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ var log = logf.Log.WithName("websphereliberty_utils")
// Constant Values
const serviceabilityMountPath = "/serviceability"
const ssoEnvVarPrefix = "SEC_SSO_"
const OperandVersion = "1.3.3"
const OperandVersion = "1.4.0"
const ltpaKeysMountPath = "/config/managedLTPA"
const ltpaServerXMLOverridesMountPath = "/config/configDropins/overrides/"
const LTPAServerXMLSuffix = "-managed-ltpa-server-xml"
Expand Down

0 comments on commit bdb963e

Please sign in to comment.