Skip to content

Commit 08db122

Browse files
committed
GCP: Drop transfer job for gs://kubernetes-release
Remove the transfer job used to sync with the community-owned bucket. Also bump the GCP terraform provider and modules Signed-off-by: Arnaud Meukam <ameukam@gmail.com>
1 parent 604f588 commit 08db122

File tree

4 files changed

+32
-103
lines changed

4 files changed

+32
-103
lines changed

infra/gcp/terraform/k8s-infra-releases-prod/.terraform.lock.hcl

Lines changed: 28 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

infra/gcp/terraform/k8s-infra-releases-prod/main.tf

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ locals {
2020
project_id = "k8s-infra-releases-prod"
2121
}
2222

23-
data "google_storage_transfer_project_service_account" "default" {
24-
project = google_project.project.project_id
25-
}
2623

2724
resource "google_project" "project" {
2825
name = local.project_id
@@ -49,72 +46,3 @@ resource "google_storage_hmac_key" "fastly_reader_key" {
4946
service_account_email = google_service_account.fastly_reader.email
5047
}
5148

52-
resource "google_storage_bucket_iam_member" "gcs-backup-bucket" {
53-
bucket = module.k8s_releases_prod.bucket_name
54-
role = "roles/storage.admin"
55-
member = "serviceAccount:${data.google_storage_transfer_project_service_account.default.email}"
56-
depends_on = [module.k8s_releases_prod]
57-
}
58-
59-
resource "google_pubsub_topic" "topic" {
60-
project = google_project.project.project_id
61-
name = var.pubsub_topic_name
62-
}
63-
64-
resource "google_pubsub_topic_iam_member" "notification_config" {
65-
project = google_project.project.project_id
66-
topic = google_pubsub_topic.topic.id
67-
role = "roles/pubsub.publisher"
68-
member = "serviceAccount:${data.google_storage_transfer_project_service_account.default.email}"
69-
}
70-
71-
resource "google_storage_transfer_job" "kubernetes_release_backup" {
72-
description = "Daily backup of GCS bucket gs://kubernetes-release"
73-
project = google_project.project.project_id
74-
75-
transfer_spec {
76-
object_conditions {
77-
max_time_elapsed_since_last_modification = "600s"
78-
}
79-
80-
transfer_options {
81-
delete_objects_unique_in_sink = false
82-
}
83-
84-
gcs_data_source {
85-
bucket_name = "kubernetes-release"
86-
path = "release/"
87-
}
88-
89-
gcs_data_sink {
90-
bucket_name = module.k8s_releases_prod.bucket_name
91-
path = "release/"
92-
}
93-
}
94-
95-
schedule {
96-
schedule_start_date {
97-
year = 2023
98-
month = 10
99-
day = 30
100-
}
101-
start_time_of_day {
102-
hours = 17
103-
minutes = 33
104-
seconds = 0
105-
nanos = 0
106-
}
107-
repeat_interval = "86400s" # 1 day
108-
}
109-
110-
notification_config {
111-
pubsub_topic = google_pubsub_topic.topic.id
112-
event_types = [
113-
"TRANSFER_OPERATION_SUCCESS",
114-
"TRANSFER_OPERATION_FAILED"
115-
]
116-
payload_format = "JSON"
117-
}
118-
119-
depends_on = [module.k8s_releases_prod, google_pubsub_topic_iam_member.notification_config]
120-
}

infra/gcp/terraform/k8s-infra-releases-prod/providers.tf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ This file defines:
2121
*/
2222

2323
terraform {
24+
required_version = "1.12"
2425
backend "gcs" {
2526
bucket = "k8s-infra-tf-k8s-releases"
2627
prefix = "prod/terraform.tfstate"
@@ -29,11 +30,11 @@ terraform {
2930
required_providers {
3031
google = {
3132
source = "hashicorp/google"
32-
version = "~> 5.44.0"
33+
version = "~> 6.49.3"
3334
}
3435
google-beta = {
3536
source = "hashicorp/google-beta"
36-
version = "~> 5.44.0"
37+
version = "~> 6.49.3"
3738
}
3839
}
3940
}

infra/gcp/terraform/k8s-infra-releases-prod/secrets.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
module "secrets" {
1818
source = "GoogleCloudPlatform/secret-manager/google"
19-
version = "~> 0.3"
19+
version = "~> 0.8"
2020

2121
project_id = google_project.project.project_id
2222

0 commit comments

Comments
 (0)