flow improvements

.ci/testruns/default/templates/testrun.yaml

@@ -25,12 +25,35 @@ spec:
 
   testflow:
   - name: infrastructure-test
+    definition:
+      name: infrastructure-test
+      config:
+        - name: REGION
+          type: env
+          value: europe-west1
+        - name: RECONCILER
+          type: env
+          value: tf
+  - name: infra-flow-test
+    definition:
+      name: infrastructure-test
+      config:
+        - name: REGION
+          type: env
+          value: europe-west1
+        - name: RECONCILER
+          type: env
+          value: flow
+  - name: infra-migrate-test
     definition:
       name: infrastructure-test
       config:
       - name: REGION
         type: env
         value: europe-west1
+      - name: RECONCILER
+        type: env
+        value: migrate
   - name: bastion-test
     definition:
       name: bastion-test

.golangci.yaml

@@ -27,3 +27,7 @@ issues:
   # typecheck:
   - "undeclared name: `.*`"
   - "\".*\" imported but not used"
+  exclude-rules:
+    - linters:
+        - staticcheck
+      text: "SA1019:" # Excludes messages where deprecated variables are used

.test-defs/infrastructure-test.yaml

@@ -5,6 +5,8 @@ spec:
   owner: gardener-oq@listserv.sap.com
   description: Integration test for infrastructure creation and deletion
   activeDeadlineSeconds: 1800
+  behavior:
+    - serial
 
   command: [bash, -c]
   args:
@@ -14,5 +16,6 @@ spec:
     --kubeconfig=$TM_KUBECONFIG_PATH/testmachinery.config
     --service-account="${SERVICEACCOUNT_JSON}"
     --region=$REGION
+    --reconciler=${RECONCILER}
 
   image: golang:1.22.1

Makefile

@@ -17,6 +17,7 @@ LD_FLAGS                    := "-w $(shell bash $(GARDENER_HACK_DIR)/get-build-l
 LEADER_ELECTION             := false
 IGNORE_OPERATION_ANNOTATION := true
 PLATFORM 					:= linux/amd64
+TEST_RECONCILER             := tf
 
 WEBHOOK_CONFIG_PORT	:= 8443
 WEBHOOK_CONFIG_MODE	:= url
@@ -63,7 +64,8 @@ start:
 		--heartbeat-renew-interval-seconds=30 \
 		--webhook-config-service-port=443 \
 		--metrics-bind-address=:8080 \
-		--health-bind-address=:8081
+		--health-bind-address=:8081 \
+		--log-level=debug
 
 
 .PHONY: start-admission
@@ -162,7 +164,8 @@ integration-test-infra:
 		--v -ginkgo.v -ginkgo.progress \
 		--kubeconfig=${KUBECONFIG} \
 		--service-account='$(shell cat $(SERVICE_ACCOUNT_FILE))' \
-		--region=$(REGION)
+		--region=$(REGION) \
+		--reconciler=$(TEST_RECONCILER)
 
 .PHONY: integration-test-bastion
 integration-test-bastion:

hack/api-reference/api.md

@@ -654,6 +654,33 @@ int32
 </tr>
 </tbody>
 </table>
+<h3 id="gcp.provider.extensions.gardener.cloud/v1alpha1.InfrastructureState">InfrastructureState
+</h3>
+<p>
+<p>InfrastructureState contains state information of the infrastructure resource.</p>
+</p>
+<table>
+<thead>
+<tr>
+<th>Field</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>
+<code>data</code></br>
+<em>
+map[string]string
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Data is map to store things.</p>
+</td>
+</tr>
+</tbody>
+</table>
 <h3 id="gcp.provider.extensions.gardener.cloud/v1alpha1.InfrastructureStatus">InfrastructureStatus
 </h3>
 <p>

pkg/apis/gcp/types_infrastructure.go

@@ -155,3 +155,13 @@ type FlowLogs struct {
 	// Metadata configures whether metadata fields should be added to the reported VPC flow logs.
 	Metadata *string
 }
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// InfrastructureState contains state information of the infrastructure resource.
+type InfrastructureState struct {
+	metav1.TypeMeta
+	// Data is map to store things.
+	// +optional
+	Data map[string]string
+}

pkg/apis/gcp/v1alpha1/types_infrastructure.go

@@ -164,3 +164,13 @@ type FlowLogs struct {
 	// +optional
 	Metadata *string `json:"metadata,omitempty"`
 }
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// InfrastructureState contains state information of the infrastructure resource.
+type InfrastructureState struct {
+	metav1.TypeMeta `json:",inline"`
+	// Data is map to store things.
+	// +optional
+	Data map[string]string `json:"data,omitempty"`
+}

pkg/controller/infrastructure/actuator.go

@@ -6,22 +6,17 @@ package infrastructure
 
 import (
 	"context"
-	"strings"
+	"fmt"
 
-	extensionscontroller "github.com/gardener/gardener/extensions/pkg/controller"
 	"github.com/gardener/gardener/extensions/pkg/controller/infrastructure"
+	"github.com/gardener/gardener/extensions/pkg/terraformer"
 	extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
-	"github.com/go-logr/logr"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"github.com/gardener/gardener-extension-provider-gcp/pkg/apis/gcp/v1alpha1"
-	"github.com/gardener/gardener-extension-provider-gcp/pkg/controller/infrastructure/infraflow"
-	"github.com/gardener/gardener-extension-provider-gcp/pkg/gcp"
-	"github.com/gardener/gardener-extension-provider-gcp/pkg/internal"
-	infrainternal "github.com/gardener/gardener-extension-provider-gcp/pkg/internal/infrastructure"
 )
 
 type actuator struct {
@@ -39,63 +34,37 @@ func NewActuator(mgr manager.Manager, disableProjectedTokenMount bool) infrastru
 	}
 }
 
-func (a *actuator) updateProviderStatus(
-	ctx context.Context,
-	infra *extensionsv1alpha1.Infrastructure,
-	status *v1alpha1.InfrastructureStatus,
-	state *runtime.RawExtension,
-) error {
-	patch := client.MergeFrom(infra.DeepCopy())
-	infra.Status.ProviderStatus = &runtime.RawExtension{Object: status}
-	infra.Status.State = state
-	return a.client.Status().Patch(ctx, infra, patch)
-}
-
-func (a *actuator) cleanupTerraformerResources(ctx context.Context, log logr.Logger, infra *extensionsv1alpha1.Infrastructure) error {
-	tf, err := internal.NewTerraformer(log, a.restConfig, infrainternal.TerraformerPurpose, infra, a.disableProjectedTokenMount)
-	if err != nil {
+// CleanupTerraformerResources deletes terraformer artifacts (config, state, secrets).
+func CleanupTerraformerResources(ctx context.Context, tf terraformer.Terraformer) error {
+	if err := tf.EnsureCleanedUp(ctx); err != nil {
 		return err
 	}
-
 	if err := tf.CleanupConfiguration(ctx); err != nil {
 		return err
 	}
-
-	return tf.RemoveTerraformerFinalizerFromConfig(ctx) // Explicitly clean up the terraformer finalizers
+	return tf.RemoveTerraformerFinalizerFromConfig(ctx)
 }
 
-func getFlowStateFromInfrastructureStatus(infrastructure *extensionsv1alpha1.Infrastructure) (*infraflow.FlowState, error) {
-	if infrastructure.Status.State == nil || len(infrastructure.Status.State.Raw) == 0 {
-		return nil, nil
-	}
-
-	stateJSON, err := infrastructure.Status.State.MarshalJSON()
-	if err != nil {
-		return nil, err
-	}
-
-	isFlowState, err := infraflow.IsJSONFlowState(stateJSON)
-	if err != nil {
-		return nil, err
-	}
-	if isFlowState {
-		return infraflow.NewFlowStateFromJSON(stateJSON)
+func patchProviderStatusAndState(
+	ctx context.Context,
+	runtimeClient client.Client,
+	infra *extensionsv1alpha1.Infrastructure,
+	status *v1alpha1.InfrastructureStatus,
+	state *runtime.RawExtension,
+) error {
+	patch := client.MergeFrom(infra.DeepCopy())
+	if status != nil {
+		infra.Status.ProviderStatus = &runtime.RawExtension{Object: status}
 	}
-
-	return nil, nil
-}
-
-func shouldUseFlow(infra *extensionsv1alpha1.Infrastructure, cluster *extensionscontroller.Cluster) (bool, error) {
-	state, err := getFlowStateFromInfrastructureStatus(infra)
-	if err != nil {
-		return false, err
+	if state != nil {
+		infra.Status.State = state
 	}
 
-	if state != nil {
-		return true, nil
+	if data, err := patch.Data(infra); err != nil {
+		return fmt.Errorf("failed getting patch data for infra %s: %w", infra.Name, err)
+	} else if string(data) == `{}` {
+		return nil
 	}
 
-	return strings.EqualFold(infra.Annotations[gcp.AnnotationKeyUseFlow], "true") ||
-		(cluster.Shoot != nil && strings.EqualFold(cluster.Shoot.Annotations[gcp.AnnotationKeyUseFlow], "true")) ||
-		(cluster.Seed != nil && strings.EqualFold(cluster.Seed.Labels[gcp.SeedLabelKeyUseFlow], "true")), nil
+	return runtimeClient.Status().Patch(ctx, infra, patch)
 }