handle nil configmap data in gitops (#887)

replicatedhq · Jul 30, 2020 · 50152f5 · 50152f5
1 parent 94156f4
commit 50152f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/kotsadm/pkg/gitops/gitops.go b/kotsadm/pkg/gitops/gitops.go
@@ -219,7 +219,7 @@ func UpdateDownstreamGitOps(appID, clusterID, uri, branch, path, format, action
 	}
 
 	configMapData := map[string]string{}
-	if configMapExists {
+	if configMapExists && configMap.Data != nil {
 		configMapData = configMap.Data
 	}
 

diff --git a/kotsadm/web/src/components/gitops/GitOpsDeploymentManager.jsx b/kotsadm/web/src/components/gitops/GitOpsDeploymentManager.jsx
@@ -234,7 +234,12 @@ class GitOpsDeploymentManager extends React.Component {
 
     try {
       const clusterId = downstream?.cluster?.id;
-      await this.props.updateAppGitOps(app.id, clusterId, gitOpsInput);
+
+      const success = await this.updateAppGitOps(app.id, clusterId, gitOpsInput);
+      if (!success) {
+        return;
+      }
+
       this.props.history.push(`/app/${app.slug}/gitops`);
     } catch (error) {
       console.log(error);