Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upate WLO version to 1.4.2 + update sample app #728

Merged
merged 2 commits into from
Mar 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.4.1
ARG VERSION_LABEL=1.4.2
ARG RELEASE_LABEL=XX
ARG VCS_REF=0123456789012345678901234567890123456789
ARG VCS_URL="https://github.com/WASdev/websphere-liberty-operator"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.1
VERSION ?= 1.4.2
OPERATOR_SDK_RELEASE_VERSION ?= v1.37.0

# CHANNELS define the bundle channels used in the bundle.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
"name": "websphereliberty-app-sample"
},
"spec": {
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:1ac4699f934128ed62da43b3720120d469e930458355152e547a574bb7b70c07",
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:724994d67734dde70f478e6d92167f383374edb45defed3f6cf62b056d8c5cea",
"expose": true,
"license": {
"accept": false,
Expand Down Expand Up @@ -64,7 +64,7 @@ metadata:
createdAt: "2025-03-04T02:44:14Z"
description: Deploy and manage containerized Liberty applications
features.operators.openshift.io/disconnected: "true"
olm.skipRange: '>=1.0.0 <1.4.1'
olm.skipRange: '>=1.0.0 <1.4.2'
operators.openshift.io/infrastructure-features: '["disconnected"]'
operators.operatorframework.io/builder: operator-sdk-v1.37.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
Expand All @@ -75,7 +75,7 @@ metadata:
operatorframework.io/arch.ppc64le: supported
operatorframework.io/arch.s390x: supported
operatorframework.io/os.linux: supported
name: ibm-websphere-liberty.v1.4.1
name: ibm-websphere-liberty.v1.4.2
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -927,7 +927,7 @@ spec:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
- name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:1ac4699f934128ed62da43b3720120d469e930458355152e547a574bb7b70c07
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:724994d67734dde70f478e6d92167f383374edb45defed3f6cf62b056d8c5cea
- name: RELATED_IMAGE_WEBSPHERE_LIBERTY_OPERATOR
value: icr.io/cpopen/websphere-liberty-operator:daily
image: icr.io/cpopen/websphere-liberty-operator:daily
Expand Down Expand Up @@ -1229,8 +1229,8 @@ spec:
provider:
name: IBM
relatedImages:
- image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:1ac4699f934128ed62da43b3720120d469e930458355152e547a574bb7b70c07
- image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:724994d67734dde70f478e6d92167f383374edb45defed3f6cf62b056d8c5cea
name: liberty-sample-app
- image: icr.io/cpopen/websphere-liberty-operator:daily
name: websphere-liberty-operator
version: 1.4.1
version: 1.4.2
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.4.1
ARG VERSION_LABEL=1.4.2
ARG RELEASE_LABEL=XX
ARG VCS_REF=0123456789012345678901234567890123456789
ARG VCS_URL="https://github.com/WASdev/websphere-liberty-operator"
Expand Down
2 changes: 1 addition & 1 deletion config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ spec:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
- name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:1ac4699f934128ed62da43b3720120d469e930458355152e547a574bb7b70c07
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:724994d67734dde70f478e6d92167f383374edb45defed3f6cf62b056d8c5cea
- name: RELATED_IMAGE_WEBSPHERE_LIBERTY_OPERATOR
value: OPERATOR_IMAGE
securityContext:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
createdAt: "2021-11-25T14:00:00Z"
description: Deploy and manage containerized Liberty applications
features.operators.openshift.io/disconnected: "true"
olm.skipRange: '>=1.0.0 <1.4.1'
olm.skipRange: '>=1.0.0 <1.4.2'
operators.openshift.io/infrastructure-features: '["disconnected"]'
repository: https://github.com/WASdev/websphere-liberty-operator
support: IBM
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
accept: false
edition: IBM WebSphere Application Server
productEntitlementSource: Standalone
applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:1ac4699f934128ed62da43b3720120d469e930458355152e547a574bb7b70c07
applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:724994d67734dde70f478e6d92167f383374edb45defed3f6cf62b056d8c5cea
expose: true
manageTLS: true
replicas: 1
Expand Down
2 changes: 1 addition & 1 deletion internal/deploy/kubectl/websphereliberty-app-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ spec:
- name: WATCH_NAMESPACE
value: WEBSPHERE_LIBERTY_WATCH_NAMESPACE
- name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:1ac4699f934128ed62da43b3720120d469e930458355152e547a574bb7b70c07
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:724994d67734dde70f478e6d92167f383374edb45defed3f6cf62b056d8c5cea
- name: RELATED_IMAGE_WEBSPHERE_LIBERTY_OPERATOR
value: icr.io/cpopen/websphere-liberty-operator:daily
image: icr.io/cpopen/websphere-liberty-operator:daily
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:1ac4699f934128ed62da43b3720120d469e930458355152e547a574bb7b70c07
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:724994d67734dde70f478e6d92167f383374edb45defed3f6cf62b056d8c5cea
- name: RELATED_IMAGE_WEBSPHERE_LIBERTY_OPERATOR
value: cp.stg.icr.io/cp/websphere-liberty-operator:main
image: cp.stg.icr.io/cp/websphere-liberty-operator:main
Expand Down
2 changes: 1 addition & 1 deletion utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ var log = logf.Log.WithName("websphereliberty_utils")
// Constant Values
const serviceabilityMountPath = "/serviceability"
const ssoEnvVarPrefix = "SEC_SSO_"
const OperandVersion = "1.4.1"
const OperandVersion = "1.4.2"

// LTPA constants
const managedLTPAMountPath = "/config/managedLTPA"
Expand Down