Skip to content

Commit e5031b7

Browse files
leochrleochr
authored
Update sample app + skip new detect-secrets stage (#571)
* Update Liberty getting-started sample image Signed-off-by: Leo Christy Jesuraj <[email protected]> * Skip the new detect-serets stage Signed-off-by: Leo Christy Jesuraj <[email protected]> --------- Signed-off-by: Leo Christy Jesuraj <[email protected]>
1 parent cc6e74a commit e5031b7

8 files changed

+30
-10
lines changed

‎.one-pipeline-archive.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,16 @@ setup:
3131
echo "${REPO} has been archived successfully to ${ARCHIVE_DESTINATION_REPO}"
3232
fi
3333
34+
detect-secrets:
35+
image: icr.io/continuous-delivery/pipeline/pipeline-base-ubi:3.12
36+
abort_on_failure: false
37+
image_pull_policy: IfNotPresent
38+
skip: true
39+
script: |
40+
#!/usr/bin/env bash
41+
echo "Skip detect-secrets"
42+
exit 0
43+
3444
test:
3545
dind: true
3646
abort_on_failure: false

‎.one-pipeline.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,16 @@ setup:
7070
./scripts/pipeline/getCluster.sh "P"
7171
fi
7272
fi
73+
74+
detect-secrets:
75+
image: icr.io/continuous-delivery/pipeline/pipeline-base-ubi:3.12
76+
abort_on_failure: false
77+
image_pull_policy: IfNotPresent
78+
skip: true
79+
script: |
80+
#!/usr/bin/env bash
81+
echo "Skipping detect-secrets as it's already run as part of code-compliance-checks"
82+
exit 0
7383
7484
test:
7585
dind: true

‎bundle/manifests/runtime-component.clusterserviceversion.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
"name": "runtimecomponent-sample"
1212
},
1313
"spec": {
14-
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:e32f0eb0feff73c6bc8416fe2f7aa0cb74cbaa325cae5fad636325ee0ac4a105",
14+
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:6bf52d536e94d6aa6eaa3ca9639e0fe9f5e71dbd891c50362939dd6aca519d02",
1515
"expose": true,
1616
"manageTLS": true,
1717
"replicas": 1,
@@ -41,7 +41,7 @@ metadata:
4141
"name": "runtimecomponent-sample"
4242
},
4343
"spec": {
44-
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:e32f0eb0feff73c6bc8416fe2f7aa0cb74cbaa325cae5fad636325ee0ac4a105",
44+
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:6bf52d536e94d6aa6eaa3ca9639e0fe9f5e71dbd891c50362939dd6aca519d02",
4545
"expose": true,
4646
"replicas": 1,
4747
"service": {
@@ -68,7 +68,7 @@ metadata:
6868
categories: Application Runtime
6969
certified: "true"
7070
containerImage: icr.io/appcafe/runtime-component-operator:daily
71-
createdAt: "2023-08-01T13:24:02Z"
71+
createdAt: "2023-08-22T16:46:50Z"
7272
description: Deploys any runtime component with dynamic and auto-tuning configuration
7373
olm.skipRange: '>=0.8.0 <1.2.2'
7474
operators.openshift.io/infrastructure-features: '["disconnected"]'
@@ -976,7 +976,7 @@ spec:
976976
fieldRef:
977977
fieldPath: metadata.annotations['olm.targetNamespaces']
978978
- name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
979-
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:e32f0eb0feff73c6bc8416fe2f7aa0cb74cbaa325cae5fad636325ee0ac4a105
979+
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:6bf52d536e94d6aa6eaa3ca9639e0fe9f5e71dbd891c50362939dd6aca519d02
980980
- name: RELATED_IMAGE_RUNTIME_COMPONENT_OPERATOR
981981
value: icr.io/appcafe/runtime-component-operator:daily
982982
image: icr.io/appcafe/runtime-component-operator:daily
@@ -1259,7 +1259,7 @@ spec:
12591259
provider:
12601260
name: Community
12611261
relatedImages:
1262-
- image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:e32f0eb0feff73c6bc8416fe2f7aa0cb74cbaa325cae5fad636325ee0ac4a105
1262+
- image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:6bf52d536e94d6aa6eaa3ca9639e0fe9f5e71dbd891c50362939dd6aca519d02
12631263
name: liberty-sample-app
12641264
- image: icr.io/appcafe/runtime-component-operator:daily
12651265
name: runtime-component-operator

‎config/manager/manager.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ spec:
6767
fieldRef:
6868
fieldPath: metadata.annotations['olm.targetNamespaces']
6969
- name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
70-
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:e32f0eb0feff73c6bc8416fe2f7aa0cb74cbaa325cae5fad636325ee0ac4a105
70+
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:6bf52d536e94d6aa6eaa3ca9639e0fe9f5e71dbd891c50362939dd6aca519d02
7171
- name: RELATED_IMAGE_RUNTIME_COMPONENT_OPERATOR
7272
value: OPERATOR_IMAGE
7373
securityContext:

‎config/samples/rc.app.stacks_v1_runtimecomponent.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: RuntimeComponent
33
metadata:
44
name: runtimecomponent-sample
55
spec:
6-
applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:e32f0eb0feff73c6bc8416fe2f7aa0cb74cbaa325cae5fad636325ee0ac4a105
6+
applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:6bf52d536e94d6aa6eaa3ca9639e0fe9f5e71dbd891c50362939dd6aca519d02
77
expose: true
88
manageTLS: true
99
replicas: 1

‎config/samples/rc.app.stacks_v1beta2_runtimecomponent.yaml

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

‎internal/deploy/kubectl/runtime-component-operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ spec:
303303
- name: WATCH_NAMESPACE
304304
value: RUNTIME_COMPONENT_WATCH_NAMESPACE
305305
- name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
306-
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:e32f0eb0feff73c6bc8416fe2f7aa0cb74cbaa325cae5fad636325ee0ac4a105
306+
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:6bf52d536e94d6aa6eaa3ca9639e0fe9f5e71dbd891c50362939dd6aca519d02
307307
- name: RELATED_IMAGE_RUNTIME_COMPONENT_OPERATOR
308308
value: icr.io/appcafe/runtime-component-operator:daily
309309
image: icr.io/appcafe/runtime-component-operator:daily

‎internal/deploy/kustomize/daily/base/runtime-component-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:e32f0eb0feff73c6bc8416fe2f7aa0cb74cbaa325cae5fad636325ee0ac4a105
53+
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:6bf52d536e94d6aa6eaa3ca9639e0fe9f5e71dbd891c50362939dd6aca519d02
5454
- name: RELATED_IMAGE_RUNTIME_COMPONENT_OPERATOR
5555
value: icr.io/appcafe/runtime-component-operator:daily
5656
image: icr.io/appcafe/runtime-component-operator:daily

0 commit comments

Comments
 (0)