Skip to content

Commit d79185a

Browse files
authored
fix(hydrator): don't get cluster or API versions for hydrator (#21985) (#22038)
Signed-off-by: Michael Crenshaw <[email protected]>
1 parent 8f925c6 commit d79185a

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

controller/state.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,13 @@ func (m *appStateManager) GetRepoObjs(app *v1alpha1.Application, sources []v1alp
169169
}
170170

171171
ts.AddCheckpoint("build_options_ms")
172-
serverVersion, apiResources, err := m.liveStateCache.GetVersionsInfo(app.Spec.Destination.Server)
173-
if err != nil {
174-
return nil, nil, false, fmt.Errorf("failed to get cluster version for cluster %q: %w", app.Spec.Destination.Server, err)
172+
var serverVersion string
173+
var apiResources []kubeutil.APIResourceInfo
174+
if sendRuntimeState {
175+
serverVersion, apiResources, err = m.liveStateCache.GetVersionsInfo(app.Spec.Destination.Server)
176+
if err != nil {
177+
return nil, nil, false, fmt.Errorf("failed to get cluster version for cluster %q: %w", app.Spec.Destination.Server, err)
178+
}
175179
}
176180
conn, repoClient, err := m.repoClientset.NewRepoServerClient()
177181
if err != nil {
@@ -224,8 +228,6 @@ func (m *appStateManager) GetRepoObjs(app *v1alpha1.Application, sources []v1alp
224228
apiVersions := argo.APIResourcesToStrings(apiResources, true)
225229
if !sendRuntimeState {
226230
appNamespace = ""
227-
apiVersions = nil
228-
serverVersion = ""
229231
}
230232

231233
if !source.IsHelm() && syncedRevision != "" && keyManifestGenerateAnnotationExists && keyManifestGenerateAnnotationVal != "" {

0 commit comments

Comments
 (0)