From 0981780d6a1a712ca28deec4d1954a28ca61b3c9 Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Sat, 2 Aug 2025 15:01:00 -0700 Subject: [PATCH] account for move of repo from vmware-tanzu to vmware on GitHub --- CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md | 2 +- MAINTAINERS.md | 2 +- README.md | 12 ++++++------ SECURITY.md | 2 +- hack/approve-and-merge.sh | 4 ++-- pipelines/main/pipeline.yml | 12 ++++++------ pipelines/security-scan/pipeline.yml | 4 ++-- pipelines/shared-tasks/format-release/task.yml | 4 ++-- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index bcaf5107c..13052762a 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1 +1 @@ -Please see https://github.com/vmware-tanzu/pinniped/blob/main/CODE_OF_CONDUCT.md +Please see https://github.com/vmware/pinniped/blob/main/CODE_OF_CONDUCT.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f317e8d99..bef83c612 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1 +1 @@ -Please see https://github.com/vmware-tanzu/pinniped/blob/main/CONTRIBUTING.md +Please see https://github.com/vmware/pinniped/blob/main/CONTRIBUTING.md diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 301982f18..8583a9f99 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -1 +1 @@ -Please see https://github.com/vmware-tanzu/pinniped/blob/main/MAINTAINERS.md +Please see https://github.com/vmware/pinniped/blob/main/MAINTAINERS.md diff --git a/README.md b/README.md index aa26683dd..15b18d6cc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Pinniped's `ci` branch -This `ci` branch contains the CI/CD tooling for [Pinniped](https://github.com/vmware-tanzu/pinniped). +This `ci` branch contains the CI/CD tooling for [Pinniped](https://github.com/vmware/pinniped). The documentation and code in this branch is mainly intended for the maintainers of Pinniped. @@ -13,20 +13,20 @@ for these files was not copied from the private repository at the time of this m ## Reporting an issue in this branch Found a bug or would like to make an enhancement request? -Please report issues in [this repo](https://github.com/vmware-tanzu/pinniped). +Please report issues in [this repo](https://github.com/vmware/pinniped). ## Reporting security vulnerabilities -Please follow the procedure described in [SECURITY.md](https://github.com/vmware-tanzu/pinniped/blob/main/SECURITY.md). +Please follow the procedure described in [SECURITY.md](https://github.com/vmware/pinniped/blob/main/SECURITY.md). ## Creating a release When the team is preparing to ship a release, a maintainer will create a new -GitHub [Issue](https://github.com/vmware-tanzu/pinniped/issues/new/choose) in this repo to +GitHub [Issue](https://github.com/vmware/pinniped/issues/new/choose) in this repo to collaboratively track progress on the release checklist. As tasks are completed, the team will check them off. When all the tasks are completed, the issue is closed. -The release checklist is committed to this repo as an [issue template](https://github.com/vmware-tanzu/pinniped/tree/main/.github/ISSUE_TEMPLATE/release_checklist.md). +The release checklist is committed to this repo as an [issue template](https://github.com/vmware/pinniped/tree/main/.github/ISSUE_TEMPLATE/release_checklist.md). ## Pipelines @@ -115,7 +115,7 @@ Some pipelines use github [webhooks to trigger resource checks](https://concours rather than the default of polling every minute, to make these pipelines more responsive and use fewer compute resources for running checks. Refer to places where `webhook_token` is configured in various `pipeline.yml` files. -To make these webhooks work, they must be defined on the [GitHub repo's settings](https://github.com/vmware-tanzu/pinniped/settings/hooks). +To make these webhooks work, they must be defined on the [GitHub repo's settings](https://github.com/vmware/pinniped/settings/hooks). ## Installing and operating Concourse diff --git a/SECURITY.md b/SECURITY.md index ac0e30d9a..d022ed8d6 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1 +1 @@ -Please see https://github.com/vmware-tanzu/pinniped/blob/main/SECURITY.md +Please see https://github.com/vmware/pinniped/blob/main/SECURITY.md diff --git a/hack/approve-and-merge.sh b/hack/approve-and-merge.sh index 03e4cc59d..9d154479d 100755 --- a/hack/approve-and-merge.sh +++ b/hack/approve-and-merge.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash -# Copyright 2020-2024 the Pinniped contributors. All Rights Reserved. +# Copyright 2020-2025 the Pinniped contributors. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 set -euo pipefail -repo=vmware-tanzu/pinniped +repo=vmware/pinniped current_branch_name=$(git rev-parse --abbrev-ref HEAD) if [[ "$current_branch_name" != "ci" ]]; then diff --git a/pipelines/main/pipeline.yml b/pipelines/main/pipeline.yml index b744a1878..91d29d019 100644 --- a/pipelines/main/pipeline.yml +++ b/pipelines/main/pipeline.yml @@ -561,7 +561,7 @@ resources: icon: github check_every: 5m source: - owner: vmware-tanzu + owner: vmware repository: pinniped access_token: ((ci-bot-access-token-with-public-repo-write-permission)) drafts: true @@ -571,7 +571,7 @@ resources: icon: github check_every: 5m source: - owner: vmware-tanzu + owner: vmware repository: pinniped access_token: ((ci-bot-access-token-with-public-repo-write-permission)) @@ -736,9 +736,9 @@ jobs: # Also note that the GitHub UI says: "To connect a repository to your container image, the namespace # for the repository and container image on GitHub must be the same. For example, they should be owned by # the same user or organization." So these would only show in the GitHub UI for a package owned by the - # vmware-tanzu org. + # vmware org. # It is not clear if dockerhub will pay any attention to these labels for its UI. It doesn't seem to. - LABEL_org.opencontainers.image.source: "https://github.com/vmware-tanzu/pinniped" + LABEL_org.opencontainers.image.source: "https://github.com/vmware/pinniped" LABEL_org.opencontainers.image.licenses: "Apache-2.0" LABEL_org.opencontainers.image.description: "The official container images of https://pinniped.dev" - put: ci-build-image @@ -2674,7 +2674,7 @@ jobs: params: SOURCE_REPOSITORY_USERNAME: ((ci-ghcr-puller-username)) SOURCE_REPOSITORY_PASSWORD: ((ci-ghcr-puller-token)) - DESTINATION_REPOSITORY: ghcr.io/vmware-tanzu/pinniped/pinniped-server + DESTINATION_REPOSITORY: ghcr.io/vmware/pinniped/pinniped-server DESTINATION_TAG: latest # note that we will also choose more tags based on the release-info output from the task above DESTINATION_REPOSITORY_USERNAME: ((ci-ghcr-pusher-username)) DESTINATION_REPOSITORY_PASSWORD: ((ci-ghcr-pusher-token)) @@ -2683,7 +2683,7 @@ jobs: image: deployment-yaml-formatter-image params: # Specify the repo to render into the YAML files. The task will ask the registry for the image digest using the release tag. - IMAGE_REPO: ghcr.io/vmware-tanzu/pinniped/pinniped-server + IMAGE_REPO: ghcr.io/vmware/pinniped/pinniped-server - put: github-release inputs: - release-semver diff --git a/pipelines/security-scan/pipeline.yml b/pipelines/security-scan/pipeline.yml index 353c66b63..9eb9b4415 100644 --- a/pipelines/security-scan/pipeline.yml +++ b/pipelines/security-scan/pipeline.yml @@ -56,7 +56,7 @@ resources: type: git icon: github source: - uri: https://github.com/vmware-tanzu/pinniped.git + uri: https://github.com/vmware/pinniped.git branch: main - name: pinniped-ci @@ -72,7 +72,7 @@ resources: icon: docker check_every: 10m source: - repository: ghcr.io/vmware-tanzu/pinniped/pinniped-server + repository: ghcr.io/vmware/pinniped/pinniped-server tag: latest - name: pinniped-latest-main-image diff --git a/pipelines/shared-tasks/format-release/task.yml b/pipelines/shared-tasks/format-release/task.yml index 9ac7914a9..79b6f6215 100644 --- a/pipelines/shared-tasks/format-release/task.yml +++ b/pipelines/shared-tasks/format-release/task.yml @@ -43,7 +43,7 @@ run: | Image | Registry | | -------------- | ------------- | - | \`ghcr.io/vmware-tanzu/pinniped/pinniped-server:$THIS_VERSION\` | GitHub Container Registry | + | \`ghcr.io/vmware/pinniped/pinniped-server:$THIS_VERSION\` | GitHub Container Registry | | \`docker.io/getpinniped/pinniped-server:$THIS_VERSION\` | DockerHub | These images can also be referenced by their digest: \`$(cat ci-build-image/digest)\`. @@ -67,7 +67,7 @@ run: ### Diffs *TODO*: Make sure the following references the correct version tags. Note that the link will not work until the release is published (made public):
- A complete list of changes can be found [here](https://github.com/vmware-tanzu/pinniped/compare/$PREVIOUS_VERSION...$THIS_VERSION). + A complete list of changes can be found [here](https://github.com/vmware/pinniped/compare/$PREVIOUS_VERSION...$THIS_VERSION). ## Acknowledgements