Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a3eddf0

Browse files
committedNov 1, 2019
Remove cmd/nop
The raison d'être for this image was to be able to replace a running container with another image that would simply exit successfully, regardless of the user-defined args/env/etc. (since we can't update args, only the image name) Instead of building and providing our own image, we can simply use an image that contains only `true` as an entrypoint. `tianon/true` is such an image, which is _125 bytes_ in size. The image that's used is configurable by operators, the only requirement is that the image exit successfully regardless of provided inputs.
1 parent 13342cc commit a3eddf0

File tree

15 files changed

+8
-55
lines changed

15 files changed

+8
-55
lines changed
 

‎cmd/controller/main.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ const (
3333
var (
3434
entrypointImage = flag.String("entrypoint-image", "override-with-entrypoint:latest",
3535
"The container image containing our entrypoint binary.")
36-
nopImage = flag.String("nop-image", "override-with-nop:latest",
37-
"The container image used to kill sidecars")
36+
nopImage = flag.String("nop-image", "tianon/true", "The container image used to stop sidecars")
3837
gitImage = flag.String("git-image", "override-with-git:latest",
3938
"The container image containing our Git binary.")
4039
credsImage = flag.String("creds-image", "override-with-creds:latest",

‎cmd/nop/kodata/HEAD

-1
This file was deleted.

‎cmd/nop/kodata/LICENSE

-1
This file was deleted.

‎cmd/nop/kodata/VENDOR-LICENSE

-1
This file was deleted.

‎cmd/nop/main.go

-29
This file was deleted.

‎config/controller.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
"-kubeconfig-writer-image", "github.com/tektoncd/pipeline/cmd/kubeconfigwriter",
4444
"-creds-image", "github.com/tektoncd/pipeline/cmd/creds-init",
4545
"-git-image", "github.com/tektoncd/pipeline/cmd/git-init",
46-
"-nop-image", "github.com/tektoncd/pipeline/cmd/nop",
46+
"-nop-image", "busybox",
4747
"-shell-image", "busybox",
4848
"-gsutil-image", "google/cloud-sdk",
4949
"-entrypoint-image", "github.com/tektoncd/pipeline/cmd/entrypoint",

‎pkg/apis/pipeline/v1alpha1/build_gcs_resource_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929

3030
var images = pipeline.Images{
3131
EntryPointImage: "override-with-entrypoint:latest",
32-
NopImage: "override-with-nop:latest",
32+
NopImage: "tianon/true",
3333
GitImage: "override-with-git:latest",
3434
CredsImage: "override-with-creds:latest",
3535
KubeconfigWriterImage: "override-with-kubeconfig-writer:latest",

‎pkg/artifacts/artifact_storage_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
var (
3636
images = pipeline.Images{
3737
EntryPointImage: "override-with-entrypoint:latest",
38-
NopImage: "override-with-nop:latest",
38+
NopImage: "tianon/true",
3939
GitImage: "override-with-git:latest",
4040
CredsImage: "override-with-creds:latest",
4141
KubeconfigWriterImage: "override-with-kubeconfig-writer:latest",

‎pkg/reconciler/pipelinerun/pipelinerun_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ var (
4646
ignoreLastTransitionTime = cmpopts.IgnoreTypes(apis.Condition{}.LastTransitionTime.Inner.Time)
4747
images = pipeline.Images{
4848
EntryPointImage: "override-with-entrypoint:latest",
49-
NopImage: "override-with-nop:latest",
49+
NopImage: "tianon/true",
5050
GitImage: "override-with-git:latest",
5151
CredsImage: "override-with-creds:latest",
5252
KubeconfigWriterImage: "override-with-kubeconfig-writer:latest",

‎pkg/reconciler/taskrun/resources/apply_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
var (
3232
images = pipeline.Images{
3333
EntryPointImage: "override-with-entrypoint:latest",
34-
NopImage: "override-with-nop:latest",
34+
NopImage: "tianon/true",
3535
GitImage: "override-with-git:latest",
3636
CredsImage: "override-with-creds:latest",
3737
KubeconfigWriterImage: "override-with-kubeconfig-writer-image:latest",

‎pkg/reconciler/taskrun/resources/input_resource_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
var (
3434
images = pipeline.Images{
3535
EntryPointImage: "override-with-entrypoint:latest",
36-
NopImage: "override-with-nop:latest",
36+
NopImage: "tianon/true",
3737
GitImage: "override-with-git:latest",
3838
CredsImage: "override-with-creds:latest",
3939
KubeconfigWriterImage: "override-with-kubeconfig-writer:latest",

‎pkg/reconciler/taskrun/taskrun_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const (
6565
var (
6666
images = pipeline.Images{
6767
EntryPointImage: "override-with-entrypoint:latest",
68-
NopImage: "override-with-nop:latest",
68+
NopImage: "tianon/true",
6969
GitImage: "override-with-git:latest",
7070
CredsImage: "override-with-creds:latest",
7171
KubeconfigWriterImage: "override-with-kubeconfig-writer:latest",

‎tekton/koparse/test_koparse.py

-2
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@
1515
"gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/kubeconfigwriter@sha256:68453f5bb4b76c0eab98964754114d4f79d3a50413872520d8919a6786ea2b35",
1616
"gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/creds-init@sha256:67448da79e4731ab534b91df08da547bc434ab08e41d905858f2244e70290f48",
1717
"gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/git-init@sha256:7d5520efa2d55e1346c424797988c541327ee52ef810a840b5c6f278a9de934a",
18-
"gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/nop@sha256:3784d6b8f73043a29d2c1d6196801bee46fe808fbb94ba4fd21ca52dce503183",
1918
"gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/controller@sha256:bdc6f22a44944c829983c30213091b60f490b41f89577e8492f6a2936be0df41",
2019
"gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/webhook@sha256:cca7069a11aaf0d9d214306d456bc40b2e33e5839429bf07c123ad964d495d8a",
2120
]
2221
EXPECTED_IMAGES = [
2322
"gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/kubeconfigwriter",
2423
"gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/creds-init",
2524
"gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/git-init",
26-
"gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/nop",
2725
"gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/controller",
2826
"gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/webhook",
2927
]

‎tekton/koparse/test_release.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,6 @@ spec:
336336
- gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/creds-init@sha256:67448da79e4731ab534b91df08da547bc434ab08e41d905858f2244e70290f48
337337
- -git-image
338338
- gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/git-init@sha256:7d5520efa2d55e1346c424797988c541327ee52ef810a840b5c6f278a9de934a
339-
- -nop-image
340-
- gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/nop@sha256:3784d6b8f73043a29d2c1d6196801bee46fe808fbb94ba4fd21ca52dce503183
341339
image: gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/controller@sha256:bdc6f22a44944c829983c30213091b60f490b41f89577e8492f6a2936be0df41
342340
name: tekton-pipelines-controller
343341
volumeMounts:

‎tekton/resources.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,6 @@ spec:
100100
---
101101
apiVersion: tekton.dev/v1alpha1
102102
kind: PipelineResource
103-
metadata:
104-
name: nop-image
105-
spec:
106-
type: image
107-
params:
108-
- name: url
109-
value: cmd/nop # Registry is provided via parameter, this is a hack see #569
110-
---
111-
apiVersion: tekton.dev/v1alpha1
112-
kind: PipelineResource
113103
metadata:
114104
name: controller-image
115105
spec:

0 commit comments

Comments
 (0)
Please sign in to comment.