don't update configmap while diff-run

carvel-dev · May 12, 2022 · 9ecf7ac · 9ecf7ac
1 parent 72440b4
commit 9ecf7ac
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/pkg/kapp/app/recorded_app.go b/pkg/kapp/app/recorded_app.go
@@ -137,7 +137,7 @@ func (a *RecordedApp) CreateOrUpdate(labels map[string]string, isDiffRun bool) e
 
 	if foundMigratedApp {
 		a.isMigrated = true
-		return a.updateApp(app, labels)
+		return a.updateApp(app, labels, isDiffRun)
 	}
 
 	app, foundNonMigratedApp, err := a.find(a.name)
@@ -146,10 +146,10 @@ func (a *RecordedApp) CreateOrUpdate(labels map[string]string, isDiffRun bool) e
 	}
 
 	if foundNonMigratedApp {
-		if a.isMigrationEnabled() {
+		if a.isMigrationEnabled() && !isDiffRun {
 			return a.migrate(app, labels, a.fqName())
 		}
-		return a.updateApp(app, labels)
+		return a.updateApp(app, labels, isDiffRun)
 	}
 
 	return a.create(labels, isDiffRun)
@@ -201,20 +201,26 @@ func (a *RecordedApp) create(labels map[string]string, isDiffRun bool) error {
 	if isDiffRun {
 		createOpts.DryRun = []string{metav1.DryRunAll}
 	}
+
 	app, err := a.coreClient.CoreV1().ConfigMaps(a.nsName).Create(context.TODO(), configMap, createOpts)
 
 	a.setMeta(*app)
 
 	return err
 }
 
-func (a *RecordedApp) updateApp(existingConfigMap *corev1.ConfigMap, labels map[string]string) error {
+func (a *RecordedApp) updateApp(existingConfigMap *corev1.ConfigMap, labels map[string]string, isDiffRun bool) error {
 	err := a.mergeAppUpdates(existingConfigMap, labels)
 	if err != nil {
 		return err
 	}
 
-	_, err = a.coreClient.CoreV1().ConfigMaps(a.nsName).Update(context.TODO(), existingConfigMap, metav1.UpdateOptions{})
+	updateOpts := metav1.UpdateOptions{}
+	if isDiffRun {
+		updateOpts.DryRun = []string{metav1.DryRunAll}
+	}
+
+	_, err = a.coreClient.CoreV1().ConfigMaps(a.nsName).Update(context.TODO(), existingConfigMap, updateOpts)
 	if err != nil {
 		return fmt.Errorf("Updating app: %s", err)
 	}
@@ -232,7 +238,7 @@ func (a *RecordedApp) RenamePrevApp(prevAppName string, labels map[string]string
 
 	if foundMigratedApp {
 		a.isMigrated = true
-		return a.updateApp(app, labels)
+		return a.updateApp(app, labels, isDiffRun)
 	}
 
 	app, foundNonMigratedApp, err := a.find(a.name)
@@ -241,10 +247,10 @@ func (a *RecordedApp) RenamePrevApp(prevAppName string, labels map[string]string
 	}
 
 	if foundNonMigratedApp {
-		if a.isMigrationEnabled() {
+		if a.isMigrationEnabled() && !isDiffRun {
 			return a.migrate(app, labels, a.fqName())
 		}
-		return a.updateApp(app, labels)
+		return a.updateApp(app, labels, isDiffRun)
 	}
 
 	app, foundMigratedPrevApp, err := a.find(prevAppName + AppSuffix)
@@ -263,7 +269,7 @@ func (a *RecordedApp) RenamePrevApp(prevAppName string, labels map[string]string
 	}
 
 	if foundNonMigratedPrevApp {
-		if a.isMigrationEnabled() {
+		if a.isMigrationEnabled() && !isDiffRun {
 			return a.migrate(app, labels, a.fqName())
 		}
 		return a.renameConfigMap(app, a.name, a.nsName)