Merge pull request #748 from WASdev/updates-143

leochr · web-flow · commit 277eae06555f · 2025-04-28T13:40:01.000-04:00
Updates for WLO 1.4.3
diff --git a/Dockerfile b/Dockerfile
@@ -48,7 +48,7 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-21-jre-ubi-minimal
 ARG USER_ID=65532
 ARG GROUP_ID=65532
 
-ARG VERSION_LABEL=1.4.2
+ARG VERSION_LABEL=1.4.3
 ARG RELEASE_LABEL=XX
 ARG VCS_REF=0123456789012345678901234567890123456789
 ARG VCS_URL="https://github.com/WASdev/websphere-liberty-operator"
diff --git a/Makefile b/Makefile
@@ -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.2
+VERSION ?= 1.4.3
 OPERATOR_SDK_RELEASE_VERSION ?= v1.37.0
 LIBERTY_VERSION ?= 25.0.0.1
 
diff --git a/bundle/manifests/ibm-websphere-liberty.clusterserviceversion.yaml b/bundle/manifests/ibm-websphere-liberty.clusterserviceversion.yaml
@@ -11,7 +11,7 @@ metadata:
             "name": "websphereliberty-app-sample"
           },
           "spec": {
-            "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:4d527962b6866e27f47f8f3f31f2a4c0fd7c657e9baa91126466387ad56fe923",
+            "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:f55b852d939f7ac3234c08e23c0d1ab183b68079d5b93b87b0945c937043f523",
             "expose": true,
             "license": {
               "accept": false,
@@ -61,10 +61,10 @@ metadata:
     capabilities: Auto Pilot
     categories: Application Runtime
     containerImage: icr.io/cpopen/websphere-liberty-operator:daily
-    createdAt: "2025-03-21T04:12:50Z"
+    createdAt: "2025-04-24T02:52:09Z"
     description: Deploy and manage containerized Liberty applications
     features.operators.openshift.io/disconnected: "true"
-    olm.skipRange: '>=1.0.0 <1.4.2'
+    olm.skipRange: '>=1.0.0 <1.4.3'
     operators.openshift.io/infrastructure-features: '["disconnected"]'
     operators.operatorframework.io/builder: operator-sdk-v1.37.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
@@ -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.2
+  name: ibm-websphere-liberty.v1.4.3
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -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:4d527962b6866e27f47f8f3f31f2a4c0fd7c657e9baa91126466387ad56fe923
+                  value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:f55b852d939f7ac3234c08e23c0d1ab183b68079d5b93b87b0945c937043f523
                 - name: RELATED_IMAGE_WEBSPHERE_LIBERTY_OPERATOR
                   value: icr.io/cpopen/websphere-liberty-operator:daily
                 image: icr.io/cpopen/websphere-liberty-operator:daily
@@ -1236,8 +1236,8 @@ spec:
   provider:
     name: IBM
   relatedImages:
-  - image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:4d527962b6866e27f47f8f3f31f2a4c0fd7c657e9baa91126466387ad56fe923
+  - image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:f55b852d939f7ac3234c08e23c0d1ab183b68079d5b93b87b0945c937043f523
     name: liberty-sample-app
   - image: icr.io/cpopen/websphere-liberty-operator:daily
     name: websphere-liberty-operator
-  version: 1.4.2
+  version: 1.4.3
diff --git a/catalog.Dockerfile b/catalog.Dockerfile
@@ -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.2
+ARG VERSION_LABEL=1.4.3
 ARG RELEASE_LABEL=XX
 ARG VCS_REF=0123456789012345678901234567890123456789
 ARG VCS_URL="https://github.com/WASdev/websphere-liberty-operator"
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -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:4d527962b6866e27f47f8f3f31f2a4c0fd7c657e9baa91126466387ad56fe923
+            value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:f55b852d939f7ac3234c08e23c0d1ab183b68079d5b93b87b0945c937043f523
           - name: RELATED_IMAGE_WEBSPHERE_LIBERTY_OPERATOR
             value: OPERATOR_IMAGE
         securityContext:
diff --git a/config/manifests/bases/ibm-websphere-liberty.clusterserviceversion.yaml b/config/manifests/bases/ibm-websphere-liberty.clusterserviceversion.yaml
@@ -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.2'
+    olm.skipRange: '>=1.0.0 <1.4.3'
     operators.openshift.io/infrastructure-features: '["disconnected"]'
     repository: https://github.com/WASdev/websphere-liberty-operator
     support: IBM
diff --git a/config/samples/liberty.websphere.ibm.com_v1_webspherelibertyapplications.yaml b/config/samples/liberty.websphere.ibm.com_v1_webspherelibertyapplications.yaml
@@ -7,7 +7,7 @@ spec:
     accept: false
     edition: IBM WebSphere Application Server
     productEntitlementSource: Standalone
-  applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:4d527962b6866e27f47f8f3f31f2a4c0fd7c657e9baa91126466387ad56fe923
+  applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:f55b852d939f7ac3234c08e23c0d1ab183b68079d5b93b87b0945c937043f523
   expose: true
   manageTLS: true
   replicas: 1
diff --git a/go.mod b/go.mod
@@ -3,8 +3,8 @@ module github.com/WASdev/websphere-liberty-operator
 go 1.24
 
 require (
-	github.com/OpenLiberty/open-liberty-operator v0.8.1-0.20250317191856-edadf559271b
-	github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20250317184714-e839b0c57e23
+	github.com/OpenLiberty/open-liberty-operator v0.8.1-0.20250417153026-02cfbf34f67c
+	github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20250417152956-6554621c89ab
 	github.com/cert-manager/cert-manager v1.14.7
 	github.com/go-logr/logr v1.4.1
 	github.com/openshift/api v0.0.0-20230928134114-673ed0cfc7f1
diff --git a/go.sum b/go.sum
@@ -2,10 +2,10 @@ contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d h
 contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d/go.mod h1:IshRmMJBhDfFj5Y67nVhMYTTIze91RUeT73ipWKs/GY=
 contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg=
 contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ=
-github.com/OpenLiberty/open-liberty-operator v0.8.1-0.20250317191856-edadf559271b h1:zPlJG/pJOTXMsvDheAzJ3iFOm09XvCrSvNn8CpdNcOw=
-github.com/OpenLiberty/open-liberty-operator v0.8.1-0.20250317191856-edadf559271b/go.mod h1:Na+Ln62WGJaIJJuaWKxaepfzdgkDWf65TweusJ3hvuo=
-github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20250317184714-e839b0c57e23 h1:4Fgk+cURrLL4e7y9mLtwKh2NScnMDrvEN03ru+TRAYg=
-github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20250317184714-e839b0c57e23/go.mod h1:medHI9Y+Y456ZTqg7pPdRsUsh9jCHvg0KMc7XJ+NAe0=
+github.com/OpenLiberty/open-liberty-operator v0.8.1-0.20250417153026-02cfbf34f67c h1:m+KMnwXnIawszaR40hMfKDLGKZ/6LhKbU4OFmC/17tI=
+github.com/OpenLiberty/open-liberty-operator v0.8.1-0.20250417153026-02cfbf34f67c/go.mod h1:Vuhp8dJFmkuaFCekwVRd9zRS19vrr7qJe8406nlXRBI=
+github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20250417152956-6554621c89ab h1:UrCenySbY8pJJkwZe+xBNlGqdVn5TFvAW3OiyqXT3BU=
+github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20250417152956-6554621c89ab/go.mod h1:AWpfq1fnI8tB4zVM7un+pTeTbasLVmjSlA55kXQGNGA=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
diff --git a/internal/deploy/kubectl/websphereliberty-app-operator.yaml b/internal/deploy/kubectl/websphereliberty-app-operator.yaml
@@ -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:4d527962b6866e27f47f8f3f31f2a4c0fd7c657e9baa91126466387ad56fe923
+          value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:f55b852d939f7ac3234c08e23c0d1ab183b68079d5b93b87b0945c937043f523
         - name: RELATED_IMAGE_WEBSPHERE_LIBERTY_OPERATOR
           value: icr.io/cpopen/websphere-liberty-operator:daily
         image: icr.io/cpopen/websphere-liberty-operator:daily
diff --git a/internal/deploy/kustomize/daily/base/websphere-liberty-deployment.yaml b/internal/deploy/kustomize/daily/base/websphere-liberty-deployment.yaml
@@ -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:4d527962b6866e27f47f8f3f31f2a4c0fd7c657e9baa91126466387ad56fe923
+          value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:f55b852d939f7ac3234c08e23c0d1ab183b68079d5b93b87b0945c937043f523
         - 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
diff --git a/utils/utils.go b/utils/utils.go
@@ -53,7 +53,7 @@ var log = logf.Log.WithName("websphereliberty_utils")
 // Constant Values
 const serviceabilityMountPath = "/serviceability"
 const ssoEnvVarPrefix = "SEC_SSO_"
-const OperandVersion = "1.4.2"
+const OperandVersion = "1.4.3"
 
 // LTPA constants
 const managedLTPAMountPath = "/config/managedLTPA"
