diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 8133b5a9ffc1..3c176c32a77d 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -299,7 +299,7 @@ aliases: # end sigs.k8s.io/kubebuilder/OWNERS_ALIASES - # copied from sigs.k8s.io/k8s-container-image-promoter/OWNERS_ALIASES + # copied from sigs.k8s.io/promo-tools/OWNERS_ALIASES promo-tools-approvers: - cpanato - jeremyrickard diff --git a/config/jobs/image-pushing/releng/k8s-staging-artifact-promoter.yaml b/config/jobs/image-pushing/releng/k8s-staging-artifact-promoter.yaml index a079b972c070..55f492317496 100644 --- a/config/jobs/image-pushing/releng/k8s-staging-artifact-promoter.yaml +++ b/config/jobs/image-pushing/releng/k8s-staging-artifact-promoter.yaml @@ -30,7 +30,7 @@ postsubmits: github_team_slugs: - org: kubernetes slug: release-managers - kubernetes-sigs/k8s-container-image-promoter: + kubernetes-sigs/promo-tools: # TODO(releng): Rename to 'kpromo' once tools are merged - name: post-cip-push-image-cip cluster: k8s-infra-prow-build-trusted diff --git a/config/jobs/kubernetes/sig-release/cip/OWNERS b/config/jobs/kubernetes/sig-release/promo-tools/OWNERS similarity index 100% rename from config/jobs/kubernetes/sig-release/cip/OWNERS rename to config/jobs/kubernetes/sig-release/promo-tools/OWNERS diff --git a/config/jobs/kubernetes/sig-release/cip/container-image-promoter.yaml b/config/jobs/kubernetes/sig-release/promo-tools/promo-tools.yaml similarity index 95% rename from config/jobs/kubernetes/sig-release/cip/container-image-promoter.yaml rename to config/jobs/kubernetes/sig-release/promo-tools/promo-tools.yaml index 630b1b98737b..b506fae74d7d 100644 --- a/config/jobs/kubernetes/sig-release/cip/container-image-promoter.yaml +++ b/config/jobs/kubernetes/sig-release/promo-tools/promo-tools.yaml @@ -88,11 +88,11 @@ presubmits: - files - --manifests=/home/prow/go/src/github.com/kubernetes/k8s.io/artifacts/ - --dry-run=true - kubernetes-sigs/k8s-container-image-promoter: + kubernetes-sigs/promo-tools: # Run promoter e2e tests. - name: pull-cip-e2e decorate: true - path_alias: "sigs.k8s.io/k8s-container-image-promoter" + path_alias: "sigs.k8s.io/promo-tools" skip_report: false always_run: true # Because we run e2e tests, we cannot run more than 1 instance at a time @@ -131,7 +131,7 @@ presubmits: testgrid-alert-email: release-managers+alerts@kubernetes.io - name: pull-cip-auditor-e2e decorate: true - path_alias: "sigs.k8s.io/k8s-container-image-promoter" + path_alias: "sigs.k8s.io/promo-tools" skip_report: false always_run: true # Because we run e2e tests, we cannot run more than 1 instance at a time @@ -171,7 +171,7 @@ presubmits: - name: pull-cip-image-cip cluster: k8s-infra-prow-build decorate: true - path_alias: "sigs.k8s.io/k8s-container-image-promoter" + path_alias: "sigs.k8s.io/promo-tools" skip_report: false always_run: true spec: @@ -206,7 +206,7 @@ presubmits: # Build all binaries and also run unit tests. - name: pull-cip-unit-tests decorate: true - path_alias: "sigs.k8s.io/k8s-container-image-promoter" + path_alias: "sigs.k8s.io/promo-tools" skip_report: false always_run: true branches: @@ -227,7 +227,7 @@ presubmits: # Run linter. - name: pull-cip-verify decorate: true - path_alias: "sigs.k8s.io/k8s-container-image-promoter" + path_alias: "sigs.k8s.io/promo-tools" skip_report: false always_run: true branches: @@ -247,7 +247,7 @@ presubmits: testgrid-alert-email: release-managers+alerts@kubernetes.io - name: pull-cip-verify-archives decorate: true - path_alias: "sigs.k8s.io/k8s-container-image-promoter" + path_alias: "sigs.k8s.io/promo-tools" skip_report: false always_run: true labels: diff --git a/config/prow/plugins.yaml b/config/prow/plugins.yaml index b3a183d6aeb9..82bbfd740f2c 100644 --- a/config/prow/plugins.yaml +++ b/config/prow/plugins.yaml @@ -78,7 +78,7 @@ approve: - kubernetes-sigs/boskos - kubernetes-sigs/downloadkubernetes - kubernetes-sigs/e2e-framework - - kubernetes-sigs/k8s-container-image-promoter + - kubernetes-sigs/promo-tools - kubernetes-sigs/k8s-gsm-tools - kubernetes-sigs/kind - kubernetes-sigs/kubetest2 @@ -129,7 +129,7 @@ lgtm: - kubernetes-sigs/controller-runtime - kubernetes-sigs/downloadkubernetes - kubernetes-sigs/e2e-framework - - kubernetes-sigs/k8s-container-image-promoter + - kubernetes-sigs/promo-tools - kubernetes-sigs/k8s-gsm-tools - kubernetes-sigs/kind - kubernetes-sigs/kubetest2 @@ -1088,7 +1088,7 @@ plugins: - override - release-note - kubernetes-sigs/k8s-container-image-promoter: + kubernetes-sigs/promo-tools: plugins: - mergecommitblocker - override diff --git a/label_sync/labels.md b/label_sync/labels.md index 0d8f240737a9..b9dbf76f5ed0 100644 --- a/label_sync/labels.md +++ b/label_sync/labels.md @@ -14,9 +14,9 @@ - [Labels that apply to kubernetes-sigs/cluster-api-provider-azure, for both issues and PRs](#labels-that-apply-to-kubernetes-sigscluster-api-provider-azure-for-both-issues-and-prs) - [Labels that apply to kubernetes-sigs/contributor-tweets, for both issues and PRs](#labels-that-apply-to-kubernetes-sigscontributor-tweets-for-both-issues-and-prs) - [Labels that apply to kubernetes-sigs/gateway-api, only for issues](#labels-that-apply-to-kubernetes-sigsgateway-api-only-for-issues) -- [Labels that apply to kubernetes-sigs/k8s-container-image-promoter, for both issues and PRs](#labels-that-apply-to-kubernetes-sigsk8s-container-image-promoter-for-both-issues-and-prs) - [Labels that apply to kubernetes-sigs/kind, for both issues and PRs](#labels-that-apply-to-kubernetes-sigskind-for-both-issues-and-prs) - [Labels that apply to kubernetes-sigs/krew, for both issues and PRs](#labels-that-apply-to-kubernetes-sigskrew-for-both-issues-and-prs) +- [Labels that apply to kubernetes-sigs/promo-tools, for both issues and PRs](#labels-that-apply-to-kubernetes-sigspromo-tools-for-both-issues-and-prs) - [Labels that apply to kubernetes/community, for both issues and PRs](#labels-that-apply-to-kubernetescommunity-for-both-issues-and-prs) - [Labels that apply to kubernetes/dns, only for issues](#labels-that-apply-to-kubernetesdns-only-for-issues) - [Labels that apply to kubernetes/enhancements, for both issues and PRs](#labels-that-apply-to-kubernetesenhancements-for-both-issues-and-prs) @@ -248,13 +248,6 @@ larger set of contributors to apply/remove them. | ---- | ----------- | -------- | --- | | `kind/user-story` | Categorizes an issue as capturing a user story| humans | | -## Labels that apply to kubernetes-sigs/k8s-container-image-promoter, for both issues and PRs - -| Name | Description | Added By | Prow Plugin | -| ---- | ----------- | -------- | --- | -| `area/artifacts` | Issues or PRs related to the hosting of release artifacts for subprojects| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) | -| `area/release-eng` | Issues or PRs related to the Release Engineering subproject

This was previously `area/release-infra`, | label | | - ## Labels that apply to kubernetes-sigs/kind, for both issues and PRs | Name | Description | Added By | Prow Plugin | @@ -271,6 +264,13 @@ larger set of contributors to apply/remove them. | `priority/P2` | P2 issues or PRs| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) | | `priority/P3` | P3 issues or PRs| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) | +## Labels that apply to kubernetes-sigs/promo-tools, for both issues and PRs + +| Name | Description | Added By | Prow Plugin | +| ---- | ----------- | -------- | --- | +| `area/artifacts` | Issues or PRs related to the hosting of release artifacts for subprojects| anyone | [label](https://git.k8s.io/test-infra/prow/plugins/label) | +| `area/release-eng` | Issues or PRs related to the Release Engineering subproject

This was previously `area/release-infra`, | label | | + ## Labels that apply to kubernetes/community, for both issues and PRs | Name | Description | Added By | Prow Plugin | diff --git a/label_sync/labels.yaml b/label_sync/labels.yaml index 5aab8b83557e..98c6157914b1 100644 --- a/label_sync/labels.yaml +++ b/label_sync/labels.yaml @@ -1877,7 +1877,7 @@ repos: name: area/provider/podman target: both addedBy: humans - kubernetes-sigs/k8s-container-image-promoter: + kubernetes-sigs/promo-tools: labels: - color: 0052cc description: Issues or PRs related to the hosting of release artifacts for subprojects diff --git a/prow/cip-manifest.yaml b/prow/cip-manifest.yaml index c0fd33a257e7..259c8c4d7910 100644 --- a/prow/cip-manifest.yaml +++ b/prow/cip-manifest.yaml @@ -1,5 +1,5 @@ # Container Image Promoter manifest file for promoting images from gcr.io/k8s-prow-edge to gcr.io/k8s-prow -# https://github.com/kubernetes-sigs/k8s-container-image-promoter/tree/master +# https://sigs.k8s.io/promo-tools registries: - name: gcr.io/k8s-prow-edge # publicly readable, does not need a service account for access src: true # mark it as the source registry (required)