Skip to content

fix(test): avoid nil dereference in test command when --disable-kuber… #1273

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(test): avoid nil dereference in test command when --disable-kuber… #1273

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
13 changes: 7 additions & 6 deletions cmd/test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import (
"fmt"
"runtime"

"github.com/argoproj-labs/argocd-image-updater/pkg/kube"
kube "github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/kube"

"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"
Expand Down Expand Up @@ -64,14 +65,14 @@ 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.ImageUpdaterKubernetesClient
var err error
var kubeClient *kube.KubernetesClient
if !disableKubernetes {
ctx := context.Background()
kubeClient, err = getKubeConfig(ctx, "", kubeConfig)
kc, err := getKubeConfig(ctx, "", kubeConfig)
if err != nil {
log.Fatalf("could not create K8s client: %v", err)
}
kubeClient = kc.KubeClient
}

img := image.NewFromIdentifier(args[0])
Expand Down Expand Up @@ -118,7 +119,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.KubeClient); err != nil {
if err := ep.SetEndpointCredentials(kubeClient); err != nil {
logCtx.Fatalf("could not set registry credentials: %v", err)
}

Expand All @@ -138,7 +139,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.KubeClient)
creds, err = credSrc.FetchCredentials(ep.RegistryAPI, kubeClient)
if err != nil {
logCtx.Fatalf("could not fetch credentials: %v", err)
}
Expand Down