Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Create new infra-tools AR registry #7750

Merged
merged 1 commit into from
Feb 3, 2025

Conversation

upodroid
Copy link
Member

@upodroid upodroid commented Feb 3, 2025

Part of #3961

/hold for atlantis apply after lgtm

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 3, 2025
@k8s-ci-robot
Copy link
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

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 3, 2025
@k8s-ci-robot k8s-ci-robot requested review from dims and xmudrii February 3, 2025 18:49
@k8s-ci-robot k8s-ci-robot added area/infra Infrastructure management, infrastructure design, code in infra/ area/infra/gcp Issues or PRs related to Kubernetes GCP infrastructure 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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 3, 2025
@k8s-infra-ci-robot
Copy link
Contributor

Ran Plan for 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["charts"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/charts"
        name                   = "charts"
      ~ update_time            = "2024-12-06T15:33:54.572945Z" -> "2025-02-03T16:30:11.067952Z"
        # (10 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            = "2024-11-25T21:04:11.526859Z" -> "2025-01-30T20:48:04.482588Z"
        # (10 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            = "2024-12-05T20:52:14.327242Z" -> "2025-01-30T20:39:50.828540Z"
        # (10 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["etcd-manager"].google_artifact_registry_repository.repo has changed
~ resource "google_artifact_registry_repository" "repo" {
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/etcd-manager"
        name                   = "etcd-manager"
      ~ update_time            = "2024-12-02T21:07:31.873341Z" -> "2025-01-26T14:42:21.387897Z"
        # (10 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            = "2024-12-06T15:32:42.661798Z" -> "2025-02-03T16:51:44.727619Z"
        # (10 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
~ update in-place
- destroy

Terraform will perform the following actions:

  # module.artifact_registry["gateway-api-inference-extension"].google_artifact_registry_repository.repo will be created
+ resource "google_artifact_registry_repository" "repo" {
      + cleanup_policy_dry_run = false
      + create_time            = (known after apply)
      + effective_labels       = {
          + "goog-terraform-provisioned" = "true"
        }
      + format                 = "DOCKER"
      + id                     = (known after apply)
      + location               = "us-central1"
      + mode                   = "STANDARD_REPOSITORY"
      + name                   = (known after apply)
      + project                = "k8s-staging-images"
      + repository_id          = "gateway-api-inference-extension"
      + terraform_labels       = {
          + "goog-terraform-provisioned" = "true"
        }
      + update_time            = (known after apply)

      + cleanup_policies {
          + action = "DELETE"
          + id     = "delete-images-older-than-90-days"

          + condition {
              + older_than            = "7776000s"
              + package_name_prefixes = []
              + tag_prefixes          = []
              + tag_state             = "ANY"
              + version_name_prefixes = []
            }
        }
    }

  # module.artifact_registry["gateway-api-inference-extension"].google_artifact_registry_repository_iam_member.readers["allUsers"] will be created
+ resource "google_artifact_registry_repository_iam_member" "readers" {
      + etag       = (known after apply)
      + id         = (known after apply)
      + location   = "us-central1"
      + member     = "allUsers"
      + project    = "k8s-staging-images"
      + repository = (known after apply)
      + role       = "roles/artifactregistry.reader"
    }

  # module.artifact_registry["gateway-api-inference-extension"].google_artifact_registry_repository_iam_member.writers["group:sig-apps-leads@kubernetes.io"] will be created
+ resource "google_artifact_registry_repository_iam_member" "writers" {
      + etag       = (known after apply)
      + id         = (known after apply)
      + location   = "us-central1"
      + member     = "group:sig-apps-leads@kubernetes.io"
      + project    = "k8s-staging-images"
      + repository = (known after apply)
      + role       = "roles/artifactregistry.writer"
    }

  # module.artifact_registry["infra-tools"].google_artifact_registry_repository.repo will be created
+ resource "google_artifact_registry_repository" "repo" {
      + cleanup_policy_dry_run = false
      + create_time            = (known after apply)
      + effective_labels       = {
          + "goog-terraform-provisioned" = "true"
        }
      + format                 = "DOCKER"
      + id                     = (known after apply)
      + location               = "us-central1"
      + mode                   = "STANDARD_REPOSITORY"
      + name                   = (known after apply)
      + project                = "k8s-staging-images"
      + repository_id          = "infra-tools"
      + terraform_labels       = {
          + "goog-terraform-provisioned" = "true"
        }
      + update_time            = (known after apply)

      + cleanup_policies {
          + action = "DELETE"
          + id     = "delete-images-older-than-90-days"

          + condition {
              + older_than            = "7776000s"
              + package_name_prefixes = []
              + tag_prefixes          = []
              + tag_state             = "ANY"
              + version_name_prefixes = []
            }
        }
    }

  # module.artifact_registry["infra-tools"].google_artifact_registry_repository_iam_member.readers["allUsers"] will be created
+ resource "google_artifact_registry_repository_iam_member" "readers" {
      + etag       = (known after apply)
      + id         = (known after apply)
      + location   = "us-central1"
      + member     = "allUsers"
      + project    = "k8s-staging-images"
      + repository = (known after apply)
      + role       = "roles/artifactregistry.reader"
    }

  # module.artifact_registry["infra-tools"].google_artifact_registry_repository_iam_member.writers["group:k8s-infra-staging-infra-tools@kubernetes.io"] will be created
+ resource "google_artifact_registry_repository_iam_member" "writers" {
      + etag       = (known after apply)
      + id         = (known after apply)
      + location   = "us-central1"
      + member     = "group:k8s-infra-staging-infra-tools@kubernetes.io"
      + project    = "k8s-staging-images"
      + repository = (known after apply)
      + role       = "roles/artifactregistry.writer"
    }

  # module.artifact_registry["llm-instance-gateway"].google_artifact_registry_repository.repo will be destroyed
  # (because module.artifact_registry["llm-instance-gateway"] is not in configuration)
- resource "google_artifact_registry_repository" "repo" {
      - cleanup_policy_dry_run = false -> null
      - create_time            = "2024-11-24T15:13:02.377922Z" -> null
      - effective_labels       = {} -> null
      - format                 = "DOCKER" -> null
      - id                     = "projects/k8s-staging-images/locations/us-central1/repositories/llm-instance-gateway" -> null
      - labels                 = {} -> null
      - location               = "us-central1" -> null
      - mode                   = "STANDARD_REPOSITORY" -> null
      - name                   = "llm-instance-gateway" -> null
      - project                = "k8s-staging-images" -> null
      - repository_id          = "llm-instance-gateway" -> null
      - terraform_labels       = {} -> null
      - update_time            = "2025-02-03T18:07:47.093149Z" -> null

      - cleanup_policies {
          - action = "DELETE" -> null
          - id     = "delete-images-older-than-90-days" -> null

          - condition {
              - older_than            = "7776000s" -> null
              - package_name_prefixes = [] -> null
              - tag_prefixes          = [] -> null
              - tag_state             = "ANY" -> null
              - version_name_prefixes = [] -> null
            }
        }
    }

  # module.artifact_registry["llm-instance-gateway"].google_artifact_registry_repository_iam_member.readers["allUsers"] will be destroyed
  # (because module.artifact_registry["llm-instance-gateway"] is not in configuration)
- resource "google_artifact_registry_repository_iam_member" "readers" {
      - etag       = "BwYnqg30B5k=" -> null
      - id         = "projects/k8s-staging-images/locations/us-central1/repositories/llm-instance-gateway/roles/artifactregistry.reader/allUsers" -> null
      - location   = "us-central1" -> null
      - member     = "allUsers" -> null
      - project    = "k8s-staging-images" -> null
      - repository = "projects/k8s-staging-images/locations/us-central1/repositories/llm-instance-gateway" -> null
      - role       = "roles/artifactregistry.reader" -> null
    }

  # module.artifact_registry["llm-instance-gateway"].google_artifact_registry_repository_iam_member.writers["group:sig-apps-leads@kubernetes.io"] will be destroyed
  # (because module.artifact_registry["llm-instance-gateway"] is not in configuration)
- resource "google_artifact_registry_repository_iam_member" "writers" {
      - etag       = "BwYnqg30B5k=" -> null
      - id         = "projects/k8s-staging-images/locations/us-central1/repositories/llm-instance-gateway/roles/artifactregistry.writer/group:sig-apps-leads@kubernetes.io" -> null
      - location   = "us-central1" -> null
      - member     = "group:sig-apps-leads@kubernetes.io" -> null
      - project    = "k8s-staging-images" -> null
      - repository = "projects/k8s-staging-images/locations/us-central1/repositories/llm-instance-gateway" -> null
      - role       = "roles/artifactregistry.writer" -> null
    }

  # module.iam.google_project_iam_binding.project_iam_authoritative["default--roles/viewer"] will be updated in-place
~ resource "google_project_iam_binding" "project_iam_authoritative" {
        id      = "k8s-staging-images/roles/viewer"
      ~ members = [
          + "group:k8s-infra-staging-infra-tools@kubernetes.io",
            # (11 unchanged elements hidden)
        ]
        # (3 unchanged attributes hidden)
    }

Plan: 6 to add, 1 to change, 3 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: 6 to add, 1 to change, 3 to destroy.


  • ⏩ 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

@upodroid
Copy link
Member Author

upodroid commented Feb 3, 2025

atlantis apply

@k8s-infra-ci-robot
Copy link
Contributor

Ran Apply for dir: infra/gcp/terraform/k8s-staging-images workspace: default

Show Output
module.artifact_registry["llm-instance-gateway"].google_artifact_registry_repository_iam_member.writers["group:sig-apps-leads@kubernetes.io"]: Destroying... [id=projects/k8s-staging-images/locations/us-central1/repositories/llm-instance-gateway/roles/artifactregistry.writer/group:sig-apps-leads@kubernetes.io]
module.artifact_registry["llm-instance-gateway"].google_artifact_registry_repository_iam_member.readers["allUsers"]: Destroying... [id=projects/k8s-staging-images/locations/us-central1/repositories/llm-instance-gateway/roles/artifactregistry.reader/allUsers]
module.iam.google_project_iam_binding.project_iam_authoritative["default--roles/viewer"]: Modifying... [id=k8s-staging-images/roles/viewer]
module.artifact_registry["gateway-api-inference-extension"].google_artifact_registry_repository.repo: Creating...
module.artifact_registry["infra-tools"].google_artifact_registry_repository.repo: Creating...
module.iam.google_project_iam_binding.project_iam_authoritative["default--roles/viewer"]: Modifications complete after 7s [id=k8s-staging-images/roles/viewer]
module.artifact_registry["llm-instance-gateway"].google_artifact_registry_repository_iam_member.writers["group:sig-apps-leads@kubernetes.io"]: Destruction complete after 8s
module.artifact_registry["llm-instance-gateway"].google_artifact_registry_repository_iam_member.readers["allUsers"]: Destruction complete after 8s
module.artifact_registry["llm-instance-gateway"].google_artifact_registry_repository.repo: Destroying... [id=projects/k8s-staging-images/locations/us-central1/repositories/llm-instance-gateway]
module.artifact_registry["llm-instance-gateway"].google_artifact_registry_repository.repo: Destruction complete after 1s
module.artifact_registry["gateway-api-inference-extension"].google_artifact_registry_repository.repo: Still creating... [10s elapsed]
module.artifact_registry["infra-tools"].google_artifact_registry_repository.repo: Still creating... [10s elapsed]
module.artifact_registry["infra-tools"].google_artifact_registry_repository.repo: Creation complete after 10s [id=projects/k8s-staging-images/locations/us-central1/repositories/infra-tools]
module.artifact_registry["infra-tools"].google_artifact_registry_repository_iam_member.writers["group:k8s-infra-staging-infra-tools@kubernetes.io"]: Creating...
module.artifact_registry["infra-tools"].google_artifact_registry_repository_iam_member.readers["allUsers"]: Creating...
module.artifact_registry["gateway-api-inference-extension"].google_artifact_registry_repository.repo: Creation complete after 10s [id=projects/k8s-staging-images/locations/us-central1/repositories/gateway-api-inference-extension]
module.artifact_registry["gateway-api-inference-extension"].google_artifact_registry_repository_iam_member.writers["group:sig-apps-leads@kubernetes.io"]: Creating...
module.artifact_registry["gateway-api-inference-extension"].google_artifact_registry_repository_iam_member.readers["allUsers"]: Creating...
module.artifact_registry["infra-tools"].google_artifact_registry_repository_iam_member.writers["group:k8s-infra-staging-infra-tools@kubernetes.io"]: Creation complete after 8s [id=projects/k8s-staging-images/locations/us-central1/repositories/infra-tools/roles/artifactregistry.writer/group:k8s-infra-staging-infra-tools@kubernetes.io]
module.artifact_registry["infra-tools"].google_artifact_registry_repository_iam_member.readers["allUsers"]: Creation complete after 8s [id=projects/k8s-staging-images/locations/us-central1/repositories/infra-tools/roles/artifactregistry.reader/allUsers]
module.artifact_registry["gateway-api-inference-extension"].google_artifact_registry_repository_iam_member.writers["group:sig-apps-leads@kubernetes.io"]: Creation complete after 8s [id=projects/k8s-staging-images/locations/us-central1/repositories/gateway-api-inference-extension/roles/artifactregistry.writer/group:sig-apps-leads@kubernetes.io]
module.artifact_registry["gateway-api-inference-extension"].google_artifact_registry_repository_iam_member.readers["allUsers"]: Creation complete after 8s [id=projects/k8s-staging-images/locations/us-central1/repositories/gateway-api-inference-extension/roles/artifactregistry.reader/allUsers]

Apply complete! Resources: 6 added, 1 changed, 3 destroyed.

@upodroid
Copy link
Member Author

upodroid commented Feb 3, 2025

/hold cancel infra has been applied

@ameukam
Copy link
Member

ameukam commented Feb 3, 2025

Weird we got a destruction here:

module.artifact_registry["llm-instance-gateway"].google_artifact_registry_repository.repo: Destroying... [id=projects/k8s-staging-images/locations/us-central1/repositories/llm-instance-gateway]
module.artifact_registry["llm-instance-gateway"].google_artifact_registry_repository.repo: Destruction complete after 1s

?

@upodroid
Copy link
Member Author

upodroid commented Feb 3, 2025

Its an unapplied plan from #7657

It got merged before it was applied. I need to get around to fixing the merge rules for atlantis

@upodroid upodroid removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 3, 2025
@ameukam
Copy link
Member

ameukam commented Feb 3, 2025

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 3, 2025
@k8s-ci-robot k8s-ci-robot merged commit 7838f9c into kubernetes:main Feb 3, 2025
7 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.33 milestone Feb 3, 2025
@k8s-infra-ci-robot
Copy link
Contributor

Locks and plans deleted for the projects and workspaces modified in this pull request:

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

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/infra/gcp Issues or PRs related to Kubernetes GCP infrastructure area/infra Infrastructure management, infrastructure design, code in infra/ 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. lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/k8s-infra Categorizes an issue or PR as relevant to SIG K8s Infra. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants