Remove step prefix in all buildstrategy steps

shipwright-io · Dec 1, 2020 · 34d9184 · 34d9184
1 parent 48725c8
commit 34d9184
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 31 deletions.
diff --git a/docs/buildstrategies.md b/docs/buildstrategies.md
@@ -184,7 +184,7 @@ metadata:
  name: kaniko-small
 spec:
  buildSteps:
- - name: step-build-and-push
+ - name: build-and-push
  image: gcr.io/kaniko-project/executor:v1.3.0
  workingDir: /workspace/source
  securityContext:
@@ -225,7 +225,7 @@ metadata:
  name: kaniko-medium
 spec:
  buildSteps:
- - name: step-build-and-push
+ - name: build-and-push
  image: gcr.io/kaniko-project/executor:v1.3.0
  workingDir: /workspace/source
  securityContext:
@@ -373,7 +373,7 @@ If we will apply the following resources:
 - We will use a modified buildah strategy, with the following steps resources:
 
  ```yaml
- - name: step-buildah-bud
+ - name: buildah-bud
  image: quay.io/buildah/stable:latest
  workingDir: /workspace/source
  securityContext:
@@ -395,7 +395,7 @@ If we will apply the following resources:
  volumeMounts:
  - name: buildah-images
  mountPath: /var/lib/containers/storage
- - name: step-buildah-push
+ - name: buildah-push
  image: quay.io/buildah/stable:latest
  securityContext:
  privileged: true

diff --git a/docs/proposals/buildstrategy-steps-resources.md b/docs/proposals/buildstrategy-steps-resources.md
@@ -158,7 +158,7 @@ metadata:
  name: buildpacks-v3-default
 spec:
  buildSteps:
- - name: step-prepare
+ - name: prepare
  image: docker.io/paketobuildpacks/builder:full
  securityContext:
  runAsUser: 0
@@ -178,7 +178,7 @@ spec:
  request:
  cpu: "10m"
  memory: "128Mi"
- - name: step-detect
+ - name: detect
  image: docker.io/paketobuildpacks/builder:full
  securityContext:
  runAsUser: 1000
@@ -198,7 +198,7 @@ spec:
  request:
  cpu: "250m"
  memory: "50Mi"
- - name: step-restore
+ - name: restore
  image: docker.io/paketobuildpacks/builder:full
  securityContext:
  runAsUser: 1000
@@ -213,7 +213,7 @@ spec:
  mountPath: /cache
  - name: layers-dir
  mountPath: /layers
- - name: step-build
+ - name: build
  image: docker.io/paketobuildpacks/builder:full
  securityContext:
  runAsUser: 1000
@@ -234,7 +234,7 @@ spec:
  request:
  cpu: "500m"
  memory: "1Gi"
- - name: step-export
+ - name: export
  image: docker.io/paketobuildpacks/builder:full
  securityContext:
  runAsUser: 1000

diff --git a/docs/proposals/runtime-image.md b/docs/proposals/runtime-image.md
@@ -121,7 +121,7 @@ metadata:
 spec:
  taskSpec:
  steps:
- - name: step-runtime-dockerfile
+ - name: runtime-dockerfile
  image: $(build.builder.image)
  securityContext:
  runAsUser: 0

diff --git a/samples/buildstrategy/buildah/buildstrategy_buildah_cr.yaml b/samples/buildstrategy/buildah/buildstrategy_buildah_cr.yaml
@@ -5,7 +5,7 @@ metadata:
  name: buildah
 spec:
  buildSteps:
- - name: step-buildah-bud
+ - name: buildah-bud
  image: quay.io/buildah/stable:latest
  workingDir: /workspace/source
  securityContext:
@@ -27,7 +27,7 @@ spec:
  volumeMounts:
  - name: buildah-images
  mountPath: /var/lib/containers/storage
- - name: step-buildah-push
+ - name: buildah-push
  image: quay.io/buildah/stable:latest
  securityContext:
  privileged: true

diff --git a/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_cr.yaml b/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_cr.yaml
@@ -5,7 +5,7 @@ metadata:
  name: buildpacks-v3-heroku
 spec:
  buildSteps:
- - name: step-prepare
+ - name: prepare
  image: heroku/buildpacks:18
  securityContext:
  runAsUser: 0
@@ -33,7 +33,7 @@ spec:
  mountPath: /cache
  - name: layers-dir
  mountPath: /layers
- - name: step-create
+ - name: build-and-push
  image: heroku/buildpacks:18
  securityContext:
  runAsUser: 1000

diff --git a/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml b/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml
@@ -5,7 +5,7 @@ metadata:
  name: buildpacks-v3-heroku
 spec:
  buildSteps:
- - name: step-prepare
+ - name: prepare
  image: heroku/buildpacks:18
  securityContext:
  runAsUser: 0
@@ -33,7 +33,7 @@ spec:
  mountPath: /cache
  - name: layers-dir
  mountPath: /layers
- - name: step-create
+ - name: build-and-push
  image: heroku/buildpacks:18
  securityContext:
  runAsUser: 1000

diff --git a/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_cr.yaml b/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_cr.yaml
@@ -5,7 +5,7 @@ metadata:
  name: buildpacks-v3
 spec:
  buildSteps:
- - name: step-prepare
+ - name: prepare
  image: docker.io/paketobuildpacks/builder:full
  securityContext:
  runAsUser: 0
@@ -33,7 +33,7 @@ spec:
  mountPath: /cache
  - name: layers-dir
  mountPath: /layers
- - name: step-create
+ - name: build-and-push
  image: docker.io/paketobuildpacks/builder:full
  securityContext:
  runAsUser: 1000

diff --git a/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_namespaced_cr.yaml b/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_namespaced_cr.yaml
@@ -5,7 +5,7 @@ metadata:
  name: buildpacks-v3
 spec:
  buildSteps:
- - name: step-prepare
+ - name: prepare
  image: docker.io/paketobuildpacks/builder:full
  securityContext:
  runAsUser: 0
@@ -33,7 +33,7 @@ spec:
  mountPath: /cache
  - name: layers-dir
  mountPath: /layers
- - name: step-create
+ - name: build-and-push
  image: docker.io/paketobuildpacks/builder:full
  securityContext:
  runAsUser: 1000

diff --git a/samples/buildstrategy/kaniko/buildstrategy_kaniko_cr.yaml b/samples/buildstrategy/kaniko/buildstrategy_kaniko_cr.yaml
@@ -5,7 +5,7 @@ metadata:
  name: kaniko
 spec:
  buildSteps:
- - name: step-build-and-push
+ - name: build-and-push
  image: gcr.io/kaniko-project/executor:v1.3.0
  workingDir: /workspace/source
  securityContext:

diff --git a/samples/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml b/samples/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml
@@ -5,7 +5,7 @@ metadata:
  name: source-to-image-redhat
 spec:
  buildSteps:
- - name: step-s2i-generate
+ - name: s2i-generate
  image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8:latest
  workingDir: /workspace/source
  args:
@@ -17,7 +17,7 @@ spec:
  volumeMounts:
  - name: s2i
  mountPath: /s2i
- - name: step-buildah-bud
+ - name: buildah-bud
  image: quay.io/buildah/stable:latest
  workingDir: /s2i
  securityContext:
@@ -32,7 +32,7 @@ spec:
  mountPath: /s2i
  - name: buildah-images
  mountPath: /var/lib/containers/storage
- - name: step-buildah-push
+ - name: buildah-push
  image: quay.io/buildah/stable:latest
  securityContext:
  privileged: true

diff --git a/samples/buildstrategy/source-to-image/buildstrategy_source-to-image_cr.yaml b/samples/buildstrategy/source-to-image/buildstrategy_source-to-image_cr.yaml
@@ -30,7 +30,7 @@ spec:
  - name: DOCKER_CONFIG
  value: /tekton/home/.docker
  image: gcr.io/kaniko-project/executor:v1.3.0
- name: step-build-and-push
+ name: build-and-push
  securityContext:
  runAsUser: 0
  allowPrivilegeEscalation: false

diff --git a/test/buildstrategy_samples.go b/test/buildstrategy_samples.go
@@ -14,7 +14,7 @@ metadata:
  name: buildah
 spec:
  buildSteps:
- - name: step-buildah-bud
+ - name: buildah-bud
  image: quay.io/buildah/stable:latest
  workingDir: /workspace/source
  securityContext:
@@ -36,7 +36,7 @@ spec:
  volumeMounts:
  - name: buildah-images
  mountPath: /var/lib/containers/storage
- - name: step-buildah-push
+ - name: buildah-push
  image: quay.io/buildah/stable:latest
  securityContext:
  privileged: true

diff --git a/test/clusterbuildstrategy_samples.go b/test/clusterbuildstrategy_samples.go
@@ -14,7 +14,7 @@ metadata:
  name: buildah
 spec:
  buildSteps:
- - name: step-buildah-bud
+ - name: buildah-bud
  image: quay.io/buildah/stable:latest
  workingDir: /workspace/source
  securityContext:
@@ -36,7 +36,7 @@ spec:
  volumeMounts:
  - name: buildah-images
  mountPath: /var/lib/containers/storage
- - name: step-buildah-push
+ - name: buildah-push
  image: quay.io/buildah/stable:latest
  securityContext:
  privileged: true
@@ -68,7 +68,7 @@ metadata:
  name: buildah
 spec:
  buildSteps:
- - name: step-buildah-bud
+ - name: buildah-bud
  image: quay.io/buildah/stable:latest
  workingDir: /workspace/source
  securityContext:
@@ -90,7 +90,7 @@ spec:
  volumeMounts:
  - name: buildah-images
  mountPath: /var/lib/containers/storage
- - name: step-buildah-push
+ - name: buildah-push
  image: quay.io/buildah/stable:latest
  securityContext:
  privileged: true