Update sample app and license (#587)

* Update getting-started sample app Signed-off-by: Leo Christy Jesuraj <leojc@ca.ibm.com> * Update license to EPL 2.0 to match Open Liberty runtime Signed-off-by: Leo Christy Jesuraj <leojc@ca.ibm.com> --------- Signed-off-by: Leo Christy Jesuraj <leojc@ca.ibm.com>
OpenLiberty · May 24, 2024 · 88da401 · 88da401
1 parent ec29883
commit 88da401
Show file tree

Hide file tree

Showing 9 changed files with 257 additions and 183 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.adoc b/README.adoc
@@ -27,7 +27,7 @@ For information on how to use the Open Liberty Operator, see the link:++doc/++[d
 
 == License
 
-Usage is provided under the link:++https://opensource.org/licenses/EPL-1.0++[EPL 1.0 license]. See link:++LICENSE++[LICENSE] for the full details.
+Usage is provided under the link:++https://opensource.org/licenses/EPL-2.0++[EPL 2.0 license]. See link:++LICENSE++[LICENSE] for the full details.
 
 == Contributing
 

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ For information on how to use the Open Liberty Operator, see the [documentation]
 
 ## License
 
-Usage is provided under the [EPL 1.0 license](https://opensource.org/licenses/EPL-1.0). See [LICENSE](LICENSE) for the full details.
+Usage is provided under the [EPL 2.0 license](https://opensource.org/licenses/EPL-2.0). See [LICENSE](LICENSE) for the full details.
 
 ## Contributing 
 

diff --git a/bundle/manifests/open-liberty.clusterserviceversion.yaml b/bundle/manifests/open-liberty.clusterserviceversion.yaml
@@ -11,7 +11,7 @@ metadata:
             "name": "openliberty-app-sample"
           },
           "spec": {
-            "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:b99e5af298a800a7d53217be7b33797cedb1eeadc4d5cd14c0c3aafccf21f1ac",
+            "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:fd04ce5a5870387a379b54da5c47d0338c5f4a1254611d2418f1f959d018ba7e",
             "expose": true,
             "manageTLS": true,
             "replicas": 1,
@@ -53,7 +53,7 @@ metadata:
             "name": "openliberty-app-sample"
           },
           "spec": {
-            "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:b99e5af298a800a7d53217be7b33797cedb1eeadc4d5cd14c0c3aafccf21f1ac",
+            "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:fd04ce5a5870387a379b54da5c47d0338c5f4a1254611d2418f1f959d018ba7e",
             "expose": true,
             "replicas": 1,
             "service": {
@@ -92,7 +92,7 @@ metadata:
     categories: Application Runtime
     certified: "true"
     containerImage: icr.io/appcafe/open-liberty-operator:daily
-    createdAt: "2024-05-07T18:53:56Z"
+    createdAt: "2024-05-24T20:35:06Z"
     description: Deploy and manage containerized Liberty applications
     olm.skipRange: '>=0.8.0 <1.3.2'
     operators.openshift.io/infrastructure-features: '["disconnected"]'
@@ -1120,7 +1120,7 @@ spec:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
                 - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
-                  value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:b99e5af298a800a7d53217be7b33797cedb1eeadc4d5cd14c0c3aafccf21f1ac
+                  value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:fd04ce5a5870387a379b54da5c47d0338c5f4a1254611d2418f1f959d018ba7e
                 - name: RELATED_IMAGE_OPEN_LIBERTY_OPERATOR
                   value: icr.io/appcafe/open-liberty-operator:daily
                 image: icr.io/appcafe/open-liberty-operator:daily
@@ -1423,7 +1423,7 @@ spec:
   provider:
     name: IBM
   relatedImages:
-  - image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:b99e5af298a800a7d53217be7b33797cedb1eeadc4d5cd14c0c3aafccf21f1ac
+  - image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:fd04ce5a5870387a379b54da5c47d0338c5f4a1254611d2418f1f959d018ba7e
     name: liberty-sample-app
   - image: icr.io/appcafe/open-liberty-operator:daily
     name: open-liberty-operator

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -68,7 +68,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.annotations['olm.targetNamespaces']
           - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
-            value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:b99e5af298a800a7d53217be7b33797cedb1eeadc4d5cd14c0c3aafccf21f1ac
+            value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:fd04ce5a5870387a379b54da5c47d0338c5f4a1254611d2418f1f959d018ba7e
           - name: RELATED_IMAGE_OPEN_LIBERTY_OPERATOR
             value: OPERATOR_IMAGE
         securityContext:

diff --git a/config/samples/apps.openliberty.io_v1_openlibertyapplications.yaml b/config/samples/apps.openliberty.io_v1_openlibertyapplications.yaml
@@ -3,7 +3,7 @@ kind: OpenLibertyApplication
 metadata:
   name: openliberty-app-sample
 spec:
-  applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:b99e5af298a800a7d53217be7b33797cedb1eeadc4d5cd14c0c3aafccf21f1ac
+  applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:fd04ce5a5870387a379b54da5c47d0338c5f4a1254611d2418f1f959d018ba7e
   expose: true
   manageTLS: true
   replicas: 1

diff --git a/config/samples/apps.openliberty.io_v1beta2_openlibertyapplications.yaml b/config/samples/apps.openliberty.io_v1beta2_openlibertyapplications.yaml
@@ -4,7 +4,7 @@ metadata:
   name: openliberty-app-sample
 spec:
   # Add fields here
-  applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:b99e5af298a800a7d53217be7b33797cedb1eeadc4d5cd14c0c3aafccf21f1ac
+  applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:fd04ce5a5870387a379b54da5c47d0338c5f4a1254611d2418f1f959d018ba7e
   expose: true
   replicas: 1
   service:

diff --git a/internal/deploy/kubectl/openliberty-app-operator.yaml b/internal/deploy/kubectl/openliberty-app-operator.yaml
@@ -322,7 +322,7 @@ spec:
         - name: WATCH_NAMESPACE
           value: OPEN_LIBERTY_WATCH_NAMESPACE
         - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
-          value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:b99e5af298a800a7d53217be7b33797cedb1eeadc4d5cd14c0c3aafccf21f1ac
+          value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:fd04ce5a5870387a379b54da5c47d0338c5f4a1254611d2418f1f959d018ba7e
         - name: RELATED_IMAGE_OPEN_LIBERTY_OPERATOR
           value: icr.io/appcafe/open-liberty-operator:daily
         image: icr.io/appcafe/open-liberty-operator:daily

diff --git a/internal/deploy/kustomize/daily/base/open-liberty-operator.yaml b/internal/deploy/kustomize/daily/base/open-liberty-operator.yaml
@@ -50,7 +50,7 @@ spec:
             fieldRef:
               fieldPath: metadata.namespace
         - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
-          value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:b99e5af298a800a7d53217be7b33797cedb1eeadc4d5cd14c0c3aafccf21f1ac
+          value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:fd04ce5a5870387a379b54da5c47d0338c5f4a1254611d2418f1f959d018ba7e
         - name: RELATED_IMAGE_OPEN_LIBERTY_OPERATOR
           value: icr.io/appcafe/open-liberty-operator:daily
         image: icr.io/appcafe/open-liberty-operator:daily