Merge pull request #494 from siiimooon/feature/enable-tf-parallelism

feat: enable parallelism option for TF apply stage

Author: Chanwit Kaewkasi

api/v1alpha1/terraform_types.go

@@ -212,6 +212,11 @@ type TerraformSpec struct {
 	// +optional
 	Targets []string `json:"targets,omitempty"`
 
+	// Parallelism limits the number of concurrent operations of Terraform apply step. Zero (0) means using the default value.
+	// +kubebuilder:default:=0
+	// +optional
+	Parallelism int32 `json:"parallelism,omitempty"`
+
 	// StoreReadablePlan enables storing the plan in a readable format.
 	// +kubebuilder:validation:Enum=none;json;human
 	// +kubebuilder:default:=none

config/crd/bases/infra.contrib.fluxcd.io_terraforms.yaml

@@ -244,6 +244,12 @@ spec:
               interval:
                 description: The interval at which to reconcile the Terraform.
                 type: string
+              parallelism:
+                default: 0
+                description: Parallelism limits the number of concurrent operations
+                  of Terraform apply step. Zero (0) means using the default value.
+                format: int32
+                type: integer
               path:
                 description: Path to the directory containing Terraform (.tf) files.
                   Defaults to 'None', which translates to the root path of the SourceRef.

config/crd/bases/ocirepositories.yaml

@@ -301,12 +301,14 @@ spec:
                   type: object
                 type: array
               contentConfigChecksum:
-                description: 'ContentConfigChecksum is a checksum of all the configurations
+                description: "ContentConfigChecksum is a checksum of all the configurations
                   related to the content of the source artifact: - .spec.ignore -
                   .spec.layerSelector observed in .status.observedGeneration version
                   of the object. This can be used to determine if the content configuration
                   has changed and the artifact needs to be rebuilt. It has the format
-                  of `<algo>:<checksum>`, for example: `sha256:<checksum>`.'
+                  of `<algo>:<checksum>`, for example: `sha256:<checksum>`. \n Deprecated:
+                  Replaced with explicit fields for observed artifact content config
+                  in the status."
                 type: string
               lastHandledReconcileAt:
                 description: LastHandledReconcileAt holds the value of the most recent
@@ -317,6 +319,29 @@ spec:
                 description: ObservedGeneration is the last observed generation.
                 format: int64
                 type: integer
+              observedIgnore:
+                description: ObservedIgnore is the observed exclusion patterns used
+                  for constructing the source artifact.
+                type: string
+              observedLayerSelector:
+                description: ObservedLayerSelector is the observed layer selector
+                  used for constructing the source artifact.
+                properties:
+                  mediaType:
+                    description: MediaType specifies the OCI media type of the layer
+                      which should be extracted from the OCI Artifact. The first layer
+                      matching this type is selected.
+                    type: string
+                  operation:
+                    description: Operation specifies how the selected layer should
+                      be processed. By default, the layer compressed content is extracted
+                      to storage. When the operation is set to 'copy', the layer compressed
+                      content is persisted to storage as it is.
+                    enum:
+                    - extract
+                    - copy
+                    type: string
+                type: object
               url:
                 description: URL is the download link for the artifact output of the
                   last OCI Repository sync.

controllers/tf_controller_apply.go

@@ -76,6 +76,7 @@ func (r *TerraformReconciler) apply(ctx context.Context, terraform infrav1.Terra
 
 	applyRequest := &runner.ApplyRequest{
 		TfInstance:         tfInstance,
+		Parallelism:        terraform.Spec.Parallelism,
 		RefreshBeforeApply: terraform.Spec.RefreshBeforeApply,
 		Targets:            terraform.Spec.Targets,
 	}

docs/References/terraform.md

@@ -1478,6 +1478,18 @@ TFStateSpec
 </tr>
 <tr>
 <td>
+<code>parallelism</code><br>
+<em>
+int32
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Parallelism limits the number of concurrent operations of Terraform apply step.</p>
+</td>
+</tr>
+<tr>
+<td>
 <code>storeReadablePlan</code><br>
 <em>
 string
@@ -1514,6 +1526,20 @@ string
 <em>(Optional)</em>
 </td>
 </tr>
+<tr>
+<td>
+<code>enterprise</code><br>
+<em>
+<a href="https://pkg.go.dev/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1?tab=doc#JSON">
+Kubernetes pkg/apis/apiextensions/v1.JSON
+</a>
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Enterprise is the enterprise configuration placeholder.</p>
+</td>
+</tr>
 </table>
 </td>
 </tr>
@@ -1936,6 +1962,18 @@ TFStateSpec
 </tr>
 <tr>
 <td>
+<code>parallelism</code><br>
+<em>
+int32
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Parallelism limits the number of concurrent operations of Terraform apply step.</p>
+</td>
+</tr>
+<tr>
+<td>
 <code>storeReadablePlan</code><br>
 <em>
 string
@@ -1972,6 +2010,20 @@ string
 <em>(Optional)</em>
 </td>
 </tr>
+<tr>
+<td>
+<code>enterprise</code><br>
+<em>
+<a href="https://pkg.go.dev/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1?tab=doc#JSON">
+Kubernetes pkg/apis/apiextensions/v1.JSON
+</a>
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Enterprise is the enterprise configuration placeholder.</p>
+</td>
+</tr>
 </tbody>
 </table>
 </div>