Skip to content

Commit f039a32

Browse files
committed
Add template parameter to ensure created objects
are uniquely named. Related: OPENJDK-2903
1 parent 9139fa2 commit f039a32

File tree

1 file changed

+19
-16
lines changed

1 file changed

+19
-16
lines changed

templates/jlink/jlinked-app.yaml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ parameters:
1212
name: JDK_VERSION
1313
value: "11"
1414
required: true
15+
- description: A name for the application used to ensure created resources are uniquely named
16+
name: APPNAME
17+
required: true
1518
- description: Application to run the jlink workflow on
1619
name: APP_URI
1720
required: true
@@ -35,7 +38,7 @@ objects:
3538
- apiVersion: image.openshift.io/v1
3639
kind: ImageStream
3740
metadata:
38-
name: ubi9-openjdk-${JDK_VERSION}-jlink
41+
name: ${APPNAME}-ubi9-openjdk-${JDK_VERSION}-jlink
3942
spec:
4043
lookupPolicy:
4144
local: false
@@ -44,9 +47,9 @@ objects:
4447
- apiVersion: build.openshift.io/v1
4548
kind: BuildConfig
4649
metadata:
47-
name: jlink-builder-jdk-${JDK_VERSION}
50+
name: ${APPNAME}-jlink-builder-jdk-${JDK_VERSION}
4851
labels:
49-
app: jlink-builder-jdk-${JDK_VERSION}
52+
app: ${APPNAME}-jlink-builder-jdk-${JDK_VERSION}
5053
spec:
5154
source:
5255
dockerfile: |
@@ -72,7 +75,7 @@ objects:
7275
output:
7376
to:
7477
kind: ImageStreamTag
75-
name: ubi9-openjdk-${JDK_VERSION}-jlink:latest
78+
name: ${APPNAME}-ubi9-openjdk-${JDK_VERSION}-jlink:latest
7679
triggers:
7780
- type: ConfigChange
7881
- type: ImageChange
@@ -85,7 +88,7 @@ objects:
8588
- apiVersion: image.openshift.io/v1
8689
kind: ImageStream
8790
metadata:
88-
name: intermediate
91+
name: ${APPNAME}-intermediate
8992
spec:
9093
lookupPolicy:
9194
local: false
@@ -94,9 +97,9 @@ objects:
9497
- apiVersion: build.openshift.io/v1
9598
kind: BuildConfig
9699
metadata:
97-
name: jlink-s2i-jdk-${JDK_VERSION}
100+
name: ${APPNAME}-jlink-s2i-jdk-${JDK_VERSION}
98101
labels:
99-
app: jlink-s2i-jdk-${JDK_VERSION}
102+
app: ${APPNAME}-jlink-s2i-jdk-${JDK_VERSION}
100103
spec:
101104
source:
102105
type: Git
@@ -108,7 +111,7 @@ objects:
108111
sourceStrategy:
109112
from:
110113
kind: ImageStreamTag
111-
name: ubi9-openjdk-${JDK_VERSION}-jlink:latest # Output Imagestream from stage-1
114+
name: ${APPNAME}-ubi9-openjdk-${JDK_VERSION}-jlink:latest # Output Imagestream from stage-1
112115
pullPolicy: Always
113116
env:
114117
- name: S2I_ENABLE_JLINK
@@ -118,14 +121,14 @@ objects:
118121
output:
119122
to:
120123
kind: ImageStreamTag
121-
name: intermediate:latest
124+
name: ${APPNAME}-intermediate:latest
122125
triggers:
123126
- type: ConfigChange
124127
- type: ImageChange
125128
imageChange:
126129
from:
127130
kind: ImageStreamTag
128-
name: ubi9-openjdk-${JDK_VERSION}-jlink:latest # Output of stage-1 which serves as input to stage-2
131+
name: ${APPNAME}-ubi9-openjdk-${JDK_VERSION}-jlink:latest # Output of stage-1 which serves as input to stage-2
129132
- type: GitHub
130133
github:
131134
secret: ${GITHUB_WEBHOOK_SECRET}
@@ -135,7 +138,7 @@ objects:
135138
- apiVersion: image.openshift.io/v1
136139
kind: ImageStream
137140
metadata:
138-
name: ubimicro
141+
name: ${APPNAME}-ubimicro
139142
spec:
140143
lookupPolicy:
141144
local: true
@@ -151,7 +154,7 @@ objects:
151154
- apiVersion: image.openshift.io/v1
152155
kind: ImageStream
153156
metadata:
154-
name: lightweight-image
157+
name: ${APPNAME}-lightweight-image
155158
spec:
156159
lookupPolicy:
157160
local: false
@@ -160,13 +163,13 @@ objects:
160163
- apiVersion: build.openshift.io/v1
161164
kind: BuildConfig
162165
metadata:
163-
name: multistage-buildconfig
166+
name: ${APPNAME}-multistage-buildconfig
164167
spec:
165168
source:
166169
images:
167170
- from:
168171
kind: ImageStreamTag
169-
name: intermediate:latest
172+
name: ${APPNAME}-intermediate:latest
170173
paths:
171174
- sourcePath: /mnt/jrootfs
172175
destinationDir: jrootfs
@@ -200,14 +203,14 @@ objects:
200203
output:
201204
to:
202205
kind: ImageStreamTag
203-
name: lightweight-image:latest # Tag for the final output image
206+
name: ${APPNAME}-lightweight-image:latest # Tag for the final output image
204207
triggers:
205208
- type: ConfigChange
206209
- type: ImageChange
207210
imageChange:
208211
from:
209212
kind: ImageStreamTag
210-
name: intermediate:latest # output of stage-2
213+
name: ${APPNAME}-intermediate:latest # output of stage-2
211214
- type: ImageChange
212215
imageChange:
213216
from:

0 commit comments

Comments
 (0)