Skip to content

Commit

Permalink
cleanup: unexport kubernetes.Client method (#1973)
Browse files Browse the repository at this point in the history
* cleanup: unexport kubernetes.Client method

Signed-off-by: Jason Hall <[email protected]>

* remove usage in e2e_test.go

Signed-off-by: Jason Hall <[email protected]>
  • Loading branch information
imjasonh authored Jun 9, 2022
1 parent aa700bf commit c4afa21
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 30 deletions.
35 changes: 8 additions & 27 deletions pkg/cosign/kubernetes/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,37 +26,18 @@ import (
"k8s.io/client-go/tools/clientcmd"
)

func defaultClientConfig() clientcmd.ClientConfig {
loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
configOverrides := &clientcmd.ConfigOverrides{}
return clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, configOverrides)
}

func restClientConfig() (*rest.Config, error) {
kubeCfg := defaultClientConfig()

restConfig, err := kubeCfg.ClientConfig()
func client() (kubernetes.Interface, error) {
cfg, err := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
clientcmd.NewDefaultClientConfigLoadingRules(), nil).ClientConfig()
if clientcmd.IsEmptyConfig(err) {
restConfig, err := rest.InClusterConfig()
cfg, err = rest.InClusterConfig()
if err != nil {
return restConfig, fmt.Errorf("error creating REST client config in-cluster: %w", err)
return nil, fmt.Errorf("error creating REST client config in-cluster: %w", err)
}

return restConfig, nil
}
if err != nil {
return restConfig, fmt.Errorf("error creating REST client config: %w", err)
}

return restConfig, nil
}

func Client() (kubernetes.Interface, error) {
config, err := restClientConfig()
if err != nil {
return nil, fmt.Errorf("getting client config for Kubernetes client: %w", err)
} else if err != nil {
return nil, fmt.Errorf("error creating REST client config: %w", err)
}
return kubernetes.NewForConfig(config)
return kubernetes.NewForConfig(cfg)
}

func checkImmutableSecretSupported(client kubernetes.Interface) (bool, error) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/cosign/kubernetes/secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func GetKeyPairSecret(ctx context.Context, k8sRef string) (*v1.Secret, error) {
return nil, err
}

client, err := Client()
client, err := client()
if err != nil {
return nil, fmt.Errorf("new for config: %w", err)
}
Expand All @@ -65,7 +65,7 @@ func KeyPairSecret(ctx context.Context, k8sRef string, pf cosign.PassFunc) error
}

// create the k8s client
client, err := Client()
client, err := client()
if err != nil {
return fmt.Errorf("new for config: %w", err)
}
Expand Down
13 changes: 12 additions & 1 deletion test/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ import (
"github.com/google/go-containerregistry/pkg/v1/random"
"github.com/google/go-containerregistry/pkg/v1/remote"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
k8s "k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"

// Initialize all known client auth plugins
_ "k8s.io/client-go/plugin/pkg/client/auth"

"github.com/sigstore/cosign/cmd/cosign/cli"
"github.com/sigstore/cosign/cmd/cosign/cli/attach"
Expand Down Expand Up @@ -446,7 +451,13 @@ func TestGenerateKeyPairK8s(t *testing.T) {
t.Fatal(err)
}
// make sure the secret actually exists
client, err := kubernetes.Client()

cfg, err := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
clientcmd.NewDefaultClientConfigLoadingRules(), nil).ClientConfig()
if err != nil {
t.Fatal(err)
}
client, err := k8s.NewForConfig(cfg)
if err != nil {
t.Fatal(err)
}
Expand Down

0 comments on commit c4afa21

Please sign in to comment.