Skip to content

Commit fc7bb3e

Browse files
committed
Push to ghcr.io/pixie-io due to New Relic deprecation
Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
1 parent 64e5a72 commit fc7bb3e

5 files changed

Lines changed: 10 additions & 33 deletions

File tree

.github/workflows/vizier_release.yaml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- release/vizier/**
77
permissions:
88
contents: read
9+
packages: write
910
env:
1011
VERSIONS_FILE: "VERSIONS.json"
1112
jobs:
@@ -33,10 +34,8 @@ jobs:
3334
with:
3435
download_toplevel: 'true'
3536
BB_API_KEY: ${{ secrets.BB_IO_API_KEY }}
36-
- id: gcloud-creds
37-
uses: ./.github/actions/gcloud_creds
38-
with:
39-
SERVICE_ACCOUNT_KEY: ${{ secrets.GH_RELEASE_SA_PEM_B64 }}
37+
- name: Login to GHCR
38+
run: echo "${{ github.token }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
4039
- name: Import GPG key
4140
env:
4241
BUILDBOT_GPG_KEY_B64: ${{ secrets.BUILDBOT_GPG_KEY_B64 }}
@@ -49,7 +48,6 @@ jobs:
4948
JOB_NAME: ${{ github.job }}
5049
COSIGN_PASSWORD: ${{secrets.COSIGN_PASSWORD}}
5150
COSIGN_PRIVATE_KEY: ${{secrets.COSIGN_PRIVATE_KEY}}
52-
GOOGLE_APPLICATION_CREDENTIALS: ${{ steps.gcloud-creds.outputs.gcloud-creds }}
5351
BUILDBOT_GPG_KEY_ID: ${{ secrets.BUILDBOT_GPG_KEY_ID }}
5452
GH_REPO: ${{ github.repository }}
5553
shell: bash
@@ -60,20 +58,6 @@ jobs:
6058
export INDEX_FILE="$(pwd)/index.yaml"
6159
./ci/save_version_info.sh
6260
./ci/vizier_build_release.sh
63-
- name: Build & Export Docs
64-
env:
65-
PXL_DOCS_GCS_PATH: "gs://pixie-dev-public/pxl-docs.json"
66-
run: |
67-
docs="$(mktemp)"
68-
bazel run //src/carnot/docstring:docstring -- --output_json "${docs}"
69-
gsutil cp "${docs}" "${PXL_DOCS_GCS_PATH}"
70-
- name: Update GCS Manifest
71-
env:
72-
ARTIFACT_MANIFEST_BUCKET: "pixie-dev-public"
73-
# Use the old style versions file instead of the new updates for the gcs manifest.
74-
MANIFEST_UPDATES: ""
75-
GOOGLE_APPLICATION_CREDENTIALS: ${{ steps.gcloud-creds.outputs.gcloud-creds }}
76-
run: ./ci/update_artifact_manifest.sh
7761
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
7862
with:
7963
name: manifest-updates

ci/artifact_mirrors.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,3 @@
44
- name: gh-releases
55
type: gh-releases
66
url_format: 'https://github.com/${gh_repo}/releases/download/release/${component}/v${version}/${artifact_name}'
7-
- name: pixie-oss-gcs
8-
type: gcs
9-
bucket: pixie-dev-public
10-
path_format: '${component}/${version}/${artifact_name}'
11-
url_format: 'https://storage.googleapis.com/pixie-dev-public/${component}/${version}/${artifact_name}'

ci/image_utils.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,11 @@ push_multiarch_image() {
4242
x86_image="${multiarch_image}-x86_64"
4343
aarch64_image="${multiarch_image}-aarch64"
4444
echo "Building ${multiarch_image} manifest"
45-
# If the multiarch manifest list already exists locally, remove it before building a new one.
46-
# otherwise, the docker manifest create step will fail because it can't amend manifests to an existing image.
47-
# We could use the --amend flag to `manifest create` but it doesn't seem to overwrite existing images with the same tag,
48-
# instead it seems to just ignore images that already exist in the local manifest.
49-
docker manifest rm "${multiarch_image}" || true
50-
docker manifest create "${multiarch_image}" "${x86_image}" "${aarch64_image}"
51-
pushed_digest=$(docker manifest push "${multiarch_image}")
45+
crane index append \
46+
--manifest "${x86_image}" \
47+
--manifest "${aarch64_image}" \
48+
--tag "${multiarch_image}"
49+
pushed_digest=$(crane digest "${multiarch_image}")
5250

5351
sign_image "${multiarch_image}" "${pushed_digest}"
5452
}

ci/vizier_build_release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ echo "The release tag is: ${release_tag}"
3535
bazel run -c opt //src/utils/artifacts/versions_gen:versions_gen -- \
3636
--repo_path "${repo_path}" --artifact_name vizier --versions_file "${versions_file}"
3737

38-
image_repo="gcr.io/pixie-oss/pixie-prod"
38+
image_repo="ghcr.io/pixie-io"
3939

4040
push_all_multiarch_images "//k8s/vizier:vizier_images_push" "//k8s/vizier:list_image_bundle" "${release_tag}" "${image_repo}"
4141

src/shared/metadata/cgroup_path_resolver.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace md {
3535

3636
StatusOr<std::vector<std::string>> CGroupBasePaths(std::string_view sysfs_path) {
3737
std::vector<std::string> base_paths;
38-
// Different hosts may mount different cgroup dirs. Try a couple for robustness.
38+
// Different hosts may mount different cgroup dirs. Try a couple for robustness
3939
const std::vector<std::string> cgroup_dirs = {"cpu,cpuacct", "cpu", "pids"};
4040

4141
for (const auto& cgroup_dir : cgroup_dirs) {

0 commit comments

Comments
 (0)