Skip to content
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

use the new registry for archeio #7759

Merged
merged 1 commit into from
Feb 5, 2025

Conversation

upodroid
Copy link
Member

@upodroid upodroid commented Feb 5, 2025

Fixing @BenTheElder's comment at kubernetes/registry.k8s.io#298 (comment)

I'm going to backfill the new registry before merging the PR.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dns DNS records for k8s.io, kubernetes.io, k8s.dev, etc., code in dns/ area/infra Infrastructure management, infrastructure design, code in infra/ area/infra/gcp Issues or PRs related to Kubernetes GCP infrastructure labels Feb 5, 2025
@k8s-ci-robot k8s-ci-robot requested review from dims and xmudrii February 5, 2025 19:33
@k8s-ci-robot k8s-ci-robot added 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/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 5, 2025
@upodroid upodroid requested a review from BenTheElder February 5, 2025 19:34
@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            = "2025-02-03T16:30:11.067952Z" -> "2025-02-05T15:26:05.661657Z"
        # (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            = "2025-01-30T20:48:04.482588Z" -> "2025-02-05T17:50:42.641438Z"
        # (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            = "2025-02-03T18:52:32.641052Z" -> "2025-02-04T22:22:50.152478Z"
        # (11 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            = "2025-02-03T18:52:32.598189Z" -> "2025-02-05T18:58:06.208591Z"
        # (11 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            = "2025-02-03T16:51:44.727619Z" -> "2025-02-05T15:48:02.561247Z"
        # (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:
~ update in-place

Terraform will perform the following actions:

  # module.artifact_registry["infra-tools"].google_artifact_registry_repository.repo will be updated in-place
~ resource "google_artifact_registry_repository" "repo" {
      ~ cleanup_policy_dry_run = false -> true
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/infra-tools"
        name                   = "infra-tools"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.artifact_registry["test-infra"].google_artifact_registry_repository.repo will be updated in-place
~ resource "google_artifact_registry_repository" "repo" {
      ~ cleanup_policy_dry_run = false -> true
        id                     = "projects/k8s-staging-images/locations/us-central1/repositories/test-infra"
        name                   = "test-infra"
        # (12 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

Plan: 0 to add, 2 to change, 0 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: 0 to add, 2 to change, 0 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

@@ -483,7 +483,7 @@ resource "google_cloud_run_service" "oci-proxy" {
// - We need to be able to deploy registry fixes ASAP
// - We will eventually auto-deploy staging by overriding the project and digest on the production config to avoid skew
// If you're interested in running this image yourself releases are available at registry.k8s.io/infra-tools/archeio
image = "gcr.io/k8s-staging-infra-tools/archeio@${var.digest}"
image = "us-central1-docker.pkg.dev/k8s-staging-images/infra-tools/archeio@${var.digest}"
Copy link
Member

Choose a reason for hiding this comment

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

I think this is the only change that requires backfill?

Copy link
Member Author

Choose a reason for hiding this comment

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

yes

@BenTheElder
Copy link
Member

/lgtm
/approve
/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 5, 2025
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 5, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder, 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

@upodroid
Copy link
Member Author

upodroid commented Feb 5, 2025

atlantis plan -p infra/gcp/terraform/k8s-infra-oci-proxy/default

@k8s-infra-ci-robot
Copy link
Contributor

Plan Error

cannot specify a project name unless an atlantis.yaml file exists to configure projects

@upodroid
Copy link
Member Author

upodroid commented Feb 5, 2025

atlantis apply

@k8s-infra-ci-robot
Copy link
Contributor

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

module.artifact_registry["infra-tools"].google_artifact_registry_repository.repo: Modifying... [id=projects/k8s-staging-images/locations/us-central1/repositories/infra-tools]
module.artifact_registry["test-infra"].google_artifact_registry_repository.repo: Modifying... [id=projects/k8s-staging-images/locations/us-central1/repositories/test-infra]
module.artifact_registry["infra-tools"].google_artifact_registry_repository.repo: Modifications complete after 0s [id=projects/k8s-staging-images/locations/us-central1/repositories/infra-tools]
module.artifact_registry["test-infra"].google_artifact_registry_repository.repo: Modifications complete after 0s [id=projects/k8s-staging-images/locations/us-central1/repositories/test-infra]

Apply complete! Resources: 0 added, 2 changed, 0 destroyed.

@upodroid
Copy link
Member Author

upodroid commented Feb 5, 2025

Registry has been backfilled and also exempt from expiring images(I set a selection of registries to always run the cleanup in dry run mode)

Successfully applied in staging:

image

Applying to prod now

@upodroid
Copy link
Member Author

upodroid commented Feb 5, 2025

Successfully deployed to prod

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 5, 2025
@upodroid upodroid merged commit 4b9562b into kubernetes:main Feb 5, 2025
12 of 14 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.33 milestone Feb 5, 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

@BenTheElder
Copy link
Member

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/dns DNS records for k8s.io, kubernetes.io, k8s.dev, etc., code in dns/ 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants