fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

misc: address duplicate imports 

Signed-off-by: Hidde Beydals <hidde@hhh.computer>
This commit is contained in:
Hidde Beydals 2023-10-09 13:57:05 +02:00
parent a74eb57811
commit 20230811e4
No known key found for this signature in database
GPG Key ID: 979F380FC2341744
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/controller/ocirepository_controller.go
View File

@ -34,7 +34,6 @@ import (
"github.com/google/go-containerregistry/pkg/authn/k8schain" "github.com/google/go-containerregistry/pkg/authn/k8schain"
"github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/name"
gcrv1 "github.com/google/go-containerregistry/pkg/v1" gcrv1 "github.com/google/go-containerregistry/pkg/v1"
v1 "github.com/google/go-containerregistry/pkg/v1"
"github.com/google/go-containerregistry/pkg/v1/remote" "github.com/google/go-containerregistry/pkg/v1/remote"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
@ -578,13 +577,13 @@ func (r *OCIRepositoryReconciler) selectLayer(obj *ociv1.OCIRepository, image gc
func (r *OCIRepositoryReconciler) getRevision(ref name.Reference, options []remote.Option) (string, error) { func (r *OCIRepositoryReconciler) getRevision(ref name.Reference, options []remote.Option) (string, error) {
switch ref := ref.(type) { switch ref := ref.(type) {
case name.Digest: case name.Digest:
digest, err := v1.NewHash(ref.DigestStr()) digest, err := gcrv1.NewHash(ref.DigestStr())
if err != nil { if err != nil {
return "", err return "", err
} }
return digest.String(), nil return digest.String(), nil
case name.Tag: case name.Tag:
var digest v1.Hash var digest gcrv1.Hash
desc, err := remote.Head(ref, options...) desc, err := remote.Head(ref, options...)
if err == nil { if err == nil {

3
internal/controller/ocirepository_controller_test.go
View File

@ -19,7 +19,6 @@ package controller
import ( import (
"crypto/rand" "crypto/rand"
"crypto/tls" "crypto/tls"
cryptotls "crypto/tls"
"crypto/x509" "crypto/x509"
"crypto/x509/pkix" "crypto/x509/pkix"
"encoding/pem" "encoding/pem"
@ -830,7 +829,7 @@ func TestOCIRepository_reconcileSource_authStrategy(t *testing.T) {
func makeTransport(insecure bool) http.RoundTripper { func makeTransport(insecure bool) http.RoundTripper {
transport := remote.DefaultTransport.(*http.Transport).Clone() transport := remote.DefaultTransport.(*http.Transport).Clone()
if insecure { if insecure {
transport.TLSClientConfig = &cryptotls.Config{ transport.TLSClientConfig = &tls.Config{
InsecureSkipVerify: true, InsecureSkipVerify: true,
} }
} }

3
internal/helm/registry/auth.go
View File

@ -26,7 +26,6 @@ import (
"github.com/fluxcd/source-controller/internal/oci" "github.com/fluxcd/source-controller/internal/oci"
"github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/authn"
"helm.sh/helm/v3/pkg/registry" "helm.sh/helm/v3/pkg/registry"
helmreg "helm.sh/helm/v3/pkg/registry"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
) )
@ -143,7 +142,7 @@ func (r stringResource) RegistryStr() string {
// NewLoginOption returns a registry login option for the given HelmRepository. // NewLoginOption returns a registry login option for the given HelmRepository.
// If the HelmRepository does not specify a secretRef, a nil login option is returned. // If the HelmRepository does not specify a secretRef, a nil login option is returned.
func NewLoginOption(auth authn.Authenticator, keychain authn.Keychain, registryURL string) (helmreg.LoginOption, error) { func NewLoginOption(auth authn.Authenticator, keychain authn.Keychain, registryURL string) (registry.LoginOption, error) {
if auth != nil { if auth != nil {
return AuthAdaptHelper(auth) return AuthAdaptHelper(auth)
} }

1
pkg/azure/blob.go
View File

@ -31,7 +31,6 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud" "github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud"
"github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
"github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/Azure/azure-sdk-for-go/sdk/azidentity"
_ "github.com/Azure/azure-sdk-for-go/sdk/azidentity"
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"