Skip to content

Commit 961c69d

Browse files
authored
Merge branch 'main' into multi-resource-sharing
2 parents 1a41c73 + fa17dc6 commit 961c69d

6 files changed

+9
-9
lines changed

bundle/manifests/open-liberty.clusterserviceversion.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
"name": "openliberty-app-sample"
1212
},
1313
"spec": {
14-
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:422a7a00edc338497c0a91890b09204b8505ef0e377bb9b5944ace0102055e91",
14+
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:91589e8e215d416595b045c739724385ffe34364df06d36794dca0d6964053e7",
1515
"expose": true,
1616
"manageTLS": true,
1717
"replicas": 1,
@@ -53,7 +53,7 @@ metadata:
5353
"name": "openliberty-app-sample"
5454
},
5555
"spec": {
56-
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:422a7a00edc338497c0a91890b09204b8505ef0e377bb9b5944ace0102055e91",
56+
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:91589e8e215d416595b045c739724385ffe34364df06d36794dca0d6964053e7",
5757
"expose": true,
5858
"replicas": 1,
5959
"service": {
@@ -1145,7 +1145,7 @@ spec:
11451145
fieldRef:
11461146
fieldPath: metadata.annotations['olm.targetNamespaces']
11471147
- name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
1148-
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:422a7a00edc338497c0a91890b09204b8505ef0e377bb9b5944ace0102055e91
1148+
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:91589e8e215d416595b045c739724385ffe34364df06d36794dca0d6964053e7
11491149
- name: RELATED_IMAGE_OPEN_LIBERTY_OPERATOR
11501150
value: icr.io/appcafe/open-liberty-operator:daily
11511151
image: icr.io/appcafe/open-liberty-operator:daily
@@ -1448,7 +1448,7 @@ spec:
14481448
provider:
14491449
name: IBM
14501450
relatedImages:
1451-
- image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:422a7a00edc338497c0a91890b09204b8505ef0e377bb9b5944ace0102055e91
1451+
- image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:91589e8e215d416595b045c739724385ffe34364df06d36794dca0d6964053e7
14521452
name: liberty-sample-app
14531453
- image: icr.io/appcafe/open-liberty-operator:daily
14541454
name: open-liberty-operator

config/manager/manager.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ spec:
6868
fieldRef:
6969
fieldPath: metadata.annotations['olm.targetNamespaces']
7070
- name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
71-
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:422a7a00edc338497c0a91890b09204b8505ef0e377bb9b5944ace0102055e91
71+
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:91589e8e215d416595b045c739724385ffe34364df06d36794dca0d6964053e7
7272
- name: RELATED_IMAGE_OPEN_LIBERTY_OPERATOR
7373
value: OPERATOR_IMAGE
7474
securityContext:

config/samples/apps.openliberty.io_v1_openlibertyapplications.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: OpenLibertyApplication
33
metadata:
44
name: openliberty-app-sample
55
spec:
6-
applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:422a7a00edc338497c0a91890b09204b8505ef0e377bb9b5944ace0102055e91
6+
applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:91589e8e215d416595b045c739724385ffe34364df06d36794dca0d6964053e7
77
expose: true
88
manageTLS: true
99
replicas: 1

config/samples/apps.openliberty.io_v1beta2_openlibertyapplications.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: openliberty-app-sample
55
spec:
66
# Add fields here
7-
applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:422a7a00edc338497c0a91890b09204b8505ef0e377bb9b5944ace0102055e91
7+
applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:91589e8e215d416595b045c739724385ffe34364df06d36794dca0d6964053e7
88
expose: true
99
replicas: 1
1010
service:

internal/deploy/kubectl/openliberty-app-operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ spec:
322322
- name: WATCH_NAMESPACE
323323
value: OPEN_LIBERTY_WATCH_NAMESPACE
324324
- name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
325-
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:422a7a00edc338497c0a91890b09204b8505ef0e377bb9b5944ace0102055e91
325+
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:91589e8e215d416595b045c739724385ffe34364df06d36794dca0d6964053e7
326326
- name: RELATED_IMAGE_OPEN_LIBERTY_OPERATOR
327327
value: icr.io/appcafe/open-liberty-operator:daily
328328
image: icr.io/appcafe/open-liberty-operator:daily

internal/deploy/kustomize/daily/base/open-liberty-operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ spec:
5050
fieldRef:
5151
fieldPath: metadata.namespace
5252
- name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
53-
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:422a7a00edc338497c0a91890b09204b8505ef0e377bb9b5944ace0102055e91
53+
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:91589e8e215d416595b045c739724385ffe34364df06d36794dca0d6964053e7
5454
- name: RELATED_IMAGE_OPEN_LIBERTY_OPERATOR
5555
value: icr.io/appcafe/open-liberty-operator:daily
5656
image: icr.io/appcafe/open-liberty-operator:daily

0 commit comments

Comments
 (0)