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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions dns/octodns-docker/cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
steps:
- name: gcr.io/cloud-builders/docker
args: ['build', '-t', 'gcr.io/$PROJECT_ID/octodns:$_GIT_TAG',
'--build-arg', 'IMAGE_ARG=gcr.io/$PROJECT_ID/octodns:$_GIT_TAG',
'.']
- name: gcr.io/cloud-builders/docker
args:
[
"build",
"-t",
"us-central1-docker.pkg.dev/k8s-staging-images/infra-tools/octodns:$_GIT_TAG",
"--build-arg",
"IMAGE_ARG=us-central1-docker.pkg.dev/k8s-staging-images/infra-tools/octodns:$_GIT_TAG",
".",
]
substitutions:
_GIT_TAG: "12345"
_PULL_BASE_REF: 'main'
_PULL_BASE_REF: "main"
images:
- "gcr.io/$PROJECT_ID/octodns:$_GIT_TAG"
- "us-central1-docker.pkg.dev/k8s-staging-images/infra-tools/octodns:$_GIT_TAG"
options:
substitution_option: 'ALLOW_LOOSE'
substitution_option: "ALLOW_LOOSE"
2 changes: 1 addition & 1 deletion infra/gcp/terraform/k8s-staging-images/provider.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ limitations under the License.
*/

terraform {
required_version = "1.6.5"
required_version = "1.10.5"

backend "gcs" {
bucket = "k8s-infra-tf-prow-clusters"
Expand Down
8 changes: 8 additions & 0 deletions infra/gcp/terraform/k8s-staging-images/registries.tf
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ locals {
test-infra = "group:[email protected]"
csi-vsphere = "group:[email protected]"
}

# Only registries used internally by CI should be listed here
registries_excluded_from_cleanup = [
"infra-tools",
"test-infra",
"boskos"
]
}

module "artifact_registry" {
Expand All @@ -46,6 +53,7 @@ module "artifact_registry" {
readers = ["allUsers"],
writers = [each.value],
}
cleanup_policy_dry_run = contains(local.registries_excluded_from_cleanup, each.key)
cleanup_policies = {
"delete-images-older-than-90-days" = {
action = "DELETE"
Expand Down
2 changes: 1 addition & 1 deletion infra/gcp/terraform/modules/oci-proxy/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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

args = ["-v=${var.verbosity}"]

dynamic "env" {
Expand Down