diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/main.go | 2 | ||||
| -rw-r--r-- | cmd/run.go | 4 | ||||
| -rw-r--r-- | cmd/template.go | 2 | ||||
| -rw-r--r-- | cmd/test.go | 10 | ||||
| -rw-r--r-- | cmd/util.go | 10 | ||||
| -rw-r--r-- | cmd/util_test.go | 2 |
6 files changed, 17 insertions, 13 deletions
diff --git a/cmd/main.go b/cmd/main.go index 81eed76..8f5c0c6 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -35,7 +35,7 @@ type ImageUpdaterConfig struct { CheckInterval time.Duration ArgoClient argocd.ArgoCD LogLevel string - KubeClient *kube.KubernetesClient + KubeClient *kube.ImageUpdaterKubernetesClient MaxConcurrency int HealthPort int MetricsPort int @@ -14,10 +14,10 @@ import ( "github.com/argoproj-labs/argocd-image-updater/pkg/common" "github.com/argoproj-labs/argocd-image-updater/pkg/health" "github.com/argoproj-labs/argocd-image-updater/pkg/metrics" - "github.com/argoproj-labs/argocd-image-updater/pkg/registry" "github.com/argoproj-labs/argocd-image-updater/pkg/version" "github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/env" "github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log" + "github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/registry" "github.com/argoproj/argo-cd/v2/reposerver/askpass" @@ -115,7 +115,7 @@ func newRunCommand() *cobra.Command { log.Fatalf("could not create K8s client: %v", err) } if cfg.ClientOpts.ServerAddr == "" { - cfg.ClientOpts.ServerAddr = fmt.Sprintf("argocd-server.%s", cfg.KubeClient.Namespace) + cfg.ClientOpts.ServerAddr = fmt.Sprintf("argocd-server.%s", cfg.KubeClient.KubeClient.Namespace) } } if cfg.ClientOpts.ServerAddr == "" { diff --git a/cmd/template.go b/cmd/template.go index 04b7ee6..8d8d8d3 100644 --- a/cmd/template.go +++ b/cmd/template.go @@ -8,7 +8,7 @@ import ( "github.com/argoproj-labs/argocd-image-updater/pkg/argocd" "github.com/argoproj-labs/argocd-image-updater/pkg/common" - "github.com/argoproj-labs/argocd-image-updater/pkg/image" + "github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/image" "github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/tag" "github.com/spf13/cobra" diff --git a/cmd/test.go b/cmd/test.go index fbef681..005b8bd 100644 --- a/cmd/test.go +++ b/cmd/test.go @@ -5,11 +5,11 @@ import ( "fmt" "runtime" - "github.com/argoproj-labs/argocd-image-updater/pkg/image" "github.com/argoproj-labs/argocd-image-updater/pkg/kube" - "github.com/argoproj-labs/argocd-image-updater/pkg/registry" + "github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/image" "github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log" "github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/options" + "github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/registry" "github.com/spf13/cobra" "github.com/spf13/pflag" @@ -64,7 +64,7 @@ argocd-image-updater test nginx --allow-tags '^1.19.\d+(\-.*)*$' --update-strate log.Fatalf("could not set log level to %s: %v", logLevel, err) } - var kubeClient *kube.KubernetesClient + var kubeClient *kube.ImageUpdaterKubernetesClient var err error if !disableKubernetes { ctx := context.Background() @@ -118,7 +118,7 @@ argocd-image-updater test nginx --allow-tags '^1.19.\d+(\-.*)*$' --update-strate logCtx.Fatalf("could not get registry endpoint: %v", err) } - if err := ep.SetEndpointCredentials(kubeClient); err != nil { + if err := ep.SetEndpointCredentials(kubeClient.KubeClient); err != nil { logCtx.Fatalf("could not set registry credentials: %v", err) } @@ -138,7 +138,7 @@ argocd-image-updater test nginx --allow-tags '^1.19.\d+(\-.*)*$' --update-strate if err != nil { logCtx.Fatalf("could not parse credential definition '%s': %v", credentials, err) } - creds, err = credSrc.FetchCredentials(ep.RegistryAPI, kubeClient) + creds, err = credSrc.FetchCredentials(ep.RegistryAPI, kubeClient.KubeClient) if err != nil { logCtx.Fatalf("could not fetch credentials: %v", err) } diff --git a/cmd/util.go b/cmd/util.go index 4284c81..628a960 100644 --- a/cmd/util.go +++ b/cmd/util.go @@ -7,6 +7,7 @@ import ( "time" "github.com/argoproj-labs/argocd-image-updater/pkg/kube" + registryKube "github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/kube" "github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log" ) @@ -26,9 +27,9 @@ func getPrintableHealthPort(port int) string { } } -func getKubeConfig(ctx context.Context, namespace string, kubeConfig string) (*kube.KubernetesClient, error) { +func getKubeConfig(ctx context.Context, namespace string, kubeConfig string) (*kube.ImageUpdaterKubernetesClient, error) { var fullKubeConfigPath string - var kubeClient *kube.KubernetesClient + var kubeClient *kube.ImageUpdaterKubernetesClient var err error if kubeConfig != "" { @@ -44,10 +45,13 @@ func getKubeConfig(ctx context.Context, namespace string, kubeConfig string) (*k log.Debugf("Creating in-cluster Kubernetes client") } - kubeClient, err = kube.NewKubernetesClientFromConfig(ctx, namespace, fullKubeConfigPath) + kubernetesClient, err := registryKube.NewKubernetesClientFromConfig(ctx, namespace, fullKubeConfigPath) if err != nil { return nil, err } + kubeClient = &kube.ImageUpdaterKubernetesClient{ + KubeClient: kubernetesClient, + } return kubeClient, nil } diff --git a/cmd/util_test.go b/cmd/util_test.go index 6875307..5b3a428 100644 --- a/cmd/util_test.go +++ b/cmd/util_test.go @@ -47,7 +47,7 @@ func TestGetKubeConfig(t *testing.T) { } else { require.NoError(t, err) assert.NotNil(t, client) - assert.Equal(t, tt.expectedNS, client.Namespace) + assert.Equal(t, tt.expectedNS, client.KubeClient.Namespace) } }) } |