Skip to content

Commit 34d9184

Browse files
committed
Remove step prefix in all buildstrategy steps
1 parent 48725c8 commit 34d9184

13 files changed

+31
-31
lines changed

docs/buildstrategies.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ metadata:
184184
name: kaniko-small
185185
spec:
186186
buildSteps:
187-
- name: step-build-and-push
187+
- name: build-and-push
188188
image: gcr.io/kaniko-project/executor:v1.3.0
189189
workingDir: /workspace/source
190190
securityContext:
@@ -225,7 +225,7 @@ metadata:
225225
name: kaniko-medium
226226
spec:
227227
buildSteps:
228-
- name: step-build-and-push
228+
- name: build-and-push
229229
image: gcr.io/kaniko-project/executor:v1.3.0
230230
workingDir: /workspace/source
231231
securityContext:
@@ -373,7 +373,7 @@ If we will apply the following resources:
373373
- We will use a modified buildah strategy, with the following steps resources:
374374

375375
```yaml
376-
- name: step-buildah-bud
376+
- name: buildah-bud
377377
image: quay.io/buildah/stable:latest
378378
workingDir: /workspace/source
379379
securityContext:
@@ -395,7 +395,7 @@ If we will apply the following resources:
395395
volumeMounts:
396396
- name: buildah-images
397397
mountPath: /var/lib/containers/storage
398-
- name: step-buildah-push
398+
- name: buildah-push
399399
image: quay.io/buildah/stable:latest
400400
securityContext:
401401
privileged: true

docs/proposals/buildstrategy-steps-resources.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ metadata:
158158
name: buildpacks-v3-default
159159
spec:
160160
buildSteps:
161-
- name: step-prepare
161+
- name: prepare
162162
image: docker.io/paketobuildpacks/builder:full
163163
securityContext:
164164
runAsUser: 0
@@ -178,7 +178,7 @@ spec:
178178
request:
179179
cpu: "10m"
180180
memory: "128Mi"
181-
- name: step-detect
181+
- name: detect
182182
image: docker.io/paketobuildpacks/builder:full
183183
securityContext:
184184
runAsUser: 1000
@@ -198,7 +198,7 @@ spec:
198198
request:
199199
cpu: "250m"
200200
memory: "50Mi"
201-
- name: step-restore
201+
- name: restore
202202
image: docker.io/paketobuildpacks/builder:full
203203
securityContext:
204204
runAsUser: 1000
@@ -213,7 +213,7 @@ spec:
213213
mountPath: /cache
214214
- name: layers-dir
215215
mountPath: /layers
216-
- name: step-build
216+
- name: build
217217
image: docker.io/paketobuildpacks/builder:full
218218
securityContext:
219219
runAsUser: 1000
@@ -234,7 +234,7 @@ spec:
234234
request:
235235
cpu: "500m"
236236
memory: "1Gi"
237-
- name: step-export
237+
- name: export
238238
image: docker.io/paketobuildpacks/builder:full
239239
securityContext:
240240
runAsUser: 1000

docs/proposals/runtime-image.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ metadata:
121121
spec:
122122
taskSpec:
123123
steps:
124-
- name: step-runtime-dockerfile
124+
- name: runtime-dockerfile
125125
image: $(build.builder.image)
126126
securityContext:
127127
runAsUser: 0

samples/buildstrategy/buildah/buildstrategy_buildah_cr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: buildah
66
spec:
77
buildSteps:
8-
- name: step-buildah-bud
8+
- name: buildah-bud
99
image: quay.io/buildah/stable:latest
1010
workingDir: /workspace/source
1111
securityContext:
@@ -27,7 +27,7 @@ spec:
2727
volumeMounts:
2828
- name: buildah-images
2929
mountPath: /var/lib/containers/storage
30-
- name: step-buildah-push
30+
- name: buildah-push
3131
image: quay.io/buildah/stable:latest
3232
securityContext:
3333
privileged: true

samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_cr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: buildpacks-v3-heroku
66
spec:
77
buildSteps:
8-
- name: step-prepare
8+
- name: prepare
99
image: heroku/buildpacks:18
1010
securityContext:
1111
runAsUser: 0
@@ -33,7 +33,7 @@ spec:
3333
mountPath: /cache
3434
- name: layers-dir
3535
mountPath: /layers
36-
- name: step-create
36+
- name: build-and-push
3737
image: heroku/buildpacks:18
3838
securityContext:
3939
runAsUser: 1000

samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: buildpacks-v3-heroku
66
spec:
77
buildSteps:
8-
- name: step-prepare
8+
- name: prepare
99
image: heroku/buildpacks:18
1010
securityContext:
1111
runAsUser: 0
@@ -33,7 +33,7 @@ spec:
3333
mountPath: /cache
3434
- name: layers-dir
3535
mountPath: /layers
36-
- name: step-create
36+
- name: build-and-push
3737
image: heroku/buildpacks:18
3838
securityContext:
3939
runAsUser: 1000

samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_cr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: buildpacks-v3
66
spec:
77
buildSteps:
8-
- name: step-prepare
8+
- name: prepare
99
image: docker.io/paketobuildpacks/builder:full
1010
securityContext:
1111
runAsUser: 0
@@ -33,7 +33,7 @@ spec:
3333
mountPath: /cache
3434
- name: layers-dir
3535
mountPath: /layers
36-
- name: step-create
36+
- name: build-and-push
3737
image: docker.io/paketobuildpacks/builder:full
3838
securityContext:
3939
runAsUser: 1000

samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_namespaced_cr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: buildpacks-v3
66
spec:
77
buildSteps:
8-
- name: step-prepare
8+
- name: prepare
99
image: docker.io/paketobuildpacks/builder:full
1010
securityContext:
1111
runAsUser: 0
@@ -33,7 +33,7 @@ spec:
3333
mountPath: /cache
3434
- name: layers-dir
3535
mountPath: /layers
36-
- name: step-create
36+
- name: build-and-push
3737
image: docker.io/paketobuildpacks/builder:full
3838
securityContext:
3939
runAsUser: 1000

samples/buildstrategy/kaniko/buildstrategy_kaniko_cr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: kaniko
66
spec:
77
buildSteps:
8-
- name: step-build-and-push
8+
- name: build-and-push
99
image: gcr.io/kaniko-project/executor:v1.3.0
1010
workingDir: /workspace/source
1111
securityContext:

samples/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: source-to-image-redhat
66
spec:
77
buildSteps:
8-
- name: step-s2i-generate
8+
- name: s2i-generate
99
image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8:latest
1010
workingDir: /workspace/source
1111
args:
@@ -17,7 +17,7 @@ spec:
1717
volumeMounts:
1818
- name: s2i
1919
mountPath: /s2i
20-
- name: step-buildah-bud
20+
- name: buildah-bud
2121
image: quay.io/buildah/stable:latest
2222
workingDir: /s2i
2323
securityContext:
@@ -32,7 +32,7 @@ spec:
3232
mountPath: /s2i
3333
- name: buildah-images
3434
mountPath: /var/lib/containers/storage
35-
- name: step-buildah-push
35+
- name: buildah-push
3636
image: quay.io/buildah/stable:latest
3737
securityContext:
3838
privileged: true

0 commit comments

Comments
 (0)