Skip to content

remove Tekton leftovers from the k8s clientset package #1121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptzianos merged 1 commit into from
Nov 18, 2025
Merged

remove Tekton leftovers from the k8s clientset package #1121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions pkg/k8s/clientset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"

"github.com/go-errors/errors"
tektonv1beta1client "github.com/tektoncd/pipeline/pkg/client/clientset/versioned/typed/pipeline/v1beta1"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand All @@ -20,7 +19,6 @@ import (
// ClientInterface is an interface implemented by our K8s Go clients
type ClientInterface interface {
k8sclient.Interface
tektonv1beta1client.TektonV1beta1Interface
// Apply replicates the behaviour of the `kubectl apply` command
Apply(ctx context.Context, obj runtime.Object, namespace string, forceConflicts bool) error
// RESTMapper returns an instance implementing the `meta.RESTMapper` interface
Expand All @@ -29,7 +27,6 @@ type ClientInterface interface {

type clientSet struct {
*k8sclient.Clientset
*tektonv1beta1client.TektonV1beta1Client
fieldManager string
dynamicClient dynamic.Interface
restMapper meta.RESTMapper
Expand All @@ -42,10 +39,6 @@ func NewTypedClientForConfig(config *rest.Config, fieldManager string) (ClientIn
if err != nil {
return nil, errors.Errorf("could not initialise K8s clienset: %w", err)
}
tektonClientSet, err := tektonv1beta1client.NewForConfig(config)
if err != nil {
return nil, errors.Errorf("could not initialise tekton clientset: %w", err)
}

dynamicClient, err := dynamic.NewForConfig(config)
if err != nil {
Expand All @@ -59,11 +52,10 @@ func NewTypedClientForConfig(config *rest.Config, fieldManager string) (ClientIn
)

return clientSet{
Clientset: k8sClientSet,
TektonV1beta1Client: tektonClientSet,
fieldManager: fieldManager,
dynamicClient: dynamicClient,
restMapper: deferredRESTMapper,
Clientset: k8sClientSet,
fieldManager: fieldManager,
dynamicClient: dynamicClient,
restMapper: deferredRESTMapper,
}, nil
}

Expand Down
Loading