Skip to content

remove terraformer#1617

Merged
AndreasBurger merged 3 commits intogardener:masterfrom
kon-angelo:terraform-removal
Jan 26, 2026
Merged

remove terraformer#1617
AndreasBurger merged 3 commits intogardener:masterfrom
kon-angelo:terraform-removal

Conversation

@kon-angelo
Copy link
Copy Markdown
Contributor

@kon-angelo kon-angelo commented Dec 22, 2025

How to categorize this PR?

/area control-plane
/kind enhancement
/platform aws

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Release note:

Remove terraformer reconciler for infrastructure resources

@kon-angelo kon-angelo requested a review from a team as a code owner December 22, 2025 19:05
@kon-angelo
Copy link
Copy Markdown
Contributor Author

/test

@gardener-robot gardener-robot added area/control-plane Control plane related kind/enhancement Enhancement, improvement, extension platform/aws Amazon web services platform/infrastructure labels Dec 22, 2025
@testmachinery
Copy link
Copy Markdown

testmachinery bot commented Dec 22, 2025

Testrun: e2e-7xs7b
Workflow: e2e-7xs7b-wf
Phase: Failed

+---------------------+---------------------+-----------+----------+
|        NAME         |        STEP         |   PHASE   | DURATION |
+---------------------+---------------------+-----------+----------+
| infrastructure-test | infrastructure-test | Failed    | 34m11s   |
| backupbucket-test   | backupbucket-test   | Succeeded | 8m58s    |
| bastion-test        | bastion-test        | Succeeded | 11m28s   |
| dnsrecord-test      | dnsrecord-test      | Succeeded | 7m15s    |
+---------------------+---------------------+-----------+----------+

@gardener-robot gardener-robot added needs/review Needs review size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 22, 2025
@ghost ghost added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Dec 22, 2025
@gardener-robot gardener-robot added the needs/second-opinion Needs second review by someone else label Dec 22, 2025
@github-actions github-actions bot added needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Dec 22, 2025
@gardener-ci-robot
Copy link
Copy Markdown

The Gardener project currently lacks enough active contributors to adequately respond to all PRs.
This bot triages PRs according to the following rules:

  • After 15d of inactivity, lifecycle/stale is applied
  • After 15d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
  • After 7d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

  • Mark this PR as fresh with /remove-lifecycle stale
  • Mark this PR as rotten with /lifecycle rotten
  • Close this PR with /close

/lifecycle stale

@gardener-robot gardener-robot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jan 6, 2026
@kon-angelo
Copy link
Copy Markdown
Contributor Author

/test

@testmachinery
Copy link
Copy Markdown

testmachinery bot commented Jan 12, 2026

Testrun: e2e-z9lqh
Workflow: e2e-z9lqh-wf
Phase: Failed

+---------------------+---------------------+-----------+----------+
|        NAME         |        STEP         |   PHASE   | DURATION |
+---------------------+---------------------+-----------+----------+
| infrastructure-test | infrastructure-test | Failed    | 31m27s   |
| backupbucket-test   | backupbucket-test   | Succeeded | 6m38s    |
| bastion-test        | bastion-test        | Succeeded | 9m8s     |
| dnsrecord-test      | dnsrecord-test      | Succeeded | 9m32s    |
+---------------------+---------------------+-----------+----------+

@hebelsan
Copy link
Copy Markdown
Contributor

The tests will probably fail, because a rebase is needed :/

@ghost ghost added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jan 12, 2026
@github-actions github-actions bot removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jan 12, 2026
@kon-angelo
Copy link
Copy Markdown
Contributor Author

@hebelsan true, I though I had done it before. Let's see again

@kon-angelo
Copy link
Copy Markdown
Contributor Author

/test

@testmachinery
Copy link
Copy Markdown

testmachinery bot commented Jan 12, 2026

Testrun: e2e-dspzx
Workflow: e2e-dspzx-wf
Phase: Failed

+---------------------+---------------------+-----------+----------+
|        NAME         |        STEP         |   PHASE   | DURATION |
+---------------------+---------------------+-----------+----------+
| bastion-test        | bastion-test        | Succeeded | 6m45s    |
| dnsrecord-test      | dnsrecord-test      | Succeeded | 7m20s    |
| infrastructure-test | infrastructure-test | Failed    | 35m59s   |
| backupbucket-test   | backupbucket-test   | Succeeded | 6m22s    |
+---------------------+---------------------+-----------+----------+

@hebelsan
Copy link
Copy Markdown
Contributor

/test

@gardener-prow
Copy link
Copy Markdown

gardener-prow bot commented Jan 13, 2026

@hebelsan: No presubmit jobs available for gardener/gardener-extension-provider-aws@master

Details

In response to this:

/test

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@testmachinery
Copy link
Copy Markdown

testmachinery bot commented Jan 13, 2026

Testrun: e2e-fplzd
Workflow: e2e-fplzd-wf
Phase: Failed

+---------------------+---------------------+-----------+----------+
|        NAME         |        STEP         |   PHASE   | DURATION |
+---------------------+---------------------+-----------+----------+
| backupbucket-test   | backupbucket-test   | Succeeded | 6m24s    |
| bastion-test        | bastion-test        | Succeeded | 8m45s    |
| dnsrecord-test      | dnsrecord-test      | Succeeded | 9m15s    |
| infrastructure-test | infrastructure-test | Failed    | 35m1s    |
+---------------------+---------------------+-----------+----------+

@gardener-prow gardener-prow bot added cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 13, 2026
@kon-angelo
Copy link
Copy Markdown
Contributor Author

/test

@gardener-prow
Copy link
Copy Markdown

gardener-prow bot commented Jan 19, 2026

@kon-angelo: No presubmit jobs available for gardener/gardener-extension-provider-aws@master

Details

In response to this:

/test

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@testmachinery
Copy link
Copy Markdown

testmachinery bot commented Jan 19, 2026

Testrun: e2e-mqqrr
Workflow: e2e-mqqrr-wf
Phase: Failed

+---------------------+---------------------+-----------+----------+
|        NAME         |        STEP         |   PHASE   | DURATION |
+---------------------+---------------------+-----------+----------+
| infrastructure-test | infrastructure-test | Failed    | 1h1m41s  |
| backupbucket-test   | backupbucket-test   | Succeeded | 6m20s    |
| bastion-test        | bastion-test        | Succeeded | 8m33s    |
| dnsrecord-test      | dnsrecord-test      | Succeeded | 7m35s    |
+---------------------+---------------------+-----------+----------+

@kon-angelo
Copy link
Copy Markdown
Contributor Author

/test

@gardener-prow
Copy link
Copy Markdown

gardener-prow bot commented Jan 19, 2026

@kon-angelo: No presubmit jobs available for gardener/gardener-extension-provider-aws@master

Details

In response to this:

/test

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@testmachinery
Copy link
Copy Markdown

testmachinery bot commented Jan 19, 2026

Testrun: e2e-4r99m
Workflow: e2e-4r99m-wf
Phase: Succeeded

+---------------------+---------------------+-----------+----------+
|        NAME         |        STEP         |   PHASE   | DURATION |
+---------------------+---------------------+-----------+----------+
| infrastructure-test | infrastructure-test | Succeeded | 49m45s   |
| backupbucket-test   | backupbucket-test   | Succeeded | 9m34s    |
| bastion-test        | bastion-test        | Succeeded | 12m21s   |
| dnsrecord-test      | dnsrecord-test      | Succeeded | 7m6s     |
+---------------------+---------------------+-----------+----------+

@kon-angelo
Copy link
Copy Markdown
Contributor Author

/test

@gardener-prow
Copy link
Copy Markdown

gardener-prow bot commented Jan 19, 2026

@kon-angelo: No presubmit jobs available for gardener/gardener-extension-provider-aws@master

Details

In response to this:

/test

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@testmachinery
Copy link
Copy Markdown

testmachinery bot commented Jan 19, 2026

Testrun: e2e-wkmps
Workflow: e2e-wkmps-wf
Phase: Succeeded

+---------------------+---------------------+-----------+----------+
|        NAME         |        STEP         |   PHASE   | DURATION |
+---------------------+---------------------+-----------+----------+
| infrastructure-test | infrastructure-test | Succeeded | 44m43s   |
| backupbucket-test   | backupbucket-test   | Succeeded | 6m36s    |
| bastion-test        | bastion-test        | Succeeded | 6m26s    |
| dnsrecord-test      | dnsrecord-test      | Succeeded | 9m29s    |
+---------------------+---------------------+-----------+----------+

Copy link
Copy Markdown
Contributor

@hebelsan hebelsan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice work! 👍
Just two small comments.

--access-key-id='$(shell cat $(ACCESS_KEY_ID_FILE))' \
--secret-access-key='$(shell cat $(SECRET_ACCESS_KEY_FILE))' \
--region=$(REGION) \
--reconciler=$(RECONCILER)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's get rid of the whole variable $RECONCILER since it has no more usage.

if err != nil {
return err
}
// TODO optimisation: check if cleanup is necessary
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a TODO for this PR?

@github-actions
Copy link
Copy Markdown
Contributor

This change removes the terraformer-based infrastructure reconciliation mechanism and replaces it with a flow-based approach, eliminating the dual reconciler system and associated complexity. The update removes terraform configuration templates, terraformer dependencies, and flow selection logic, while consolidating infrastructure management into a single unified approach.

Walkthrough

  • Refactor: Migrated infrastructure controller from dual reconciler (terraformer/flow) to single flow-based reconciliation, removing terraform templates and terraformer image dependencies
  • Chore: Cleaned up obsolete test configurations and removed terraformer-specific parameters from infrastructure tests
  • Chore: Added automatic purging of legacy terraformer RBAC resources during manager startup for version 1.68.0 migration
  • Bug Fix: Updated dependency management by removing unused sprig library versions and consolidating to v3
  • Refactor: Simplified infrastructure webhook by removing flow annotation mutation logic and associated test files
  • Refactor: Streamlined API helper functions to support flow state detection and infrastructure state extraction

Model: claude-sonnet-4-20250514 | Prompt Tokens: 44583 | Completion Tokens: 235

@ghost ghost added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jan 20, 2026
@github-actions github-actions bot removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jan 20, 2026
Copy link
Copy Markdown
Contributor

@hebelsan hebelsan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@gardener-prow gardener-prow bot added the lgtm Indicates that a PR is ready to be merged. label Jan 20, 2026
@gardener-prow
Copy link
Copy Markdown

gardener-prow bot commented Jan 20, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hebelsan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@gardener-prow gardener-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 20, 2026
@gardener-prow
Copy link
Copy Markdown

gardener-prow bot commented Jan 20, 2026

LGTM label has been added.

DetailsGit tree hash: 8361afdc86f30540caa26fc64b8570819e207f1f

@kon-angelo
Copy link
Copy Markdown
Contributor Author

/cla

@gardener-prow
Copy link
Copy Markdown

gardener-prow bot commented Jan 26, 2026

Successfully reached out to cla-assistant.io to initialize recheck of PR #1617

@kon-angelo
Copy link
Copy Markdown
Contributor Author

/reviewed ok-to-test

@kon-angelo kon-angelo removed the needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jan 26, 2026
@AndreasBurger AndreasBurger added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jan 26, 2026
@github-actions github-actions bot added needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Jan 26, 2026
@AndreasBurger AndreasBurger merged commit ce55a40 into gardener:master Jan 26, 2026
62 of 66 checks passed
@ghost ghost added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jan 27, 2026
@github-actions github-actions bot removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Jan 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/control-plane Control plane related cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. kind/enhancement Enhancement, improvement, extension lgtm Indicates that a PR is ready to be merged. lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) needs/review Needs review needs/second-opinion Needs second review by someone else platform/aws Amazon web services platform/infrastructure size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants