append random string to generated names

- generated names for taskruns and build steps get a random suffix of five alphanumerics. The string is guaranteed to not exceed the length of a standard Kubernetes name (63 characters) - updated tests using fixed seed for the name generation - remove rand string func from test folder - use new rand string already used for generated names
tektoncd · Feb 14, 2019 · fed6837 · fed6837
1 parent bfe6de6
commit fed6837
Show file tree

Hide file tree

Showing 30 changed files with 1,327 additions and 474 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/apis/pipeline/v1alpha1/artifact_bucket.go b/pkg/apis/pipeline/v1alpha1/artifact_bucket.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/knative/build-pipeline/pkg/names"
 	corev1 "k8s.io/api/core/v1"
 )
 
@@ -81,13 +82,13 @@ func (b *ArtifactBucket) GetCopyFromContainerSpec(name, sourcePath, destinationP
 	envVars, secretVolumeMount := getSecretEnvVarsAndVolumeMounts("bucket", secretVolumeMountPath, b.Secrets)
 
 	return []corev1.Container{{
-		Name:  fmt.Sprintf("artifact-dest-mkdir-%s", name),
+		Name:  names.SimpleNameGenerator.GenerateName(fmt.Sprintf("artifact-dest-mkdir-%s", name)),
 		Image: *bashNoopImage,
 		Args: []string{
 			"-args", strings.Join([]string{"mkdir", "-p", destinationPath}, " "),
 		},
 	}, {
-		Name:         fmt.Sprintf("artifact-copy-from-%s", name),
+		Name:         names.SimpleNameGenerator.GenerateName(fmt.Sprintf("artifact-copy-from-%s", name)),
 		Image:        *gsutilImage,
 		Args:         args,
 		Env:          envVars,
@@ -102,7 +103,7 @@ func (b *ArtifactBucket) GetCopyToContainerSpec(name, sourcePath, destinationPat
 	envVars, secretVolumeMount := getSecretEnvVarsAndVolumeMounts("bucket", secretVolumeMountPath, b.Secrets)
 
 	return []corev1.Container{{
-		Name:         fmt.Sprintf("artifact-copy-to-%s", name),
+		Name:         names.SimpleNameGenerator.GenerateName(fmt.Sprintf("artifact-copy-to-%s", name)),
 		Image:        *gsutilImage,
 		Args:         args,
 		Env:          envVars,
@@ -116,7 +117,7 @@ func (b *ArtifactBucket) GetSecretsVolumes() []corev1.Volume {
 	volumes := []corev1.Volume{}
 	for _, sec := range b.Secrets {
 		volumes = append(volumes, corev1.Volume{
-			Name: fmt.Sprintf("bucket-secret-volume-%s", sec.SecretName),
+			Name: names.SimpleNameGenerator.GenerateName(fmt.Sprintf("bucket-secret-%s", sec.SecretName)),
 			VolumeSource: corev1.VolumeSource{
 				Secret: &corev1.SecretVolumeSource{
 					SecretName: sec.SecretName,

diff --git a/pkg/apis/pipeline/v1alpha1/artifact_bucket_test.go b/pkg/apis/pipeline/v1alpha1/artifact_bucket_test.go
@@ -20,10 +20,12 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/knative/build-pipeline/test/names"
 	corev1 "k8s.io/api/core/v1"
 )
 
 func TestBucketGetCopyFromContainerSpec(t *testing.T) {
+	names.TestingSeed()
 	bucket := ArtifactBucket{
 		Location: "gs://fake-bucket",
 		Secrets: []SecretParam{{
@@ -33,11 +35,11 @@ func TestBucketGetCopyFromContainerSpec(t *testing.T) {
 		}},
 	}
 	want := []corev1.Container{{
-		Name:  "artifact-dest-mkdir-workspace",
+		Name:  "artifact-dest-mkdir-workspace-9l9zj",
 		Image: "override-with-bash-noop:latest",
 		Args:  []string{"-args", "mkdir -p /workspace/destination"},
 	}, {
-		Name:         "artifact-copy-from-workspace",
+		Name:         "artifact-copy-from-workspace-mz4c7",
 		Image:        "override-with-gsutil-image:latest",
 		Args:         []string{"-args", "cp -r gs://fake-bucket/src-path/** /workspace/destination"},
 		Env:          []corev1.EnvVar{{Name: "GOOGLE_APPLICATION_CREDENTIALS", Value: "/var/bucketsecret/secret1/serviceaccount"}},
@@ -51,6 +53,7 @@ func TestBucketGetCopyFromContainerSpec(t *testing.T) {
 }
 
 func TestBucketGetCopyToContainerSpec(t *testing.T) {
+	names.TestingSeed()
 	bucket := ArtifactBucket{
 		Location: "gs://fake-bucket",
 		Secrets: []SecretParam{{
@@ -60,7 +63,7 @@ func TestBucketGetCopyToContainerSpec(t *testing.T) {
 		}},
 	}
 	want := []corev1.Container{{
-		Name:         "artifact-copy-to-workspace",
+		Name:         "artifact-copy-to-workspace-9l9zj",
 		Image:        "override-with-gsutil-image:latest",
 		Args:         []string{"-args", "cp -r src-path gs://fake-bucket/workspace/destination"},
 		Env:          []corev1.EnvVar{{Name: "GOOGLE_APPLICATION_CREDENTIALS", Value: "/var/bucketsecret/secret1/serviceaccount"}},
@@ -74,6 +77,7 @@ func TestBucketGetCopyToContainerSpec(t *testing.T) {
 }
 
 func TestGetSecretsVolumes(t *testing.T) {
+	names.TestingSeed()
 	bucket := ArtifactBucket{
 		Location: "gs://fake-bucket",
 		Secrets: []SecretParam{{
@@ -83,7 +87,7 @@ func TestGetSecretsVolumes(t *testing.T) {
 		}},
 	}
 	want := []corev1.Volume{{
-		Name: "bucket-secret-volume-secret1",
+		Name: "bucket-secret-secret1-9l9zj",
 		VolumeSource: corev1.VolumeSource{
 			Secret: &corev1.SecretVolumeSource{
 				SecretName: "secret1",

diff --git a/pkg/apis/pipeline/v1alpha1/artifact_pvc.go b/pkg/apis/pipeline/v1alpha1/artifact_pvc.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/knative/build-pipeline/pkg/names"
 	corev1 "k8s.io/api/core/v1"
 )
 
@@ -48,7 +49,7 @@ func (p *ArtifactPVC) StorageBasePath(pr *PipelineRun) string {
 // GetCopyFromContainerSpec returns a container used to download artifacts from temporary storage
 func (p *ArtifactPVC) GetCopyFromContainerSpec(name, sourcePath, destinationPath string) []corev1.Container {
 	return []corev1.Container{{
-		Name:  fmt.Sprintf("source-copy-%s", name),
+		Name:  names.SimpleNameGenerator.GenerateName(fmt.Sprintf("source-copy-%s", name)),
 		Image: *bashNoopImage,
 		Args:  []string{"-args", strings.Join([]string{"cp", "-r", fmt.Sprintf("%s/.", sourcePath), destinationPath}, " ")},
 	}}
@@ -57,14 +58,14 @@ func (p *ArtifactPVC) GetCopyFromContainerSpec(name, sourcePath, destinationPath
 // GetCopyToContainerSpec returns a container used to upload artifacts for temporary storage
 func (p *ArtifactPVC) GetCopyToContainerSpec(name, sourcePath, destinationPath string) []corev1.Container {
 	return []corev1.Container{{
-		Name:  fmt.Sprintf("source-mkdir-%s", name),
+		Name:  names.SimpleNameGenerator.GenerateName(fmt.Sprintf("source-mkdir-%s", name)),
 		Image: *bashNoopImage,
 		Args: []string{
 			"-args", strings.Join([]string{"mkdir", "-p", destinationPath}, " "),
 		},
 		VolumeMounts: []corev1.VolumeMount{getPvcMount(p.Name)},
 	}, {
-		Name:  fmt.Sprintf("source-copy-%s", name),
+		Name:  names.SimpleNameGenerator.GenerateName(fmt.Sprintf("source-copy-%s", name)),
 		Image: *bashNoopImage,
 		Args: []string{
 			"-args", strings.Join([]string{"cp", "-r", fmt.Sprintf("%s/.", sourcePath), destinationPath}, " "),
@@ -83,7 +84,7 @@ func getPvcMount(name string) corev1.VolumeMount {
 // CreateDirContainer returns a container step to create a dir
 func CreateDirContainer(name, destinationPath string) corev1.Container {
 	return corev1.Container{
-		Name:  fmt.Sprintf("create-dir-%s", name),
+		Name:  names.SimpleNameGenerator.GenerateName(fmt.Sprintf("create-dir-%s", name)),
 		Image: *bashNoopImage,
 		Args:  []string{"-args", strings.Join([]string{"mkdir", "-p", destinationPath}, " ")},
 	}