5
5
"fmt"
6
6
"runtime"
7
7
8
- "github.com/argoproj-labs/argocd-image-updater/pkg/kube"
8
+ kube "github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/kube"
9
+
9
10
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/image"
10
11
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/log"
11
12
"github.com/argoproj-labs/argocd-image-updater/registry-scanner/pkg/options"
@@ -64,14 +65,14 @@ argocd-image-updater test nginx --allow-tags '^1.19.\d+(\-.*)*$' --update-strate
64
65
log .Fatalf ("could not set log level to %s: %v" , logLevel , err )
65
66
}
66
67
67
- var kubeClient * kube.ImageUpdaterKubernetesClient
68
- var err error
68
+ var kubeClient * kube.KubernetesClient
69
69
if ! disableKubernetes {
70
70
ctx := context .Background ()
71
- kubeClient , err = getKubeConfig (ctx , "" , kubeConfig )
71
+ kc , err : = getKubeConfig (ctx , "" , kubeConfig )
72
72
if err != nil {
73
73
log .Fatalf ("could not create K8s client: %v" , err )
74
74
}
75
+ kubeClient = kc .KubeClient
75
76
}
76
77
77
78
img := image .NewFromIdentifier (args [0 ])
@@ -118,7 +119,7 @@ argocd-image-updater test nginx --allow-tags '^1.19.\d+(\-.*)*$' --update-strate
118
119
logCtx .Fatalf ("could not get registry endpoint: %v" , err )
119
120
}
120
121
121
- if err := ep .SetEndpointCredentials (kubeClient . KubeClient ); err != nil {
122
+ if err := ep .SetEndpointCredentials (kubeClient ); err != nil {
122
123
logCtx .Fatalf ("could not set registry credentials: %v" , err )
123
124
}
124
125
@@ -138,7 +139,7 @@ argocd-image-updater test nginx --allow-tags '^1.19.\d+(\-.*)*$' --update-strate
138
139
if err != nil {
139
140
logCtx .Fatalf ("could not parse credential definition '%s': %v" , credentials , err )
140
141
}
141
- creds , err = credSrc .FetchCredentials (ep .RegistryAPI , kubeClient . KubeClient )
142
+ creds , err = credSrc .FetchCredentials (ep .RegistryAPI , kubeClient )
142
143
if err != nil {
143
144
logCtx .Fatalf ("could not fetch credentials: %v" , err )
144
145
}
0 commit comments