Merge branch 'main' into fix-include-needs-transitive-1003

pkg/config/apply.go

@@ -57,6 +57,8 @@ type ApplyOptions struct {
 	WaitRetries int
 	// WaitForJobs is true if the helm command should wait for the jobs to be completed
 	WaitForJobs bool
+	// Timeout is the timeout for helm operations in seconds
+	Timeout int
 	// Propagate '--skip-schema-validation' to helmv3 template and helm install
 	SkipSchemaValidation bool
 	// ReuseValues is true if the helm command should reuse the values
@@ -86,6 +88,8 @@ type ApplyOptions struct {
 	TrackTimeout int
 	// TrackLogs enables log streaming with kubedog
 	TrackLogs bool
+	// Description is the description that will be passed to helm upgrade --description
+	Description string
 }
 
 // NewApply creates a new Apply
@@ -235,6 +239,11 @@ func (a *ApplyImpl) WaitForJobs() bool {
 	return a.ApplyOptions.WaitForJobs
 }
 
+// Timeout returns the timeout.
+func (a *ApplyImpl) Timeout() int {
+	return a.ApplyOptions.Timeout
+}
+
 // ReuseValues returns the ReuseValues.
 func (a *ApplyImpl) ReuseValues() bool {
 	if !a.ResetValues() {
@@ -307,6 +316,11 @@ func (a *ApplyImpl) TrackLogs() bool {
 	return a.ApplyOptions.TrackLogs
 }
 
+// Description returns the description.
+func (a *ApplyImpl) Description() string {
+	return a.ApplyOptions.Description
+}
+
 func (a *ApplyImpl) ValidateConfig() error {
 	validTrackModes := []string{"helm", "helm-legacy", "kubedog"}
 	if a.ApplyOptions.TrackMode != "" && !slices.Contains(validTrackModes, a.ApplyOptions.TrackMode) {

pkg/config/sync.go

@@ -59,6 +59,8 @@ type SyncOptions struct {
 	TrackTimeout int
 	// TrackLogs enables log streaming with kubedog
 	TrackLogs bool
+	// Description is the description that will be passed to helm upgrade --description
+	Description string
 }
 
 // NewSyncOptions creates a new Apply
@@ -214,6 +216,11 @@ func (t *SyncImpl) TrackLogs() bool {
 	return t.SyncOptions.TrackLogs
 }
 
+// Description returns the description.
+func (t *SyncImpl) Description() string {
+	return t.SyncOptions.Description
+}
+
 func (t *SyncImpl) ValidateConfig() error {
 	validTrackModes := []string{"helm", "helm-legacy", "kubedog"}
 	if t.SyncOptions.TrackMode != "" && !slices.Contains(validTrackModes, t.SyncOptions.TrackMode) {