ensure --force flag updates values.yaml when manager specs change

Author: sarthaksarthak9

docs/book/src/cronjob-tutorial/testdata/project/dist/chart/values.yaml

@@ -1,13 +1,12 @@
 # [MANAGER]: Manager Deployment Configurations
 controllerManager:
-  replicas: 1
+  replicas:1
   container:
     image:
       repository: controller
       tag: latest
     args:
       - "--leader-elect"
-      - "--metrics-bind-address=:8443"
       - "--health-probe-bind-address=:8081"
     resources:
       limits:
@@ -37,7 +36,7 @@ controllerManager:
     runAsNonRoot: true
     seccompProfile:
       type: RuntimeDefault
-  terminationGracePeriodSeconds: 10
+  terminationGracePeriodSeconds:10
   serviceAccountName: project-controller-manager
 
 # [RBAC]: To enable RBAC (Permissions) configurations

docs/book/src/getting-started/testdata/project/dist/chart/values.yaml

@@ -1,13 +1,12 @@
 # [MANAGER]: Manager Deployment Configurations
 controllerManager:
-  replicas: 1
+  replicas:1
   container:
     image:
       repository: controller
       tag: latest
     args:
       - "--leader-elect"
-      - "--metrics-bind-address=:8443"
       - "--health-probe-bind-address=:8081"
     resources:
       limits:
@@ -37,7 +36,7 @@ controllerManager:
     runAsNonRoot: true
     seccompProfile:
       type: RuntimeDefault
-  terminationGracePeriodSeconds: 10
+  terminationGracePeriodSeconds:10
   serviceAccountName: project-controller-manager
 
 # [RBAC]: To enable RBAC (Permissions) configurations

docs/book/src/multiversion-tutorial/testdata/project/dist/chart/values.yaml

@@ -1,13 +1,12 @@
 # [MANAGER]: Manager Deployment Configurations
 controllerManager:
-  replicas: 1
+  replicas:1
   container:
     image:
       repository: controller
       tag: latest
     args:
       - "--leader-elect"
-      - "--metrics-bind-address=:8443"
       - "--health-probe-bind-address=:8081"
     resources:
       limits:
@@ -37,7 +36,7 @@ controllerManager:
     runAsNonRoot: true
     seccompProfile:
       type: RuntimeDefault
-  terminationGracePeriodSeconds: 10
+  terminationGracePeriodSeconds:10
   serviceAccountName: project-controller-manager
 
 # [RBAC]: To enable RBAC (Permissions) configurations

pkg/plugins/optional/helm/v1alpha/edit.go

@@ -53,6 +53,13 @@ dist/chart/
     └── manager/
         └── manager.yaml
 
+When the "--force" flag is used, values.yaml will be updated to reflect changes made to config/manager/manager.yaml,
+including any changes to:
+  - Replica count
+  - Container resource requests and limits
+  - Container arguments
+  - Termination grace period
+
 The following files are never updated after their initial creation:
   - chart/Chart.yaml
   - chart/templates/_helpers.tpl

pkg/plugins/optional/helm/v1alpha/scaffolds/init.go

@@ -21,6 +21,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"strconv"
 	"strings"
 
 	"sigs.k8s.io/yaml"
@@ -50,13 +51,17 @@ type initScaffolder struct {
 	fs machinery.Filesystem
 
 	force bool
+
+	// Store manager specs extracted from config/manager/manager.yaml
+	managerSpecs map[string]interface{}
 }
 
 // NewInitHelmScaffolder returns a new Scaffolder for HelmPlugin
 func NewInitHelmScaffolder(cfg config.Config, force bool) plugins.Scaffolder {
 	return &initScaffolder{
-		config: cfg,
-		force:  force,
+		config:       cfg,
+		force:        force,
+		managerSpecs: make(map[string]interface{}),
 	}
 }
 
@@ -69,6 +74,11 @@ func (s *initScaffolder) InjectFS(fs machinery.Filesystem) {
 func (s *initScaffolder) Scaffold() error {
 	log.Println("Generating Helm Chart to distribute project")
 
+	// Read manager specs from config/manager/manager.yaml
+	if err := s.readManagerSpecs(); err != nil {
+		log.Printf("Warning: %v", err)
+	}
+
 	imagesEnvVars := s.getDeployImagesEnvVars()
 
 	scaffold := machinery.NewScaffold(s.fs,
@@ -89,6 +99,7 @@ func (s *initScaffolder) Scaffold() error {
 			HasWebhooks:  hasWebhooks,
 			DeployImages: imagesEnvVars,
 			Force:        s.force,
+			ManagerSpecs: s.managerSpecs,
 		},
 		&templates.HelmIgnore{},
 		&charttemplates.HelmHelpers{},
@@ -560,3 +571,127 @@ func hasWebhooksWith(c config.Config) bool {
 
 	return false
 }
+
+// readManagerSpecs reads the manager.yaml file from config/manager/manager.yaml
+// and extracts relevant specs to be used in values.yaml generation
+func (s *initScaffolder) readManagerSpecs() error {
+	managerFilePath := "config/manager/manager.yaml"
+
+	// Check if the manager.yaml file exists
+	if _, err := os.Stat(managerFilePath); os.IsNotExist(err) {
+		return fmt.Errorf("manager file not found at %s", managerFilePath)
+	}
+
+	// Read the manager.yaml file
+	content, err := os.ReadFile(managerFilePath)
+	if err != nil {
+		return fmt.Errorf("failed to read manager file %s: %w", managerFilePath, err)
+	}
+
+	// Split the file by "---" to handle multiple YAML documents
+	docs := strings.Split(string(content), "---")
+
+	// Look for the Deployment document
+	for _, doc := range docs {
+		if strings.TrimSpace(doc) == "" {
+			continue
+		}
+
+		var obj map[string]interface{}
+		if err := yaml.Unmarshal([]byte(doc), &obj); err != nil {
+			log.Printf("Error unmarshalling YAML document: %v", err)
+			continue
+		}
+
+		// Check if this is the Deployment
+		kind, ok := obj["kind"].(string)
+		if !ok || kind != "Deployment" {
+			continue
+		}
+
+		// Extract specs
+		if spec, ok := obj["spec"].(map[string]interface{}); ok {
+			// Extract replicas
+			s.extractReplicas(spec)
+			// Extract template specs
+			s.extractTemplateSpecs(spec)
+		}
+
+		log.Printf("Successfully extracted manager specs from %s", managerFilePath)
+		return nil
+	}
+
+	return fmt.Errorf("deployment not found in manager.yaml")
+}
+
+// extractReplicas extracts the replicas count from the deployment spec
+func (s *initScaffolder) extractReplicas(spec map[string]interface{}) {
+	if replicas, ok := spec["replicas"]; ok {
+		// Handle different types
+		switch v := replicas.(type) {
+		case int:
+			s.managerSpecs["replicas"] = v
+		case int64:
+			s.managerSpecs["replicas"] = int(v)
+		case float64: // YAML often unmarshals numbers as float64
+			s.managerSpecs["replicas"] = int(v)
+		case string:
+			// Try to convert string to int
+			if val, err := strconv.Atoi(v); err == nil {
+				s.managerSpecs["replicas"] = val
+			}
+		}
+	}
+}
+
+// extractTemplateSpecs extracts specs from the template section
+func (s *initScaffolder) extractTemplateSpecs(spec map[string]interface{}) {
+	if template, ok := spec["template"].(map[string]interface{}); ok {
+		if templateSpec, ok := template["spec"].(map[string]interface{}); ok {
+			// Extract terminationGracePeriodSeconds
+			s.extractTerminationGracePeriod(templateSpec)
+			// Extract container specs
+			s.extractContainerSpecs(templateSpec)
+		}
+	}
+}
+
+// extractTerminationGracePeriod extracts the terminationGracePeriodSeconds value
+func (s *initScaffolder) extractTerminationGracePeriod(templateSpec map[string]interface{}) {
+	if terminationGracePeriod, ok := templateSpec["terminationGracePeriodSeconds"]; ok {
+		switch v := terminationGracePeriod.(type) {
+		case int:
+			s.managerSpecs["terminationGracePeriodSeconds"] = v
+		case int64:
+			s.managerSpecs["terminationGracePeriodSeconds"] = int(v)
+		case float64:
+			s.managerSpecs["terminationGracePeriodSeconds"] = int(v)
+		}
+	}
+}
+
+// extractContainerSpecs extracts specs from the first container
+func (s *initScaffolder) extractContainerSpecs(templateSpec map[string]interface{}) {
+	if containers, ok := templateSpec["containers"].([]interface{}); ok && len(containers) > 0 {
+		if container, ok := containers[0].(map[string]interface{}); ok {
+			// Extract resources
+			s.extractResources(container)
+			// Extract args
+			if args, ok := container["args"].([]interface{}); ok && len(args) > 0 {
+				s.managerSpecs["args"] = args
+			}
+		}
+	}
+}
+
+// extractResources extracts resource limits and requests
+func (s *initScaffolder) extractResources(container map[string]interface{}) {
+	if resources, ok := container["resources"].(map[string]interface{}); ok {
+		if limits, ok := resources["limits"].(map[string]interface{}); ok && len(limits) > 0 {
+			s.managerSpecs["resources.limits"] = limits
+		}
+		if requests, ok := resources["requests"].(map[string]interface{}); ok && len(requests) > 0 {
+			s.managerSpecs["resources.requests"] = requests
+		}
+	}
+}

pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/values.go

@@ -34,6 +34,8 @@ type HelmValues struct {
 	Force bool
 	// HasWebhooks is true when webhooks were found in the config
 	HasWebhooks bool
+	// ManagerSpecs contains specs from the manager.yaml that should be reflected in values.yaml
+	ManagerSpecs map[string]interface{}
 }
 
 // SetTemplateDefaults implements machinery.Template
@@ -54,22 +56,44 @@ func (f *HelmValues) SetTemplateDefaults() error {
 
 const helmValuesTemplate = `# [MANAGER]: Manager Deployment Configurations
 controllerManager:
-  replicas: 1
+  replicas: {{- if and .ManagerSpecs (index .ManagerSpecs "replicas") -}}
+    {{ index .ManagerSpecs "replicas" }}
+  {{- else -}}
+    1
+  {{- end }}
   container:
     image:
       repository: controller
       tag: latest
     args:
+{{- if and .ManagerSpecs (index .ManagerSpecs "args") }}
+{{- range $arg := index .ManagerSpecs "args" }}
+      - "{{ $arg }}"
+{{- end }}
+{{- else }}
       - "--leader-elect"
       - "--metrics-bind-address=:8443"
       - "--health-probe-bind-address=:8081"
+{{- end }}
     resources:
       limits:
+{{- if and .ManagerSpecs (index .ManagerSpecs "resources.limits") }}
+{{- range $key, $value := index .ManagerSpecs "resources.limits" }}
+        {{ $key }}: {{ $value }}
+{{- end }}
+{{- else }}
         cpu: 500m
         memory: 128Mi
+{{- end }}
       requests:
+{{- if and .ManagerSpecs (index .ManagerSpecs "resources.requests") }}
+{{- range $key, $value := index .ManagerSpecs "resources.requests" }}
+        {{ $key }}: {{ $value }}
+{{- end }}
+{{- else }}
         cpu: 10m
         memory: 64Mi
+{{- end }}
     livenessProbe:
       initialDelaySeconds: 15
       periodSeconds: 20
@@ -97,7 +121,11 @@ controllerManager:
     runAsNonRoot: true
     seccompProfile:
       type: RuntimeDefault
-  terminationGracePeriodSeconds: 10
+  terminationGracePeriodSeconds: {{- if and .ManagerSpecs (index .ManagerSpecs "terminationGracePeriodSeconds") -}}
+    {{ index .ManagerSpecs "terminationGracePeriodSeconds" }}
+  {{- else -}}
+    10
+  {{- end }}
   serviceAccountName: {{ .ProjectName }}-controller-manager
 
 # [RBAC]: To enable RBAC (Permissions) configurations

testdata/project-v4-with-plugins/dist/chart/values.yaml

@@ -1,13 +1,12 @@
 # [MANAGER]: Manager Deployment Configurations
 controllerManager:
-  replicas: 1
+  replicas:1
   container:
     image:
       repository: controller
       tag: latest
     args:
       - "--leader-elect"
-      - "--metrics-bind-address=:8443"
       - "--health-probe-bind-address=:8081"
     resources:
       limits:
@@ -40,7 +39,7 @@ controllerManager:
     runAsNonRoot: true
     seccompProfile:
       type: RuntimeDefault
-  terminationGracePeriodSeconds: 10
+  terminationGracePeriodSeconds:10
   serviceAccountName: project-v4-with-plugins-controller-manager
 
 # [RBAC]: To enable RBAC (Permissions) configurations