feat: use apply operation instead of create

Signed-off-by: minhthong582000 <[email protected]>
minhthong582000 · Nov 3, 2024 · 028a2e6 · 028a2e6
1 parent 690dc44
commit 028a2e6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/gitops/example/nginx/deployment.yaml b/gitops/example/nginx/deployment.yaml
@@ -24,5 +24,5 @@ spec:
               cpu: 100m
               memory: 128Mi
             limits:
-              cpu: 250m
+              cpu: 100m
               memory: 256Mi
diff --git a/gitops/internal/controller/controller.go b/gitops/internal/controller/controller.go
@@ -253,7 +253,7 @@ func (c *Controller) createResources(ctx context.Context, app *v1alpha1.Applicat
 		// Create resources
 		for _, r := range generatedResources {
 			// TODO: use namespace from application spec
-			err := c.k8sUtil.CreateResource(ctx, r, app.GetNamespace())
+			err = c.k8sUtil.CreateResource(ctx, r, app.GetNamespace())
 			if err != nil {
 				return fmt.Errorf("error creating resources: %s", err)
 			}

diff --git a/gitops/utils/kube/kube.go b/gitops/utils/kube/kube.go
@@ -62,7 +62,11 @@ func (k *k8s) CreateResource(ctx context.Context, obj *unstructured.Unstructured
 	if apiResource.Namespaced {
 		dynInterface = k.dynClientSet.Resource(resource).Namespace(namespace)
 	}
-	_, err = dynInterface.Create(ctx, obj, metav1.CreateOptions{})
+
+	opts := metav1.ApplyOptions{
+		FieldManager: "application/apply-patch",
+	}
+	_, err = dynInterface.Apply(ctx, obj.GetName(), obj, opts)
 	return err
 }