Skip to content

Commit

Permalink
Update documentation to use new tanzu-cli-installer-packages repo f…
Browse files Browse the repository at this point in the history
…or APT/RPM packages and new Public Key (#816)

* Update documentation to use new `tanzu-cli-installer-packages` repo for APT/RPM packages and new Public Key

* Update repo location and key in apt/rpm packages and plugin templates
  • Loading branch information
anujc25 committed Oct 10, 2024
1 parent 9294e28 commit 1a04b45
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y ca-certificates
sudo echo "deb https://storage.googleapis.com/tanzu-cli-os-packages/apt tanzu-cli-jessie main" | sudo tee /etc/apt/sources.list.d/tanzu.list
sudo echo "deb https://storage.googleapis.com/tanzu-cli-installer-packages/apt tanzu-cli-jessie main" | sudo tee /etc/apt/sources.list.d/tanzu.list
sudo apt-get update --allow-insecure-repositories
sudo apt-get install -y tanzu-cli --allow-unauthenticated
tanzu ceip-participation set false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ build-job:
script:
- apt-get update
- apt-get install -y ca-certificates
- echo "deb https://storage.googleapis.com/tanzu-cli-os-packages/apt tanzu-cli-jessie main" | tee /etc/apt/sources.list.d/tanzu.list
- echo "deb https://storage.googleapis.com/tanzu-cli-installer-packages/apt tanzu-cli-jessie main" | tee /etc/apt/sources.list.d/tanzu.list
- apt-get update --allow-insecure-repositories
- apt-get install -y tanzu-cli --allow-unauthenticated
- tanzu ceip-participation set false
Expand Down
8 changes: 4 additions & 4 deletions docs/quickstart/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ To uninstall: `choco uninstall tanzu-cli-unstable`
sudo apt update
sudo apt install -y ca-certificates curl gpg
sudo mkdir -p /etc/apt/keyrings
curl -fsSL https://packages-prod.broadcom.com/tools/keys/VMWARE-PACKAGING-GPG-RSA-KEY.pub | sudo gpg --dearmor -o /etc/apt/keyrings/tanzu-archive-keyring.gpg
echo "deb [signed-by=/etc/apt/keyrings/tanzu-archive-keyring.gpg] https://storage.googleapis.com/tanzu-cli-os-packages/apt tanzu-cli-jessie main" | sudo tee /etc/apt/sources.list.d/tanzu.list
curl -fsSL https://storage.googleapis.com/tanzu-cli-installer-packages/keys/TANZU-PACKAGING-GPG-RSA-KEY.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/tanzu-archive-keyring.gpg
echo "deb [signed-by=/etc/apt/keyrings/tanzu-archive-keyring.gpg] https://storage.googleapis.com/tanzu-cli-installer-packages/apt tanzu-cli-jessie main" | sudo tee /etc/apt/sources.list.d/tanzu.list
sudo apt update
sudo apt install -y tanzu-cli
```
Expand Down Expand Up @@ -192,11 +192,11 @@ To uninstall: `sudo apt remove tanzu-cli-unstable`
cat << EOF | sudo tee /etc/yum.repos.d/tanzu-cli.repo
[tanzu-cli]
name=Tanzu CLI
baseurl=https://storage.googleapis.com/tanzu-cli-os-packages/rpm/tanzu-cli
baseurl=https://storage.googleapis.com/tanzu-cli-installer-packages/rpm/tanzu-cli
enabled=1
gpgcheck=1
repo_gpgcheck=1
gpgkey=https://packages-prod.broadcom.com/tools/keys/VMWARE-PACKAGING-GPG-RSA-KEY.pub
gpgkey=https://storage.googleapis.com/tanzu-cli-installer-packages/keys/TANZU-PACKAGING-GPG-RSA-KEY.gpg
EOF

sudo yum install -y tanzu-cli # dnf install can also be used
Expand Down
10 changes: 5 additions & 5 deletions hack/apt/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ run the `hack/apt/build_package*.sh` scripts.

The remote location of the existing repository can be overridden by setting
the variable `DEB_METADATA_BASE_URI`. For example, the default value for
this variable is currently `https://storage.googleapis.com/tanzu-cli-os-packages`
this variable is currently `https://storage.googleapis.com/tanzu-cli-installer-packages`

### Pre-requisite

Expand Down Expand Up @@ -82,7 +82,7 @@ apt install -y tanzu-cli-unstable --allow-unauthenticated
## Publishing the package to GCloud

The GCloud bucket dedicated to hosting the Tanzu CLI OS packages is
gs://tanzu-cli-os-packages`.
gs://tanzu-cli-installer-packages`.

Building the Debian repository incrementally means that we create the
repository metadata for the new package version *and* for any existing packages on
Expand All @@ -92,7 +92,7 @@ built `hack/apt/_output/apt` on top of the existing bucket's `apt` directory.
This can be done using the `gcloud` CLI:

```bash
gcloud storage cp -r hack/apt/_output/apt gs://tanzu-cli-os-packages
gcloud storage cp -r hack/apt/_output/apt gs://tanzu-cli-installer-packages
```

This will effectively:
Expand All @@ -115,8 +115,8 @@ $ docker run --rm -it ubuntu
apt update
apt install -y ca-certificates curl gpg
mkdir -p /etc/apt/keyrings
curl -fsSL https://packages-prod.broadcom.com/tools/keys/VMWARE-PACKAGING-GPG-RSA-KEY.pub | gpg --dearmor -o /etc/apt/keyrings/tanzu-archive-keyring.gpg
echo "deb [signed-by=/etc/apt/keyrings/tanzu-archive-keyring.gpg] https://storage.googleapis.com/tanzu-cli-os-packages/apt tanzu-cli-jessie main" | tee /etc/apt/sources.list.d/tanzu.list
curl -fsSL https://storage.googleapis.com/tanzu-cli-installer-packages/keys/TANZU-PACKAGING-GPG-RSA-KEY.gpg | gpg --dearmor -o /etc/apt/keyrings/tanzu-archive-keyring.gpg
echo "deb [signed-by=/etc/apt/keyrings/tanzu-archive-keyring.gpg] https://storage.googleapis.com/tanzu-cli-installer-packages/apt tanzu-cli-jessie main" | tee /etc/apt/sources.list.d/tanzu.list
apt update
apt install -y tanzu-cli
```
Expand Down
2 changes: 1 addition & 1 deletion hack/apt/build_package_repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ for arch in amd64 arm64; do

# All that is needed from the original repo is to have the original Packages files under:
# ${FINAL_DIR}/Packages
DEB_METADATA_BASE_URI=${DEB_METADATA_BASE_URI:=https://storage.googleapis.com/tanzu-cli-os-packages}
DEB_METADATA_BASE_URI=${DEB_METADATA_BASE_URI:=https://storage.googleapis.com/tanzu-cli-installer-packages}
mkdir -p ${FINAL_DIR}
if [ "${DEB_METADATA_BASE_URI}" = "new" ]; then
echo
Expand Down
10 changes: 5 additions & 5 deletions hack/rpm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ target will first start a docker container and then run the

The remote location of the existing repository can be overridden by setting
the variable `RPM_METADATA_BASE_URI`. For example, the default value for
this variable is currently `https://storage.googleapis.com/tanzu-cli-os-packages`
this variable is currently `https://storage.googleapis.com/tanzu-cli-installer-packages`

### Pre-requisite

Expand Down Expand Up @@ -78,7 +78,7 @@ yum install -y tanzu-cli-unstable
## Publishing the package to GCloud

The GCloud bucket dedicated to hosting the Tanzu CLI OS packages is
gs://tanzu-cli-os-packages`.
gs://tanzu-cli-installer-packages`.

Building the RPM repository incrementally means that we create the
repository metadata for the new package version *and* for any existing packages on
Expand All @@ -88,7 +88,7 @@ built `hack/rpm/_output/rpm` on top of the existing bucket's `rpm` directory.
This can be done using the `gcloud` CLI:

```bash
gcloud storage cp -r hack/rpm/_output/rpm gs://tanzu-cli-os-packages
gcloud storage cp -r hack/rpm/_output/rpm gs://tanzu-cli-installer-packages
```

This will effectively:
Expand All @@ -111,11 +111,11 @@ $ docker run --rm -it fedora
cat << EOF | sudo tee /etc/yum.repos.d/tanzu-cli.repo
[tanzu-cli]
name=Tanzu CLI
baseurl=https://storage.googleapis.com/tanzu-cli-os-packages/rpm/tanzu-cli
baseurl=https://storage.googleapis.com/tanzu-cli-installer-packages/rpm/tanzu-cli
enabled=1
gpgcheck=1
repo_gpgcheck=1
gpgkey=https://packages-prod.broadcom.com/tools/keys/VMWARE-PACKAGING-GPG-RSA-KEY.pub
gpgkey=https://storage.googleapis.com/tanzu-cli-installer-packages/keys/TANZU-PACKAGING-GPG-RSA-KEY.gpg
EOF
yum install -y tanzu-cli
```
Expand Down
4 changes: 2 additions & 2 deletions hack/rpm/build_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ done
######################

# Prepare the existing repository info so we can sync from it
RPM_METADATA_BASE_URI=${RPM_METADATA_BASE_URI:=https://storage.googleapis.com/tanzu-cli-os-packages}
RPM_REPO_GPG_PUBLIC_KEY_URI=${RPM_REPO_GPG_PUBLIC_KEY_URI:=https://packages-prod.broadcom.com/tools/keys/VMWARE-PACKAGING-GPG-RSA-KEY.pub}
RPM_METADATA_BASE_URI=${RPM_METADATA_BASE_URI:=https://storage.googleapis.com/tanzu-cli-installer-packages}
RPM_REPO_GPG_PUBLIC_KEY_URI=${RPM_REPO_GPG_PUBLIC_KEY_URI:=https://storage.googleapis.com/tanzu-cli-installer-packages/keys/TANZU-PACKAGING-GPG-RSA-KEY.gpg}
if [ "${RPM_METADATA_BASE_URI}" = "new" ]; then
echo
echo "Building a brand new repository"
Expand Down

0 comments on commit 1a04b45

Please sign in to comment.