From fddd027e7528e4db93ba895dedfabf0f0c18b5e8 Mon Sep 17 00:00:00 2001 From: Salah Aldeen Al Saleh Date: Tue, 4 Aug 2020 15:46:31 -0700 Subject: [PATCH] exclude status informers before sending to operator (#906) --- kotsadm/api/src/sockets/kots/DeploySocket.ts | 3 +++ kotsadm/operator/pkg/client/client.go | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kotsadm/api/src/sockets/kots/DeploySocket.ts b/kotsadm/api/src/sockets/kots/DeploySocket.ts index 8cfa54b75b..a82bbc670c 100644 --- a/kotsadm/api/src/sockets/kots/DeploySocket.ts +++ b/kotsadm/api/src/sockets/kots/DeploySocket.ts @@ -308,6 +308,9 @@ export class KotsDeploySocketService { for (let i = 0; i < kotsAppSpec.statusInformers.length; i++) { const informer = kotsAppSpec.statusInformers[i]; const rendered = await kotsRenderFile(app, deployedAppSequence, informer, registryInfo); + if (rendered === "") { + continue; + } renderedInformers.push(rendered); } // send to kots operator diff --git a/kotsadm/operator/pkg/client/client.go b/kotsadm/operator/pkg/client/client.go index 847281b646..4cb8b24243 100644 --- a/kotsadm/operator/pkg/client/client.go +++ b/kotsadm/operator/pkg/client/client.go @@ -415,9 +415,6 @@ func runPreflight(preflightURI string, ignorePermissions bool) error { func (c *Client) applyAppInformers(appID string, informerStrings []types.StatusInformerString) { var informers []types.StatusInformer for _, str := range informerStrings { - if str == "" { - continue - } informer, err := str.Parse() if err != nil { log.Printf(fmt.Sprintf("failed to parse informer %s: %s", str, err.Error()))