Fixed to add annotations after calling loader.LoadManifests (#5777)

Signed-off-by: Yoshiki Fujikane <[email protected]>

Author: ffjlabo

pkg/app/pipedv1/plugin/kubernetes/deployment/plugin.go

@@ -114,6 +114,25 @@ func (p *Plugin) loadManifests(ctx context.Context, deploy *sdk.Deployment, spec
 		return nil, err
 	}
 
+	// Add builtin labels and annotations for tracking application live state.
+	for i := range manifests {
+		manifests[i].AddLabels(map[string]string{
+			provider.LabelManagedBy:   provider.ManagedByPiped,
+			provider.LabelPiped:       deploy.PipedID,
+			provider.LabelApplication: deploy.ApplicationID,
+			provider.LabelCommitHash:  deploymentSource.CommitHash,
+		})
+
+		manifests[i].AddAnnotations(map[string]string{
+			provider.LabelManagedBy:          provider.ManagedByPiped,
+			provider.LabelPiped:              deploy.PipedID,
+			provider.LabelApplication:        deploy.ApplicationID,
+			provider.LabelOriginalAPIVersion: manifests[i].APIVersion(),
+			provider.LabelResourceKey:        manifests[i].Key().String(),
+			provider.LabelCommitHash:         deploymentSource.CommitHash,
+		})
+	}
+
 	return manifests, nil
 }
 

pkg/app/pipedv1/plugin/kubernetes/provider/loader.go

@@ -91,23 +91,6 @@ func (l *Loader) LoadManifests(ctx context.Context, input LoaderInput) (manifest
 			if input.Namespace != "" {
 				manifests[i].body.SetNamespace(input.Namespace)
 			}
-
-			// Add builtin labels and annotations for tracking application live state.
-			manifests[i].AddLabels(map[string]string{
-				LabelManagedBy:   ManagedByPiped,
-				LabelPiped:       input.PipedID,
-				LabelApplication: input.AppID,
-				LabelCommitHash:  input.CommitHash,
-			})
-
-			manifests[i].AddAnnotations(map[string]string{
-				LabelManagedBy:          ManagedByPiped,
-				LabelPiped:              input.PipedID,
-				LabelApplication:        input.AppID,
-				LabelOriginalAPIVersion: manifests[i].body.GetAPIVersion(),
-				LabelResourceKey:        manifests[i].Key().String(),
-				LabelCommitHash:         input.CommitHash,
-			})
 		}
 
 		sortManifests(manifests)

pkg/app/pipedv1/plugin/kubernetes/provider/manifest.go

@@ -65,6 +65,10 @@ func (m Manifest) Kind() string {
 	return m.body.GetKind()
 }
 
+func (m Manifest) APIVersion() string {
+	return m.body.GetAPIVersion()
+}
+
 func (m Manifest) Name() string {
 	return m.body.GetName()
 }

pkg/app/pipedv1/plugin/kubernetes_multicluster/deployment/plugin.go

@@ -98,6 +98,25 @@ func (p *Plugin) loadManifests(ctx context.Context, deploy *sdk.Deployment, spec
 		return nil, err
 	}
 
+	// Add builtin labels and annotations for tracking application live state.
+	for i := range manifests {
+		manifests[i].AddLabels(map[string]string{
+			provider.LabelManagedBy:   provider.ManagedByPiped,
+			provider.LabelPiped:       deploy.PipedID,
+			provider.LabelApplication: deploy.ApplicationID,
+			provider.LabelCommitHash:  deploymentSource.CommitHash,
+		})
+
+		manifests[i].AddAnnotations(map[string]string{
+			provider.LabelManagedBy:          provider.ManagedByPiped,
+			provider.LabelPiped:              deploy.PipedID,
+			provider.LabelApplication:        deploy.ApplicationID,
+			provider.LabelOriginalAPIVersion: manifests[i].APIVersion(),
+			provider.LabelResourceKey:        manifests[i].Key().String(),
+			provider.LabelCommitHash:         deploymentSource.CommitHash,
+		})
+	}
+
 	return manifests, nil
 }
 

pkg/app/pipedv1/plugin/kubernetes_multicluster/provider/loader.go

@@ -91,23 +91,6 @@ func (l *Loader) LoadManifests(ctx context.Context, input LoaderInput) (manifest
 			if input.Namespace != "" {
 				manifests[i].body.SetNamespace(input.Namespace)
 			}
-
-			// Add builtin labels and annotations for tracking application live state.
-			manifests[i].AddLabels(map[string]string{
-				LabelManagedBy:   ManagedByPiped,
-				LabelPiped:       input.PipedID,
-				LabelApplication: input.AppID,
-				LabelCommitHash:  input.CommitHash,
-			})
-
-			manifests[i].AddAnnotations(map[string]string{
-				LabelManagedBy:          ManagedByPiped,
-				LabelPiped:              input.PipedID,
-				LabelApplication:        input.AppID,
-				LabelOriginalAPIVersion: manifests[i].body.GetAPIVersion(),
-				LabelResourceKey:        manifests[i].Key().String(),
-				LabelCommitHash:         input.CommitHash,
-			})
 		}
 
 		sortManifests(manifests)

pkg/app/pipedv1/plugin/kubernetes_multicluster/provider/manifest.go

@@ -65,6 +65,10 @@ func (m Manifest) Kind() string {
 	return m.body.GetKind()
 }
 
+func (m Manifest) APIVersion() string {
+	return m.body.GetAPIVersion()
+}
+
 func (m Manifest) Name() string {
 	return m.body.GetName()
 }