Skip to content

bump gcp providers and remove incorrect annotations - #9797

Open
upodroid wants to merge 1 commit into
kubernetes:mainfrom
upodroid:bump-gcp-providers
Open

bump gcp providers and remove incorrect annotations#9797
upodroid wants to merge 1 commit into
kubernetes:mainfrom
upodroid:bump-gcp-providers

Conversation

@upodroid

Copy link
Copy Markdown
Member

#9791 was slightly incorrect as the annotations aren't required. I also bumped the terraform providers and version for some of the layers.

@kubernetes-prow kubernetes-prow Bot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 30, 2026
@kubernetes-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: upodroid

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

@kubernetes-prow kubernetes-prow Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 30, 2026
@kubernetes-prow
kubernetes-prow Bot requested review from jbpratt and xmudrii July 30, 2026 17:23
@kubernetes-prow kubernetes-prow Bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. area/bash Bash scripts, testing them, writing less of them, code in infra/gcp/ area/infra Infrastructure management, infrastructure design, code in infra/ area/infra/gcp Issues or PRs related to Kubernetes GCP infrastructure area/prow Setting up or working with prow in general, prow.k8s.io, prow build clusters area/terraform Terraform modules, testing them, writing more of them, code in infra/gcp/clusters/ sig/k8s-infra Categorizes an issue or PR as relevant to SIG K8s Infra. sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Jul 30, 2026
@k8s-infra-ci-robot

This comment has been minimized.

@upodroid
upodroid force-pushed the bump-gcp-providers branch from ec7cf72 to a4618ba Compare August 3, 2026 11:19
@k8s-infra-ci-robot

Copy link
Copy Markdown
Contributor

Ran Plan for 4 projects:

  1. dir: infra/gcp/terraform/k8s-infra-releases-prod workspace: default
  2. dir: infra/gcp/terraform/k8s-infra-seed workspace: default
  3. dir: infra/gcp/terraform/k8s-release workspace: default
  4. dir: infra/gcp/terraform/k8s-staging-images workspace: default

2. dir: infra/gcp/terraform/k8s-infra-seed workspace: default

Show Output
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.iam.google_organization_iam_binding.organization_iam_authoritative["default--roles/resourcemanager.projectCreator"] will be updated in-place
~ resource "google_organization_iam_binding" "organization_iam_authoritative" {
        id      = "758905017065/roles/resourcemanager.projectCreator"
      ~ members = [
          - "user:sc3@kubernetes.io",
            # (2 unchanged elements hidden)
        ]
        # (3 unchanged attributes hidden)
    }

Plan: 0 to add, 1 to change, 0 to destroy.
  • ▶️ To apply this plan, comment:
    atlantis apply -d infra/gcp/terraform/k8s-infra-seed
  • 🚮 To delete this plan and lock, click here
  • 🔁 To plan this project again, comment:
    atlantis plan -d infra/gcp/terraform/k8s-infra-seed

Plan: 0 to add, 1 to change, 0 to destroy.


4. dir: infra/gcp/terraform/k8s-staging-images workspace: default

Show Output
Note: Objects have changed outside of Terraform

Terraform detected the following changes made outside of Terraform since the
last "terraform apply" which may have affected this plan:

  # module.artifact_registry["agent-sandbox"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/agent-sandbox"
        name                   = "agent-sandbox"
      ~ update_time            = "2026-07-30T09:01:08.000746Z" -> "2026-08-03T09:15:09.965809Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["agentic-net"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/agentic-net"
        name                   = "agentic-net"
      ~ update_time            = "2026-07-29T20:31:16.514741Z" -> "2026-08-02T08:51:28.760987Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["cloud-provider-kind"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/cloud-provider-kind"
        name                   = "cloud-provider-kind"
      ~ update_time            = "2026-07-28T14:59:02.817917Z" -> "2026-08-03T08:25:26.634034Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["cluster-inventory-api"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/cluster-inventory-api"
        name                   = "cluster-inventory-api"
      ~ update_time            = "2026-07-27T19:26:19.310103Z" -> "2026-07-30T14:09:21.666397Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["csi-vsphere"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/csi-vsphere"
        name                   = "csi-vsphere"
      ~ update_time            = "2026-07-30T03:32:50.842668Z" -> "2026-08-03T03:08:32.661171Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["dra-driver-cpu"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/dra-driver-cpu"
        name                   = "dra-driver-cpu"
      ~ update_time            = "2026-07-27T19:56:31.637538Z" -> "2026-08-02T20:27:27.547973Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["dra-driver-google"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/dra-driver-google"
        name                   = "dra-driver-google"
      ~ update_time            = "2026-05-21T21:53:41.977028Z" -> "2026-07-31T19:49:10.821378Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["dra-driver-nvidia"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/dra-driver-nvidia"
        name                   = "dra-driver-nvidia"
      ~ update_time            = "2026-07-30T00:26:21.108168Z" -> "2026-08-03T03:19:16.116651Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["dra-example-driver"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/dra-example-driver"
        name                   = "dra-example-driver"
      ~ update_time            = "2026-07-29T20:31:59.875113Z" -> "2026-08-02T20:25:17.438972Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["gateway-api"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/gateway-api"
        name                   = "gateway-api"
      ~ update_time            = "2026-07-30T02:53:49.611683Z" -> "2026-08-03T03:05:29.619363Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["gateway-api-inference-extension"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/gateway-api-inference-extension"
        name                   = "gateway-api-inference-extension"
      ~ update_time            = "2026-07-30T06:46:53.842586Z" -> "2026-08-02T20:25:45.572495Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["headlamp"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/headlamp"
        name                   = "headlamp"
      ~ update_time            = "2026-07-29T08:37:56.393926Z" -> "2026-08-02T14:35:29.497757Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["infra-tools"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/infra-tools"
        name                   = "infra-tools"
      ~ update_time            = "2026-07-29T17:34:08.519916Z" -> "2026-07-30T16:56:39.476402Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["kueue"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/kueue"
        name                   = "kueue"
      ~ update_time            = "2026-07-30T09:03:47.787727Z" -> "2026-08-03T11:15:44.591393Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["lws"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/lws"
        name                   = "lws"
      ~ update_time            = "2026-07-29T15:36:06.949023Z" -> "2026-08-03T09:13:04.616782Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["mcp-lifecycle-operator"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/mcp-lifecycle-operator"
        name                   = "mcp-lifecycle-operator"
      ~ update_time            = "2026-07-29T08:29:07.946989Z" -> "2026-08-03T09:16:45.627843Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["minikube"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/minikube"
        name                   = "minikube"
      ~ update_time            = "2026-07-22T08:04:32.645971Z" -> "2026-08-01T21:36:38.406306Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["node-readiness-controller"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/node-readiness-controller"
        name                   = "node-readiness-controller"
      ~ update_time            = "2026-07-30T02:52:53.976591Z" -> "2026-08-03T03:07:10.091002Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.gcb_bucket.google_storage_bucket.bucket has changed
~ resource "google_storage_bucket" "bucket" {
      + deletion_policy             = "DELETE"
        id                          = "k8s-staging-images-gcb"
        name                        = "k8s-staging-images-gcb"
      + time_created                = "2024-06-18T16:47:02.375Z"
      + updated                     = "2026-05-17T17:45:49.738Z"
        # (16 unchanged attributes hidden)

      ~ lifecycle_rule {
          - condition {
              - age                                     = 90 -> null
              - days_since_custom_time                  = 0 -> null
              - days_since_noncurrent_time              = 0 -> null
              - matches_prefix                          = [] -> null
              - matches_storage_class                   = [] -> null
              - matches_suffix                          = [] -> null
              - num_newer_versions                      = 0 -> null
              - send_age_if_zero                        = false -> null
              - send_days_since_custom_time_if_zero     = false -> null
              - send_days_since_noncurrent_time_if_zero = false -> null
              - send_num_newer_versions_if_zero         = false -> null
              - with_state                              = "ANY" -> null
                # (3 unchanged attributes hidden)
            }
          + condition {
              + age                                     = 90
              + days_since_custom_time                  = 0
              + days_since_noncurrent_time              = 0
              + matches_prefix                          = []
              + matches_storage_class                   = []
              + matches_suffix                          = []
              + num_newer_versions                      = 0
              + send_age_if_zero                        = false
              + send_days_since_custom_time_if_zero     = false
              + send_days_since_noncurrent_time_if_zero = false
              + send_num_newer_versions_if_zero         = false
              + size_above_bytes                        = 0
              + size_below_bytes                        = 0
              + with_state                              = "ANY"
                # (3 unchanged attributes hidden)
            }

            # (1 unchanged block hidden)
        }

        # (3 unchanged blocks hidden)
    }

  # module.kubernetes_ar.google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-kubernetes/locations/us/repositories/gcr.io"
        name                   = "gcr.io"
      ~ update_time            = "2026-07-29T17:40:33.266173Z" -> "2026-08-01T18:07:25.569712Z"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }


Unless you have made equivalent changes to your configuration, or ignored the
relevant attributes using ignore_changes, the following plan may include
actions to undo or respond to these changes.

─────────────────────────────────────────────────────────────────────────────

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
+ create
- destroy

Terraform will perform the following actions:

  # local_file.builds_sa will be created
+ resource "local_file" "builds_sa" {
      + content              = <<-EOT
            # GENERATED FILE - DO NOT EDIT
            # Generated by hack/generate-staging-builds-sa.sh
            # Prow build service accounts for k8s-staging-images registries.
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: agent-sandbox
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: agentic-net
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: aws-encryption-provider
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: charts
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: cloud-provider-kind
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: cluster-capacity
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: cluster-inventory-api
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: contributor-site
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: csi-vsphere
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: dns
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: dra-driver-cpu
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: dra-driver-google
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: dra-driver-nvidia
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: dra-example-driver
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: etcd
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: etcd-manager
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: gateway-api
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: gateway-api-inference-extension
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: headlamp
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: inference-perf
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: infra-tools
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: ingate
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: ingress-nginx
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: jobset
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: karpenter-cluster-api
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: kind
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: kro
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: kubemark
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: kubernetes
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: kubespray
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: kueue
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: lws
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: maintainer-tools
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: mcp-lifecycle-operator
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: minikube
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: node-readiness-controller
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: resource-state-metrics
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: secrets-store-sync
            ---
            apiVersion: v1
            kind: ServiceAccount
            metadata:
              name: test-infra
        EOT
      + content_base64sha256 = (known after apply)
      + content_base64sha512 = (known after apply)
      + content_md5          = (known after apply)
      + content_sha1         = (known after apply)
      + content_sha256       = (known after apply)
      + content_sha512       = (known after apply)
      + directory_permission = "0777"
      + file_permission      = "0644"
      + filename             = "./../../../../kubernetes/gke-prow-build-trusted/prow/builds-sa.yaml"
      + id                   = (known after apply)
    }

  # module.kubernetes_ar.google_artifact_registry_repository_iam_member.writers["serviceAccount:648026197307@cloudbuild.gserviceaccount.com"] will be destroyed
  # (because key ["serviceAccount:648026197307@cloudbuild.gserviceaccount.com"] is not in for_each map)
- resource "google_artifact_registry_repository_iam_member" "writers" {
      - etag       = "BwZJ8zT5x0Q=" -> null
      - id         = "projects/k8s-staging-kubernetes/locations/us/repositories/gcr.io/roles/artifactregistry.writer/serviceAccount:648026197307@cloudbuild.gserviceaccount.com" -> null
      - location   = "us" -> null
      - member     = "serviceAccount:648026197307@cloudbuild.gserviceaccount.com" -> null
      - project    = "k8s-staging-kubernetes" -> null
      - repository = "projects/k8s-staging-kubernetes/locations/us/repositories/gcr.io" -> null
      - role       = "roles/artifactregistry.writer" -> null
    }

Plan: 1 to add, 0 to change, 1 to destroy.
  • ▶️ To apply this plan, comment:
    atlantis apply -d infra/gcp/terraform/k8s-staging-images
  • 🚮 To delete this plan and lock, click here
  • 🔁 To plan this project again, comment:
    atlantis plan -d infra/gcp/terraform/k8s-staging-images

Note: Objects have changed outside of Terraform
Plan: 1 to add, 0 to change, 1 to destroy.


Plan Summary

4 projects, 2 with changes, 2 with no changes, 0 failed

  • ⏩ To apply all unapplied plans from this Pull Request, comment:
    atlantis apply
  • 🚮 To delete all plans and locks from this Pull Request, comment:
    atlantis unlock

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/bash Bash scripts, testing them, writing less of them, code in infra/gcp/ area/infra/gcp Issues or PRs related to Kubernetes GCP infrastructure area/infra Infrastructure management, infrastructure design, code in infra/ area/prow Setting up or working with prow in general, prow.k8s.io, prow build clusters area/terraform Terraform modules, testing them, writing more of them, code in infra/gcp/clusters/ cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. sig/k8s-infra Categorizes an issue or PR as relevant to SIG K8s Infra. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants