diff --git a/README.md b/README.md index 37d792a69ae..cb61e0aba7e 100644 --- a/README.md +++ b/README.md @@ -137,4 +137,4 @@ Please see [CONTRIBUTING.md](CONTRIBUTING.md) for instructions on how to contrib [kubernetes/kubernetes]: https://git.k8s.io/kubernetes [Branch Manager Handbook]: https://git.k8s.io/sig-release/release-engineering/role-handbooks/branch-manager.md -[release-managers]: https://git.k8s.io/sig-release/release-managers.md +[release-managers]: https://git.k8s.io/website/content/en/releases/release-managers.md diff --git a/cmd/krel/cmd/announce_build.go b/cmd/krel/cmd/announce_build.go index 190eb37f188..c06b0d1c2f2 100644 --- a/cmd/krel/cmd/announce_build.go +++ b/cmd/krel/cmd/announce_build.go @@ -43,7 +43,7 @@ const semVerRegex string = `^?(\d+)(\.\d+)?(\.\d+)` const branchCreationMsg = `Kubernetes Community,

Kubernetes' {{ .Branch }} branch has been created.

The release owner will be sending updates on how to interact with this branch shortly. The Cherrypick Guide has some general guidance on how things will proceed.

-

Announced by your Kubernetes Release Managers.

+

Announced by your Kubernetes Release Managers.

` const releaseAnnouncementMsg = `Kubernetes Community, @@ -52,7 +52,7 @@ const releaseAnnouncementMsg = `Kubernetes Community,

{{ .ChangelogHTML }}


Contributors, the {{ .ChangelogFileName }} has been bootstrapped with {{ .Tag }} release notes and you may edit now as needed.

-



Published by your Kubernetes Release Managers.

+



Published by your Kubernetes Release Managers.

` // buildAnnounceCmd represents the subcommand for `krel announce build` diff --git a/hack/rapture/README.md b/hack/rapture/README.md index d0bde651f1f..08eb22dfd5c 100644 --- a/hack/rapture/README.md +++ b/hack/rapture/README.md @@ -185,7 +185,7 @@ If there is continued test failure on this dashboard without intervention from t [branch-manager-handbook]: https://github.com/kubernetes/sig-release/tree/master/release-engineering/role-handbooks/branch-manager.md [kubeadm-install]: https://kubernetes.io/docs/setup/independent/install-kubeadm/#installing-kubeadm-kubelet-and-kubectl [kubernetes/release]: https://git.k8s.io/release -[kubernetes-build-admins]: https://kubernetes.io/releases/release-managers/#build-admins +[kubernetes-build-admins]: https://git.k8s.io/website/content/en/releases/release-managers.md#build-admins [rapture]: k8s-rapture.sh [rapture-readme]: https://g3doc.corp.google.com/cloud/kubernetes/g3doc/release/rapture.md?cl=head [release-engineering-dashboard]: https://testgrid.k8s.io/sig-release-releng-informing diff --git a/pkg/announce/announce.go b/pkg/announce/announce.go index 669acb91c3d..88e2f4ac59c 100644 --- a/pkg/announce/announce.go +++ b/pkg/announce/announce.go @@ -44,7 +44,7 @@ shortly. The has some general guidance on how things will proceed.

Announced by your -Kubernetes Release +Kubernetes Release Managers. ` @@ -65,7 +65,7 @@ Contributors, the %s release notes and you may edit now as needed.



Published by your -Kubernetes Release +Kubernetes Release Managers. ` diff --git a/pkg/notes/document/document.go b/pkg/notes/document/document.go index 30be1585ab4..ad8b32e03cb 100644 --- a/pkg/notes/document/document.go +++ b/pkg/notes/document/document.go @@ -30,7 +30,6 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/text/cases" "golang.org/x/text/language" - "sigs.k8s.io/promo-tools/v3/image" "sigs.k8s.io/release-utils/hash" "k8s.io/release/pkg/cve" @@ -39,6 +38,8 @@ import ( "k8s.io/release/pkg/release" ) +const prodRegistry = "registry.k8s.io" + // Document represents the underlying structure of a release notes document. type Document struct { NotesWithActionRequired notes.Notes `json:"action_required"` @@ -112,7 +113,7 @@ func fetchImageMetadata(dir, tag string) (*ImageMetadata, error) { } manifests, err := release.NewImages().GetManifestImages( - image.ProdRegistry, tag, dir, nil, + prodRegistry, tag, dir, nil, ) if err != nil { return nil, fmt.Errorf("get manifest images: %w", err) @@ -129,7 +130,7 @@ func fetchImageMetadata(dir, tag string) (*ImageMetadata, error) { const linkBase = "https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/" for manifest, tempArchitectures := range manifests { - imageName := strings.TrimPrefix(manifest, image.ProdRegistry+"/") + imageName := strings.TrimPrefix(manifest, prodRegistry+"/") architectures := []string{} for _, architecture := range tempArchitectures { diff --git a/pkg/notes/document/document_test.go b/pkg/notes/document/document_test.go index eac4dea68df..a4c66986d88 100644 --- a/pkg/notes/document/document_test.go +++ b/pkg/notes/document/document_test.go @@ -271,7 +271,7 @@ func setupTestDir(t *testing.T, dir string) { } { repoTagTarball(t, filepath.Join(archDir, file), - "k8s.gcr.io/"+strings.TrimSuffix(file, ".tar")+":v1.16.0", + "registry.k8s.io/"+strings.TrimSuffix(file, ".tar")+":v1.16.0", ) } } @@ -568,5 +568,5 @@ func makeReleaseNote(kind notes.Kind, markdown string) *notes.ReleaseNote { func readFile(t *testing.T, path string) string { b, err := os.ReadFile(path) require.NoError(t, err, "Reading file %q", path) - return string(b) + return strings.TrimSpace(string(b)) } diff --git a/pkg/notes/document/testdata/document.md.golden b/pkg/notes/document/testdata/document.md.golden index b7eab8dc81d..0454d257d02 100644 --- a/pkg/notes/document/testdata/document.md.golden +++ b/pkg/notes/document/testdata/document.md.golden @@ -51,11 +51,11 @@ adding the "-$ARCH" suffix to the container image name. name | architectures ---- | ------------- -[k8s.gcr.io/conformance:v1.16.1](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/conformance) | [amd64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/conformance-amd64), [arm](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/conformance-arm), [arm64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/conformance-arm64), [ppc64le](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/conformance-ppc64le), [s390x](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/conformance-s390x) -[k8s.gcr.io/kube-apiserver:v1.16.1](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-apiserver) | [amd64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-apiserver-amd64), [arm](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-apiserver-arm), [arm64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-apiserver-arm64), [ppc64le](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-apiserver-ppc64le), [s390x](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-apiserver-s390x) -[k8s.gcr.io/kube-controller-manager:v1.16.1](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-controller-manager) | [amd64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-controller-manager-amd64), [arm](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-controller-manager-arm), [arm64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-controller-manager-arm64), [ppc64le](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-controller-manager-ppc64le), [s390x](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-controller-manager-s390x) -[k8s.gcr.io/kube-proxy:v1.16.1](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-proxy) | [amd64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-proxy-amd64), [arm](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-proxy-arm), [arm64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-proxy-arm64), [ppc64le](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-proxy-ppc64le), [s390x](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-proxy-s390x) -[k8s.gcr.io/kube-scheduler:v1.16.1](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-scheduler) | [amd64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-scheduler-amd64), [arm](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-scheduler-arm), [arm64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-scheduler-arm64), [ppc64le](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-scheduler-ppc64le), [s390x](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-scheduler-s390x) +[registry.k8s.io/conformance:v1.16.1](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/conformance) | [amd64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/conformance-amd64), [arm](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/conformance-arm), [arm64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/conformance-arm64), [ppc64le](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/conformance-ppc64le), [s390x](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/conformance-s390x) +[registry.k8s.io/kube-apiserver:v1.16.1](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-apiserver) | [amd64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-apiserver-amd64), [arm](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-apiserver-arm), [arm64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-apiserver-arm64), [ppc64le](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-apiserver-ppc64le), [s390x](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-apiserver-s390x) +[registry.k8s.io/kube-controller-manager:v1.16.1](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-controller-manager) | [amd64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-controller-manager-amd64), [arm](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-controller-manager-arm), [arm64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-controller-manager-arm64), [ppc64le](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-controller-manager-ppc64le), [s390x](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-controller-manager-s390x) +[registry.k8s.io/kube-proxy:v1.16.1](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-proxy) | [amd64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-proxy-amd64), [arm](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-proxy-arm), [arm64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-proxy-arm64), [ppc64le](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-proxy-ppc64le), [s390x](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-proxy-s390x) +[registry.k8s.io/kube-scheduler:v1.16.1](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-scheduler) | [amd64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-scheduler-amd64), [arm](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-scheduler-arm), [arm64](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-scheduler-arm64), [ppc64le](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-scheduler-ppc64le), [s390x](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/kube-scheduler-s390x) ## Urgent Upgrade Notes @@ -99,4 +99,4 @@ name | architectures ### Uncategorized -- Uncategorized note. \ No newline at end of file +- Uncategorized note. diff --git a/pkg/notes/document/testdata/document_without_downloads.md.golden b/pkg/notes/document/testdata/document_without_downloads.md.golden index 58f93128178..13880b05f6f 100644 --- a/pkg/notes/document/testdata/document_without_downloads.md.golden +++ b/pkg/notes/document/testdata/document_without_downloads.md.golden @@ -40,4 +40,4 @@ ### Uncategorized -- Uncategorized note. \ No newline at end of file +- Uncategorized note.