-
Notifications
You must be signed in to change notification settings - Fork 794
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
terraform: Prepare upgrade terraform to 4.0.0 #3021
terraform: Prepare upgrade terraform to 4.0.0 #3021
Conversation
Prepare the upgrade to 4.0.0 for the GCP terraform providers: - bump the provider to 3.90.1 - remove fields unsupport in 4.0.0. The fieds unsupported in 4.0.0 can be found here: https://registry.terraform.io/providers/hashicorp/google-beta/latest/docs/guides/version_4_upgrade#resource-google_container_cluster - ensure Shielded Nodes feature is disabled. See: hashicorp/terraform-provider-google#10403 Signed-off-by: Arnaud Meukam <ameukam@gmail.com>
/hold |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/approve
/lgtm
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yay for shielding 🎉
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ameukam, endocrimes, spiffxp The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
Ran
Ran module.prow_build_cluster.google_container_cluster.prod_cluster[0]: Modifying... [id=projects/k8s-infra-prow-build-trusted/locations/us-central1/clusters/prow-build-trusted]
module.prow_build_cluster.google_container_cluster.prod_cluster[0]: Still modifying... [id=projects/k8s-infra-prow-build-trusted/l...s-central1/clusters/prow-build-trusted, 10s elapsed]
module.prow_build_cluster.google_container_cluster.prod_cluster[0]: Still modifying... [id=projects/k8s-infra-prow-build-trusted/l...s-central1/clusters/prow-build-trusted, 20s elapsed]
module.prow_build_cluster.google_container_cluster.prod_cluster[0]: Modifications complete after 27s [id=projects/k8s-infra-prow-build-trusted/locations/us-central1/clusters/prow-build-trusted]
Releasing state lock. This may take a few moments...
Apply complete! Resources: 0 added, 1 changed, 0 destroyed. |
Ran
|
I had to update the billing budgets in Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols:
~ update in-place
Terraform will perform the following actions:
# google_billing_budget.capg_budget will be updated in-place
~ resource "google_billing_budget" "capg_budget" {
id = "billingAccounts/018801-93540E-22A20E/budgets/48207778-f6ad-44c1-9bd1-1b88e3006c81"
name = "48207778-f6ad-44c1-9bd1-1b88e3006c81"
# (2 unchanged attributes hidden)
~ all_updates_rule {
~ monitoring_notification_channels = [
- "projects/kubernetes-public/notificationChannels/5718453951835890521",
+ "projects/kubernetes-public/notificationChannels/13343268313622391552",
]
# (2 unchanged attributes hidden)
}
# (7 unchanged blocks hidden)
}
# google_billing_budget.k8s_infra will be updated in-place
~ resource "google_billing_budget" "k8s_infra" {
id = "billingAccounts/018801-93540E-22A20E/budgets/c29e1d1a-8040-4e9e-a0b8-8743e5364d73"
name = "c29e1d1a-8040-4e9e-a0b8-8743e5364d73"
# (2 unchanged attributes hidden)
~ all_updates_rule {
~ monitoring_notification_channels = [
- "projects/kubernetes-public/notificationChannels/5718453951835890521",
+ "projects/kubernetes-public/notificationChannels/13343268313622391552",
]
# (2 unchanged attributes hidden)
}
# (5 unchanged blocks hidden)
}
Plan: 0 to add, 2 to change, 0 to destroy.
google_billing_budget.k8s_infra: Modifying... [id=billingAccounts/018801-93540E-22A20E/budgets/c29e1d1a-8040-4e9e-a0b8-8743e5364d73]
google_billing_budget.capg_budget: Modifying... [id=billingAccounts/018801-93540E-22A20E/budgets/48207778-f6ad-44c1-9bd1-1b88e3006c81]
google_billing_budget.k8s_infra: Modifications complete after 3s [id=billingAccounts/018801-93540E-22A20E/budgets/c29e1d1a-8040-4e9e-a0b8-8743e5364d73]
google_billing_budget.capg_budget: Modifications complete after 3s [id=billingAccounts/018801-93540E-22A20E/budgets/48207778-f6ad-44c1-9bd1-1b88e3006c81]
Apply complete! Resources: 0 added, 2 changed, 0 destroyed. |
Ran Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols:
~ update in-place
Terraform will perform the following actions:
# module.prow_build_cluster.google_container_cluster.prod_cluster[0] will be updated in-place
~ resource "google_container_cluster" "prod_cluster" {
id = "projects/k8s-infra-prow-build/locations/us-central1/clusters/prow-build"
name = "prow-build"
# (27 unchanged attributes hidden)
~ workload_identity_config {
- identity_namespace = "k8s-infra-prow-build.svc.id.goog" -> null
+ workload_pool = "k8s-infra-prow-build.svc.id.goog"
}
# (18 unchanged blocks hidden)
}
Plan: 0 to add, 1 to change, 0 to destroy.
Do you want to perform these actions?
Terraform will perform the actions described above.
Only 'yes' will be accepted to approve.
Enter a value: yes
module.prow_build_cluster.google_container_cluster.prod_cluster[0]: Modifying... [id=projects/k8s-infra-prow-build/locations/us-central1/clusters/prow-build]
module.prow_build_cluster.google_container_cluster.prod_cluster[0]: Still modifying... [id=projects/k8s-infra-prow-build/locations/us-central1/clusters/prow-build, 10s elapsed]
module.prow_build_cluster.google_container_cluster.prod_cluster[0]: Still modifying... [id=projects/k8s-infra-prow-build/locations/us-central1/clusters/prow-build, 20s elapsed]
module.prow_build_cluster.google_container_cluster.prod_cluster[0]: Still modifying... [id=projects/k8s-infra-prow-build/locations/us-central1/clusters/prow-build, 30s elapsed]
module.prow_build_cluster.google_container_cluster.prod_cluster[0]: Modifications complete after 34s [id=projects/k8s-infra-prow-build/locations/us-central1/clusters/prow-build]
Apply complete! Resources: 0 added, 1 changed, 0 destroyed. |
Done with kubernetes-public
|
Signed-off-by: Arnaud Meukam <ameukam@gmail.com>
Followup of: kubernetes#3021 Upgrade Terraform provider for GCP to 4.16. I did an upgrade to the 4.0.0 of the provider to ensure we are not impacated. Changelog of 4.0.O: https://github.com/hashicorp/terraform-provider-google/blob/main/CHANGELOG.md#400-november-02-2021 Signed-off-by: Arnaud Meukam <ameukam@gmail.com>
Prepare the upgrade to 4.0.0 for the GCP terraform providers:
be found here: https://registry.terraform.io/providers/hashicorp/google-beta/latest/docs/guides/version_4_upgrade#resource-google_container_cluster
enable_shielded_nodes
to true hashicorp/terraform-provider-google#10403Signed-off-by: Arnaud Meukam ameukam@gmail.com