Skip to content

Commit 7431df5

Browse files
authored
Update version to 1.2.0 and misc fixes (#434)
* Update WLO version to 1.2.0 Signed-off-by: Leo Christy Jesuraj <[email protected]> * update oc client and opm to latest-4.10 Signed-off-by: Leo Christy Jesuraj <[email protected]> * update RCO to commit 63075c49bea6 Signed-off-by: Leo Christy Jesuraj <[email protected]> * update operator readme Signed-off-by: Leo Christy Jesuraj <[email protected]> * share cached ROM classes between Semeru clients Signed-off-by: Leo Christy Jesuraj <[email protected]> * resolve dependabot issues Signed-off-by: Leo Christy Jesuraj <[email protected]> --------- Signed-off-by: Leo Christy Jesuraj <[email protected]>
1 parent 58cbfa6 commit 7431df5

23 files changed

+47
-42
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
2525
ARG USER_ID=65532
2626
ARG GROUP_ID=65532
2727

28-
ARG VERSION_LABEL=1.1.0
28+
ARG VERSION_LABEL=1.2.0
2929
ARG RELEASE_LABEL=XX
3030
ARG VCS_REF=0123456789012345678901234567890123456789
3131
ARG VCS_URL="https://github.com/WASdev/websphere-liberty-operator"

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
# To re-generate a bundle for another specific version without changing the standard setup, you can:
44
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
55
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
6-
VERSION ?= 1.1.0
6+
VERSION ?= 1.2.0
77
OPERATOR_SDK_RELEASE_VERSION ?= v1.24.0
88

99
# CHANNELS define the bundle channels used in the bundle.
1010
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")
1111
# To re-generate a bundle for other specific channels without changing the standard setup, you can:
1212
# - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=preview,fast,stable)
1313
# - use environment variables to overwrite this value (e.g export CHANNELS="preview,fast,stable")
14-
CHANNELS ?= v1.1
14+
CHANNELS ?= v1.2
1515
ifneq ($(origin CHANNELS), undefined)
1616
BUNDLE_CHANNELS := --channels=$(CHANNELS)
1717
endif
@@ -21,7 +21,7 @@ endif
2121
# To re-generate a bundle for any other default channel without changing the default setup, you can:
2222
# - use the DEFAULT_CHANNEL as arg of the bundle target (e.g make bundle DEFAULT_CHANNEL=stable)
2323
# - use environment variables to overwrite this value (e.g export DEFAULT_CHANNEL="stable")
24-
DEFAULT_CHANNEL ?= v1.1
24+
DEFAULT_CHANNEL ?= v1.2
2525
ifneq ($(origin DEFAULT_CHANNEL), undefined)
2626
BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL)
2727
endif

bundle.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
55
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
66
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=ibm-websphere-liberty
8-
LABEL operators.operatorframework.io.bundle.channels.v1=v1.1
9-
LABEL operators.operatorframework.io.bundle.channel.default.v1=v1.1
8+
LABEL operators.operatorframework.io.bundle.channels.v1=v1.2
9+
LABEL operators.operatorframework.io.bundle.channel.default.v1=v1.2
1010
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.24.0
1111
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1212
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

bundle/manifests/ibm-websphere-liberty.clusterserviceversion.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
"name": "websphereliberty-app-sample"
1212
},
1313
"spec": {
14-
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:60ca13dd15d5dd583a594436d3568fc69fc7a58081dc40885dc4d2b16a6e4c69",
14+
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:9a6f6352bee814302fcf939dd640b7d3b3e02307330f82bc32b782e7a9feb8a3",
1515
"license": {
1616
"accept": false,
1717
"edition": "IBM WebSphere Application Server",
@@ -57,9 +57,9 @@ metadata:
5757
capabilities: Auto Pilot
5858
categories: Application Runtime
5959
containerImage: icr.io/cpopen/websphere-liberty-operator:daily
60-
createdAt: "2023-03-13T20:36:44Z"
60+
createdAt: "2023-04-05T00:18:05Z"
6161
description: Deploy and manage containerized Liberty applications
62-
olm.skipRange: '>=1.0.0 <1.1.0'
62+
olm.skipRange: '>=1.0.0 <1.2.0'
6363
operators.openshift.io/infrastructure-features: '["disconnected"]'
6464
operators.operatorframework.io/builder: operator-sdk-v1.24.0
6565
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
@@ -70,7 +70,7 @@ metadata:
7070
operatorframework.io/arch.ppc64le: supported
7171
operatorframework.io/arch.s390x: supported
7272
operatorframework.io/os.linux: supported
73-
name: ibm-websphere-liberty.v1.1.0
73+
name: ibm-websphere-liberty.v1.2.0
7474
namespace: placeholder
7575
spec:
7676
apiservicedefinitions: {}
@@ -778,7 +778,7 @@ spec:
778778
779779
## Limitations
780780
781-
IBM WebSphere Liberty Operator is not available on Power or Z architectures. Please see the [limitations](https://ibm.biz/wlo-limits) for additional information.
781+
See the [limitations](https://ibm.biz/wlo-limits) for details.
782782
icon:
783783
- base64data: PHN2ZyBpZD0iV2Vic3BoZXJlTGliZXJ0eSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMzIgMzIiPjxkZWZzPjxsaW5lYXJHcmFkaWVudCBpZD0ia2MxZXdoeGhoYSIgeDE9IjE2IiB5MT0iMjkiIHgyPSIxNiIgeTI9IjMiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiNmZmYiIHN0b3Atb3BhY2l0eT0iMCIvPjxzdG9wIG9mZnNldD0iLjI2IiBzdG9wLWNvbG9yPSIjZmZmIi8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgaWQ9InNsMGYxYWJudGIiIHgxPSIyIiB5MT0iMjIuNSIgeDI9IjMwIiB5Mj0iMjIuNSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPjxzdG9wIG9mZnNldD0iLjM1IiBzdG9wLWNvbG9yPSIjZmZmIi8+PHN0b3Agb2Zmc2V0PSIuNyIvPjwvbGluZWFyR3JhZGllbnQ+PGxpbmVhckdyYWRpZW50IGlkPSJhd3JyY2JjcXJjIiB4MT0iMi40NSIgeTE9IjEyLjgzOSIgeDI9IjE2IiB5Mj0iMTIuODM5IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjZmZmIiBzdG9wLW9wYWNpdHk9IjAiLz48c3RvcCBvZmZzZXQ9Ii44IiBzdG9wLWNvbG9yPSIjZmZmIi8+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgaWQ9IndvcGp4c3V4NGUiIHkxPSIzMiIgeDI9IjMyIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIuMSIgc3RvcC1jb2xvcj0iI2E1NmVmZiIvPjxzdG9wIG9mZnNldD0iLjkiIHN0b3AtY29sb3I9IiMwZjYyZmUiLz48L2xpbmVhckdyYWRpZW50PjxtYXNrIGlkPSI2a3kxMnd4eDlkIiB4PSIwIiB5PSIwIiB3aWR0aD0iMzIiIGhlaWdodD0iMzIiIG1hc2tVbml0cz0idXNlclNwYWNlT25Vc2UiPjxwYXRoIHN0eWxlPSJmaWxsOnVybCgja2MxZXdoeGhoYSkiIGQ9Ik0xNSAzaDJ2MjZoLTJ6Ii8+PHBhdGggZD0iTTE2IDMwQTE0LjAxNSAxNC4wMTUgMCAwIDEgMiAxNmwxLTEgMSAxYTEyIDEyIDAgMCAwIDI0IDBoMmExNC4wMTUgMTQuMDE1IDAgMCAxLTE0IDE0eiIgc3R5bGU9ImZpbGw6dXJsKCNzbDBmMWFibnRiKSIvPjxwYXRoIGQ9Ik0xNiAyMmEyMi43NCAyMi43NCAwIDAgMS0xMy41NS00LjA4OGwxLjIxMi0xLjU5MUEyMC43MTYgMjAuNzE2IDAgMCAwIDE2IDIweiIgc3R5bGU9ImZpbGw6I2ZmZiIvPjxwYXRoIGQ9Ik0zLjY2MiAxNS42NzkgMi40NSAxNC4wODhBMjIuNzM2IDIyLjczNiAwIDAgMSAxNiAxMHYyYTIwLjcxNiAyMC43MTYgMCAwIDAtMTIuMzM4IDMuNjc5eiIgc3R5bGU9ImZpbGw6dXJsKCNhd3JyY2JjcXJjKSIvPjxwYXRoIGQ9Ik00IDE2SDJBMTQuMDA2IDE0LjAwNiAwIDAgMSAyMS44NTUgMy4yOEwyMS4wMiA1LjFBMTIuMDA4IDEyLjAwOCAwIDAgMCA0IDE2eiIgc3R5bGU9ImZpbGw6I2ZmZiIvPjwvbWFzaz48L2RlZnM+PGcgc3R5bGU9Im1hc2s6dXJsKCM2a3kxMnd4eDlkKSI+PHBhdGggc3R5bGU9ImZpbGw6dXJsKCN3b3BqeHN1eDRlKSIgZD0iTTAgMGgzMnYzMkgweiIvPjwvZz48cGF0aCBkPSJNMjcgMTRhMy42MTUgMy42MTUgMCAwIDEgLjgzMi0xLjk0NUE1LjMzNCA1LjMzNCAwIDAgMCAyOSA5aC0yYTMuNjE1IDMuNjE1IDAgMCAxLS44MzIgMS45NDVBNS4zMzQgNS4zMzQgMCAwIDAgMjUgMTR6IiBzdHlsZT0iZmlsbDojMDAxZDZjIi8+PHBhdGggZD0iTTI1IDE5YTUuMDA2IDUuMDA2IDAgMCAwIDUtNWgtMmEzIDMgMCAwIDEtNiAwYzAtMS40ODguOC0yLjUyIDEuNzM2LTMuNzE2QTguMjMxIDguMjMxIDAgMCAwIDI2IDVWNGgtMnYxYzAgMS42OTEtLjg1NCAyLjc4Ny0xLjg0MiA0LjA1NUE3LjgxMSA3LjgxMSAwIDAgMCAyMCAxNGE1LjAwNiA1LjAwNiAwIDAgMCA1IDV6TTI4LjUgMjAuMDY0YTcuMTI2IDcuMTI2IDAgMCAxLTcgMGwtMSAxLjczMWE4Ljk0MyA4Ljk0MyAwIDAgMCAzLjUgMS4xMzlWMjhoMnYtNS4wNjZhOC45NDMgOC45NDMgMCAwIDAgMy41LTEuMTM0eiIgc3R5bGU9ImZpbGw6IzAwMWQ2YyIvPjwvc3ZnPg==
784784
mediatype: image/svg+xml
@@ -842,7 +842,7 @@ spec:
842842
fieldRef:
843843
fieldPath: metadata.annotations['olm.targetNamespaces']
844844
- name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
845-
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:60ca13dd15d5dd583a594436d3568fc69fc7a58081dc40885dc4d2b16a6e4c69
845+
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:9a6f6352bee814302fcf939dd640b7d3b3e02307330f82bc32b782e7a9feb8a3
846846
image: icr.io/cpopen/websphere-liberty-operator:daily
847847
livenessProbe:
848848
failureThreshold: 3
@@ -1115,6 +1115,6 @@ spec:
11151115
provider:
11161116
name: IBM
11171117
relatedImages:
1118-
- image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:60ca13dd15d5dd583a594436d3568fc69fc7a58081dc40885dc4d2b16a6e4c69
1118+
- image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:9a6f6352bee814302fcf939dd640b7d3b3e02307330f82bc32b782e7a9feb8a3
11191119
name: liberty-sample-app
1120-
version: 1.1.0
1120+
version: 1.2.0

bundle/metadata/annotations.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ annotations:
44
operators.operatorframework.io.bundle.manifests.v1: manifests/
55
operators.operatorframework.io.bundle.metadata.v1: metadata/
66
operators.operatorframework.io.bundle.package.v1: ibm-websphere-liberty
7-
operators.operatorframework.io.bundle.channels.v1: v1.1
8-
operators.operatorframework.io.bundle.channel.default.v1: v1.1
7+
operators.operatorframework.io.bundle.channels.v1: v1.2
8+
operators.operatorframework.io.bundle.channel.default.v1: v1.2
99
operators.operatorframework.io.metrics.builder: operator-sdk-v1.24.0
1010
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
1111
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

bundle/tests/scorecard/kuttl/semeru/00-assert.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ spec:
6363
- name: OPENJ9_JAVA_OPTIONS
6464
value: >-
6565
-XX:+JITServerLogConnections
66+
-XX:+JITServerShareROMClasses
6667
-XX:JITServerSSLKey=/etc/x509/certs/tls.key
6768
-XX:JITServerSSLCert=/etc/x509/certs/tls.crt
6869
- name: SA_RESOURCE_VERSION
@@ -133,7 +134,7 @@ spec:
133134
# - '-c'
134135
# - >-
135136
# export OPENJ9_JAVA_OPTIONS="$OPENJ9_JAVA_OPTIONS -XX:+UseJITServer
136-
# -XX:+JITServerLogConnections -XX:+JITServerShareROMClasses
137+
# -XX:+JITServerLogConnections
137138
# -XX:JITServerAddress=my-wsliberty-app-semeru-compiler-1.websphere-liberty.svc
138139
# -XX:JITServerSSLRootCerts=/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
139140
# && server run

bundle/tests/scorecard/kuttl/semeru/03-assert.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ spec:
5757
- name: OPENJ9_JAVA_OPTIONS
5858
value: >-
5959
-XX:+JITServerLogConnections
60+
-XX:+JITServerShareROMClasses
6061
-XX:JITServerSSLKey=/etc/x509/certs/tls.key
6162
-XX:JITServerSSLCert=/etc/x509/certs/tls.crt
6263
- name: SA_RESOURCE_VERSION

bundle/tests/scorecard/kuttl/semeru/04-assert.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ spec:
5757
- name: OPENJ9_JAVA_OPTIONS
5858
value: >-
5959
-XX:+JITServerLogConnections
60+
-XX:+JITServerShareROMClasses
6061
-XX:JITServerSSLKey=/etc/x509/certs/tls.key
6162
-XX:JITServerSSLCert=/etc/x509/certs/tls.crt
6263
- name: SA_RESOURCE_VERSION

bundle/tests/scorecard/kuttl/semeru/05-assert.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ spec:
5757
- name: OPENJ9_JAVA_OPTIONS
5858
value: >-
5959
-XX:+JITServerLogConnections
60+
-XX:+JITServerShareROMClasses
6061
-XX:JITServerSSLKey=/etc/x509/certs/tls.key
6162
-XX:JITServerSSLCert=/etc/x509/certs/tls.crt
6263
- name: SA_RESOURCE_VERSION

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ spec:
7272
fieldRef:
7373
fieldPath: metadata.annotations['olm.targetNamespaces']
7474
- name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
75-
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:60ca13dd15d5dd583a594436d3568fc69fc7a58081dc40885dc4d2b16a6e4c69
75+
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:9a6f6352bee814302fcf939dd640b7d3b3e02307330f82bc32b782e7a9feb8a3
7676
securityContext:
7777
allowPrivilegeEscalation: false
7878
privileged: false

0 commit comments

Comments
 (0)