Move several packages into internal

This commit moves several packages in pkg/ into pkg/internal. This reduces the Pipelines API surface by ensuring these packages can't be imported and relied on by clients, as we only intend for pkg/apis and pkg/client to be imported outside of Pipelines. Other packages that contain exported functions used outside of pkg/ will be refactored in a later commit.
tektoncd · Oct 24, 2022 · 65ab0be · 65ab0be
1 parent 1e96ac7
commit 65ab0be
Show file tree

Hide file tree

Showing 82 changed files with 73 additions and 68 deletions.
diff --git a/cmd/entrypoint/runner.go b/cmd/entrypoint/runner.go
@@ -8,7 +8,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -30,8 +30,8 @@ import (
  "sync"
  "syscall"
 
+ "github.com/tektoncd/pipeline/pkg/apis/config"
  "github.com/tektoncd/pipeline/pkg/entrypoint"
- "github.com/tektoncd/pipeline/pkg/pod"
 )
 
 // TODO(jasonhall): Test that original exit code is propagated and that
@@ -112,7 +112,7 @@ func (rr *realRunner) Run(ctx context.Context, args ...string) error {
  // main process and all children
  cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 
- if os.Getenv("TEKTON_RESOURCE_NAME") == "" && os.Getenv(pod.TektonHermeticEnvVar) == "1" {
+ if os.Getenv("TEKTON_RESOURCE_NAME") == "" && os.Getenv(config.TektonHermeticEnvVar) == "1" {
  dropNetworking(cmd)
  }
 

diff --git a/pkg/apis/config/pod.go b/pkg/apis/config/pod.go
@@ -0,0 +1,6 @@
+package config
+
+const (
+ // TektonHermeticEnvVar is the env var we set in containers to indicate they should be run hermetically
+ TektonHermeticEnvVar = "TEKTON_HERMETIC"
+)
diff --git a/pkg/apis/pipeline/v1/param_types.go b/pkg/apis/pipeline/v1/param_types.go
@@ -24,7 +24,7 @@ import (
  "strings"
 
  resource "github.com/tektoncd/pipeline/pkg/apis/resource/v1alpha1"
- "github.com/tektoncd/pipeline/pkg/substitution"
+ "github.com/tektoncd/pipeline/pkg/internal/substitution"
  "k8s.io/apimachinery/pkg/util/sets"
  "knative.dev/pkg/apis"
 )

diff --git a/pkg/apis/pipeline/v1/pipeline_validation.go b/pkg/apis/pipeline/v1/pipeline_validation.go
@@ -23,8 +23,8 @@ import (
 
  "github.com/tektoncd/pipeline/pkg/apis/config"
  "github.com/tektoncd/pipeline/pkg/apis/validate"
+ "github.com/tektoncd/pipeline/pkg/internal/substitution"
  "github.com/tektoncd/pipeline/pkg/reconciler/pipeline/dag"
- "github.com/tektoncd/pipeline/pkg/substitution"
  admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
  "k8s.io/apimachinery/pkg/api/equality"
  "k8s.io/apimachinery/pkg/util/sets"

diff --git a/pkg/apis/pipeline/v1/task_validation.go b/pkg/apis/pipeline/v1/task_validation.go
@@ -27,7 +27,7 @@ import (
  "github.com/tektoncd/pipeline/pkg/apis/config"
  "github.com/tektoncd/pipeline/pkg/apis/validate"
  "github.com/tektoncd/pipeline/pkg/apis/version"
- "github.com/tektoncd/pipeline/pkg/substitution"
+ "github.com/tektoncd/pipeline/pkg/internal/substitution"
  admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
  corev1 "k8s.io/api/core/v1"
  "k8s.io/apimachinery/pkg/util/sets"

diff --git a/pkg/apis/pipeline/v1/when_types.go b/pkg/apis/pipeline/v1/when_types.go
@@ -19,7 +19,7 @@ package v1
 import (
  "fmt"
 
- "github.com/tektoncd/pipeline/pkg/substitution"
+ "github.com/tektoncd/pipeline/pkg/internal/substitution"
  "k8s.io/apimachinery/pkg/selection"
 )
 

diff --git a/pkg/apis/pipeline/v1beta1/param_types.go b/pkg/apis/pipeline/v1beta1/param_types.go
@@ -23,7 +23,7 @@ import (
  "strings"
 
  resource "github.com/tektoncd/pipeline/pkg/apis/resource/v1alpha1"
- "github.com/tektoncd/pipeline/pkg/substitution"
+ "github.com/tektoncd/pipeline/pkg/internal/substitution"
  "k8s.io/apimachinery/pkg/util/sets"
  "knative.dev/pkg/apis"
 )

diff --git a/pkg/apis/pipeline/v1beta1/pipeline_validation.go b/pkg/apis/pipeline/v1beta1/pipeline_validation.go
@@ -23,9 +23,9 @@ import (
 
  "github.com/tektoncd/pipeline/pkg/apis/config"
  "github.com/tektoncd/pipeline/pkg/apis/validate"
- "github.com/tektoncd/pipeline/pkg/list"
+ "github.com/tektoncd/pipeline/pkg/internal/list"
+ "github.com/tektoncd/pipeline/pkg/internal/substitution"
  "github.com/tektoncd/pipeline/pkg/reconciler/pipeline/dag"
- "github.com/tektoncd/pipeline/pkg/substitution"
  admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
  "k8s.io/apimachinery/pkg/api/equality"
  "k8s.io/apimachinery/pkg/util/sets"

diff --git a/pkg/apis/pipeline/v1beta1/task_validation.go b/pkg/apis/pipeline/v1beta1/task_validation.go
@@ -27,7 +27,7 @@ import (
  "github.com/tektoncd/pipeline/pkg/apis/config"
  "github.com/tektoncd/pipeline/pkg/apis/validate"
  "github.com/tektoncd/pipeline/pkg/apis/version"
- "github.com/tektoncd/pipeline/pkg/substitution"
+ "github.com/tektoncd/pipeline/pkg/internal/substitution"
  admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
  corev1 "k8s.io/api/core/v1"
  "k8s.io/apimachinery/pkg/util/sets"

diff --git a/pkg/apis/pipeline/v1beta1/when_types.go b/pkg/apis/pipeline/v1beta1/when_types.go
@@ -19,7 +19,7 @@ package v1beta1
 import (
  "fmt"
 
- "github.com/tektoncd/pipeline/pkg/substitution"
+ "github.com/tektoncd/pipeline/pkg/internal/substitution"
  "k8s.io/apimachinery/pkg/selection"
 )
 

diff --git a/pkg/apis/resource/v1alpha1/cluster/cluster_resource.go b/pkg/apis/resource/v1alpha1/cluster/cluster_resource.go
@@ -25,7 +25,7 @@ import (
 
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
  resource "github.com/tektoncd/pipeline/pkg/apis/resource/v1alpha1"
- "github.com/tektoncd/pipeline/pkg/names"
+ "github.com/tektoncd/pipeline/pkg/internal/names"
  corev1 "k8s.io/api/core/v1"
 )
 

diff --git a/pkg/apis/resource/v1alpha1/git/git_resource.go b/pkg/apis/resource/v1alpha1/git/git_resource.go
@@ -24,7 +24,7 @@ import (
  "github.com/tektoncd/pipeline/pkg/apis/pipeline"
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
  resource "github.com/tektoncd/pipeline/pkg/apis/resource/v1alpha1"
- "github.com/tektoncd/pipeline/pkg/names"
+ "github.com/tektoncd/pipeline/pkg/internal/names"
  corev1 "k8s.io/api/core/v1"
  "knative.dev/pkg/ptr"
 )

diff --git a/pkg/apis/resource/v1alpha1/pullrequest/pull_request_resource.go b/pkg/apis/resource/v1alpha1/pullrequest/pull_request_resource.go
@@ -24,7 +24,7 @@ import (
  "github.com/tektoncd/pipeline/pkg/apis/pipeline"
  pipelinev1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
  resourcev1alpha1 "github.com/tektoncd/pipeline/pkg/apis/resource/v1alpha1"
- "github.com/tektoncd/pipeline/pkg/names"
+ "github.com/tektoncd/pipeline/pkg/internal/names"
  corev1 "k8s.io/api/core/v1"
  "knative.dev/pkg/ptr"
 )

diff --git a/pkg/apis/resource/v1alpha1/storage/artifact_bucket.go b/pkg/apis/resource/v1alpha1/storage/artifact_bucket.go
@@ -22,7 +22,7 @@ import (
  "github.com/tektoncd/pipeline/pkg/apis/pipeline"
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
  resource "github.com/tektoncd/pipeline/pkg/apis/resource/v1alpha1"
- "github.com/tektoncd/pipeline/pkg/names"
+ "github.com/tektoncd/pipeline/pkg/internal/names"
  corev1 "k8s.io/api/core/v1"
 )
 

diff --git a/pkg/apis/resource/v1alpha1/storage/artifact_pvc.go b/pkg/apis/resource/v1alpha1/storage/artifact_pvc.go
@@ -21,7 +21,7 @@ import (
 
  "github.com/tektoncd/pipeline/pkg/apis/pipeline"
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
- "github.com/tektoncd/pipeline/pkg/names"
+ "github.com/tektoncd/pipeline/pkg/internal/names"
  corev1 "k8s.io/api/core/v1"
  "knative.dev/pkg/ptr"
 )

diff --git a/pkg/apis/resource/v1alpha1/storage/gcs.go b/pkg/apis/resource/v1alpha1/storage/gcs.go
@@ -24,7 +24,7 @@ import (
  "github.com/tektoncd/pipeline/pkg/apis/pipeline"
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
  resourcev1alpha1 "github.com/tektoncd/pipeline/pkg/apis/resource/v1alpha1"
- "github.com/tektoncd/pipeline/pkg/names"
+ "github.com/tektoncd/pipeline/pkg/internal/names"
  corev1 "k8s.io/api/core/v1"
 )
 

diff --git a/pkg/apis/resource/v1alpha1/storage/storage.go b/pkg/apis/resource/v1alpha1/storage/storage.go
@@ -23,7 +23,7 @@ import (
  "github.com/tektoncd/pipeline/pkg/apis/pipeline"
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
  resource "github.com/tektoncd/pipeline/pkg/apis/resource/v1alpha1"
- "github.com/tektoncd/pipeline/pkg/names"
+ "github.com/tektoncd/pipeline/pkg/internal/names"
  corev1 "k8s.io/api/core/v1"
 )
 

diff --git a/pkg/internal/affinityassistant/transformer.go b/pkg/internal/affinityassistant/transformer.go
@@ -19,8 +19,8 @@ package affinityassistant
 import (
  "context"
 
- "github.com/tektoncd/pipeline/pkg/pod"
- "github.com/tektoncd/pipeline/pkg/workspace"
+ "github.com/tektoncd/pipeline/pkg/internal/pod"
+ "github.com/tektoncd/pipeline/pkg/internal/workspace"
  corev1 "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

diff --git a/pkg/internal/affinityassistant/transformer_test.go b/pkg/internal/affinityassistant/transformer_test.go
@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,7 +21,7 @@ import (
 
  "github.com/google/go-cmp/cmp"
  "github.com/tektoncd/pipeline/pkg/internal/affinityassistant"
- "github.com/tektoncd/pipeline/pkg/workspace"
+ "github.com/tektoncd/pipeline/pkg/internal/workspace"
  "github.com/tektoncd/pipeline/test/diff"
  corev1 "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/pkg/artifacts/artifact_storage_test.go → ...ternal/artifacts/artifact_storage_test.go b/pkg/artifacts/artifact_storage_test.go → ...ternal/artifacts/artifact_storage_test.go
diff --git a/pkg/artifacts/artifacts_storage.go → pkg/internal/artifacts/artifacts_storage.go b/pkg/artifacts/artifacts_storage.go → pkg/internal/artifacts/artifacts_storage.go
diff --git a/pkg/internal/computeresources/transformer.go b/pkg/internal/computeresources/transformer.go
@@ -21,7 +21,7 @@ import (
 
  "github.com/tektoncd/pipeline/pkg/internal/computeresources/compare"
  "github.com/tektoncd/pipeline/pkg/internal/computeresources/limitrange"
- "github.com/tektoncd/pipeline/pkg/pod"
+ "github.com/tektoncd/pipeline/pkg/internal/pod"
  corev1 "k8s.io/api/core/v1"
  "k8s.io/apimachinery/pkg/api/resource"
  corev1listers "k8s.io/client-go/listers/core/v1"

diff --git a/pkg/container/container_replacements.go → ...ernal/container/container_replacements.go b/pkg/container/container_replacements.go → ...ernal/container/container_replacements.go
@@ -18,7 +18,7 @@ package container
 
 import (
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
- "github.com/tektoncd/pipeline/pkg/substitution"
+ "github.com/tektoncd/pipeline/pkg/internal/substitution"
  corev1 "k8s.io/api/core/v1"
 )
 

diff --git a/pkg/container/sidecar_replacements.go → ...nternal/container/sidecar_replacements.go b/pkg/container/sidecar_replacements.go → ...nternal/container/sidecar_replacements.go
@@ -18,7 +18,7 @@ package container
 
 import (
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
- "github.com/tektoncd/pipeline/pkg/substitution"
+ "github.com/tektoncd/pipeline/pkg/internal/substitution"
 )
 
 // ApplySidecarReplacements applies variable interpolation on a Sidecar.

diff --git a/pkg/container/sidecar_replacements_test.go → ...al/container/sidecar_replacements_test.go b/pkg/container/sidecar_replacements_test.go → ...al/container/sidecar_replacements_test.go
@@ -21,7 +21,7 @@ import (
 
  "github.com/google/go-cmp/cmp"
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
- "github.com/tektoncd/pipeline/pkg/container"
+ "github.com/tektoncd/pipeline/pkg/internal/container"
  corev1 "k8s.io/api/core/v1"
 )
 

diff --git a/pkg/container/step_replacements.go → pkg/internal/container/step_replacements.go b/pkg/container/step_replacements.go → pkg/internal/container/step_replacements.go
@@ -18,7 +18,7 @@ package container
 
 import (
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
- "github.com/tektoncd/pipeline/pkg/substitution"
+ "github.com/tektoncd/pipeline/pkg/internal/substitution"
 )
 
 // ApplyStepReplacements applies variable interpolation on a Step.

diff --git a/pkg/container/step_replacements_test.go → ...ernal/container/step_replacements_test.go b/pkg/container/step_replacements_test.go → ...ernal/container/step_replacements_test.go
@@ -21,7 +21,7 @@ import (
 
  "github.com/google/go-cmp/cmp"
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
- "github.com/tektoncd/pipeline/pkg/container"
+ "github.com/tektoncd/pipeline/pkg/internal/container"
  corev1 "k8s.io/api/core/v1"
 )
 

diff --git a/pkg/list/diff.go → pkg/internal/list/diff.go b/pkg/list/diff.go → pkg/internal/list/diff.go
diff --git a/pkg/list/diff_test.go → pkg/internal/list/diff_test.go b/pkg/list/diff_test.go → pkg/internal/list/diff_test.go
diff --git a/pkg/matrix/matrix.go → pkg/internal/matrix/matrix.go b/pkg/matrix/matrix.go → pkg/internal/matrix/matrix.go
diff --git a/pkg/matrix/matrix_test.go → pkg/internal/matrix/matrix_test.go b/pkg/matrix/matrix_test.go → pkg/internal/matrix/matrix_test.go
diff --git a/pkg/matrix/matrix_types.go → pkg/internal/matrix/matrix_types.go b/pkg/matrix/matrix_types.go → pkg/internal/matrix/matrix_types.go
diff --git a/pkg/matrix/matrix_types_test.go → pkg/internal/matrix/matrix_types_test.go b/pkg/matrix/matrix_types_test.go → pkg/internal/matrix/matrix_types_test.go
diff --git a/pkg/names/generate.go → pkg/internal/names/generate.go b/pkg/names/generate.go → pkg/internal/names/generate.go
diff --git a/pkg/names/generate_test.go → pkg/internal/names/generate_test.go b/pkg/names/generate_test.go → pkg/internal/names/generate_test.go
diff --git a/pkg/pod/creds_init.go → pkg/internal/pod/creds_init.go b/pkg/pod/creds_init.go → pkg/internal/pod/creds_init.go
@@ -26,7 +26,7 @@ import (
  "github.com/tektoncd/pipeline/pkg/credentials"
  "github.com/tektoncd/pipeline/pkg/credentials/dockercreds"
  "github.com/tektoncd/pipeline/pkg/credentials/gitcreds"
- "github.com/tektoncd/pipeline/pkg/names"
+ "github.com/tektoncd/pipeline/pkg/internal/names"
  corev1 "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/client-go/kubernetes"

diff --git a/pkg/pod/creds_init_test.go → pkg/internal/pod/creds_init_test.go b/pkg/pod/creds_init_test.go → pkg/internal/pod/creds_init_test.go
diff --git a/pkg/pod/doc.go → pkg/internal/pod/doc.go b/pkg/pod/doc.go → pkg/internal/pod/doc.go
diff --git a/pkg/pod/entrypoint.go → pkg/internal/pod/entrypoint.go b/pkg/pod/entrypoint.go → pkg/internal/pod/entrypoint.go
diff --git a/pkg/pod/entrypoint_lookup.go → pkg/internal/pod/entrypoint_lookup.go b/pkg/pod/entrypoint_lookup.go → pkg/internal/pod/entrypoint_lookup.go
diff --git a/pkg/pod/entrypoint_lookup_impl.go → pkg/internal/pod/entrypoint_lookup_impl.go b/pkg/pod/entrypoint_lookup_impl.go → pkg/internal/pod/entrypoint_lookup_impl.go
diff --git a/pkg/pod/entrypoint_lookup_impl_test.go → ...ternal/pod/entrypoint_lookup_impl_test.go b/pkg/pod/entrypoint_lookup_impl_test.go → ...ternal/pod/entrypoint_lookup_impl_test.go
diff --git a/pkg/pod/entrypoint_lookup_test.go → pkg/internal/pod/entrypoint_lookup_test.go b/pkg/pod/entrypoint_lookup_test.go → pkg/internal/pod/entrypoint_lookup_test.go
diff --git a/pkg/pod/entrypoint_test.go → pkg/internal/pod/entrypoint_test.go b/pkg/pod/entrypoint_test.go → pkg/internal/pod/entrypoint_test.go
diff --git a/pkg/pod/pod.go → pkg/internal/pod/pod.go b/pkg/pod/pod.go → pkg/internal/pod/pod.go
@@ -29,7 +29,7 @@ import (
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/pod"
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
  "github.com/tektoncd/pipeline/pkg/internal/computeresources/tasklevel"
- "github.com/tektoncd/pipeline/pkg/names"
+ "github.com/tektoncd/pipeline/pkg/internal/names"
  corev1 "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/apimachinery/pkg/runtime/schema"
@@ -39,9 +39,6 @@ import (
 )
 
 const (
- // TektonHermeticEnvVar is the env var we set in containers to indicate they should be run hermetically
- TektonHermeticEnvVar = "TEKTON_HERMETIC"
-
  // ExecutionModeAnnotation is an experimental optional annotation to set the execution mode on a TaskRun
  ExecutionModeAnnotation = "experimental.tekton.dev/execution-mode"
 
@@ -218,7 +215,7 @@ func (b *Builder) Build(ctx context.Context, taskRun *v1beta1.TaskRun, taskSpec
  if taskRun.Annotations[ExecutionModeAnnotation] == ExecutionModeHermetic && alphaAPIEnabled {
  for i, s := range stepContainers {
  // Add it at the end so it overrides
- env := append(s.Env, corev1.EnvVar{Name: TektonHermeticEnvVar, Value: "1"}) //nolint
+ env := append(s.Env, corev1.EnvVar{Name: config.TektonHermeticEnvVar, Value: "1"}) //nolint
  stepContainers[i].Env = env
  }
  }

diff --git a/pkg/pod/pod_test.go → pkg/internal/pod/pod_test.go b/pkg/pod/pod_test.go → pkg/internal/pod/pod_test.go
diff --git a/pkg/pod/script.go → pkg/internal/pod/script.go b/pkg/pod/script.go → pkg/internal/pod/script.go
@@ -23,7 +23,7 @@ import (
  "strings"
 
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
- "github.com/tektoncd/pipeline/pkg/names"
+ "github.com/tektoncd/pipeline/pkg/internal/names"
  corev1 "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

diff --git a/pkg/pod/script_test.go → pkg/internal/pod/script_test.go b/pkg/pod/script_test.go → pkg/internal/pod/script_test.go
diff --git a/pkg/pod/scripts_constants.go → pkg/internal/pod/scripts_constants.go b/pkg/pod/scripts_constants.go → pkg/internal/pod/scripts_constants.go
diff --git a/pkg/pod/status.go → pkg/internal/pod/status.go b/pkg/pod/status.go → pkg/internal/pod/status.go
diff --git a/pkg/pod/status_test.go → pkg/internal/pod/status_test.go b/pkg/pod/status_test.go → pkg/internal/pod/status_test.go
diff --git a/pkg/pod/testdata/HEAD → pkg/internal/pod/testdata/HEAD b/pkg/pod/testdata/HEAD → pkg/internal/pod/testdata/HEAD
diff --git a/pkg/pod/workingdir_init.go → pkg/internal/pod/workingdir_init.go b/pkg/pod/workingdir_init.go → pkg/internal/pod/workingdir_init.go
diff --git a/pkg/pod/workingdir_init_test.go → pkg/internal/pod/workingdir_init_test.go b/pkg/pod/workingdir_init_test.go → pkg/internal/pod/workingdir_init_test.go
diff --git a/pkg/status/status.go → pkg/internal/status/status.go b/pkg/status/status.go → pkg/internal/status/status.go
diff --git a/pkg/status/status_test.go → pkg/internal/status/status_test.go b/pkg/status/status_test.go → pkg/internal/status/status_test.go
diff --git a/pkg/substitution/substitution.go → pkg/internal/substitution/substitution.go b/pkg/substitution/substitution.go → pkg/internal/substitution/substitution.go
diff --git a/pkg/substitution/substitution_test.go → ...nternal/substitution/substitution_test.go b/pkg/substitution/substitution_test.go → ...nternal/substitution/substitution_test.go
@@ -22,7 +22,7 @@ import (
  "testing"
 
  "github.com/google/go-cmp/cmp"
- "github.com/tektoncd/pipeline/pkg/substitution"
+ "github.com/tektoncd/pipeline/pkg/internal/substitution"
  "github.com/tektoncd/pipeline/test/diff"
  "k8s.io/apimachinery/pkg/util/sets"
  "knative.dev/pkg/apis"

diff --git a/pkg/workspace/affinity_assistant_names.go → ...nal/workspace/affinity_assistant_names.go b/pkg/workspace/affinity_assistant_names.go → ...nal/workspace/affinity_assistant_names.go
diff --git a/pkg/workspace/apply.go → pkg/internal/workspace/apply.go b/pkg/workspace/apply.go → pkg/internal/workspace/apply.go
@@ -22,8 +22,8 @@ import (
 
  "github.com/tektoncd/pipeline/pkg/apis/config"
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
- "github.com/tektoncd/pipeline/pkg/names"
- "github.com/tektoncd/pipeline/pkg/substitution"
+ "github.com/tektoncd/pipeline/pkg/internal/names"
+ "github.com/tektoncd/pipeline/pkg/internal/substitution"
  corev1 "k8s.io/api/core/v1"
  "k8s.io/apimachinery/pkg/util/sets"
 )

diff --git a/pkg/workspace/apply_test.go → pkg/internal/workspace/apply_test.go b/pkg/workspace/apply_test.go → pkg/internal/workspace/apply_test.go
@@ -7,7 +7,7 @@ import (
  "github.com/google/go-cmp/cmp"
  "github.com/tektoncd/pipeline/pkg/apis/config"
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
- "github.com/tektoncd/pipeline/pkg/workspace"
+ "github.com/tektoncd/pipeline/pkg/internal/workspace"
  "github.com/tektoncd/pipeline/test/diff"
  "github.com/tektoncd/pipeline/test/names"
  corev1 "k8s.io/api/core/v1"

diff --git a/pkg/workspace/validate.go → pkg/internal/workspace/validate.go b/pkg/workspace/validate.go → pkg/internal/workspace/validate.go
diff --git a/pkg/workspace/validate_test.go → pkg/internal/workspace/validate_test.go b/pkg/workspace/validate_test.go → pkg/internal/workspace/validate_test.go
diff --git a/pkg/pipelinerunmetrics/metrics_test.go b/pkg/pipelinerunmetrics/metrics_test.go
@@ -26,7 +26,7 @@ import (
  "github.com/tektoncd/pipeline/pkg/apis/config"
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
  fakepipelineruninformer "github.com/tektoncd/pipeline/pkg/client/injection/informers/pipeline/v1beta1/pipelinerun/fake"
- "github.com/tektoncd/pipeline/pkg/names"
+ "github.com/tektoncd/pipeline/pkg/internal/names"
  ttesting "github.com/tektoncd/pipeline/pkg/reconciler/testing"
  "go.uber.org/zap"
  corev1 "k8s.io/api/core/v1"

diff --git a/pkg/reconciler/pipeline/dag/dag.go b/pkg/reconciler/pipeline/dag/dag.go
@@ -22,7 +22,7 @@ import (
  "sort"
  "strings"
 
- "github.com/tektoncd/pipeline/pkg/list"
+ "github.com/tektoncd/pipeline/pkg/internal/list"
  "k8s.io/apimachinery/pkg/util/sets"
 )
 

diff --git a/pkg/reconciler/pipeline/dag/dag_test.go b/pkg/reconciler/pipeline/dag/dag_test.go
@@ -24,7 +24,7 @@ import (
  "github.com/google/go-cmp/cmp"
  "github.com/google/go-cmp/cmp/cmpopts"
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
- "github.com/tektoncd/pipeline/pkg/list"
+ "github.com/tektoncd/pipeline/pkg/internal/list"
  "github.com/tektoncd/pipeline/pkg/reconciler/pipeline/dag"
  "github.com/tektoncd/pipeline/test/diff"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/pkg/reconciler/pipelinerun/affinity_assistant.go b/pkg/reconciler/pipelinerun/affinity_assistant.go
@@ -25,8 +25,8 @@ import (
  "github.com/tektoncd/pipeline/pkg/apis/pipeline"
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/pod"
  "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
+ "github.com/tektoncd/pipeline/pkg/internal/workspace"
  "github.com/tektoncd/pipeline/pkg/reconciler/volumeclaim"
- "github.com/tektoncd/pipeline/pkg/workspace"
  appsv1 "k8s.io/api/apps/v1"
  corev1 "k8s.io/api/core/v1"
  apierrors "k8s.io/apimachinery/pkg/api/errors"

diff --git a/pkg/reconciler/pipelinerun/affinity_assistant_test.go b/pkg/reconciler/pipelinerun/affinity_assistant_test.go
@@ -21,7 +21,7 @@ import (
  "testing"
 
  "github.com/google/go-cmp/cmp"
- "github.com/tektoncd/pipeline/pkg/workspace"
+ "github.com/tektoncd/pipeline/pkg/internal/workspace"
  "github.com/tektoncd/pipeline/test/diff"
  "github.com/tektoncd/pipeline/test/parse"