Skip to content

Commit

Permalink
Cleanup plugin load image builds
Browse files Browse the repository at this point in the history
Summary:
This was in a halfway state because we switched when/how these get
built and run. Now that the job image is built as part of `cloud_images_push`
we no longer need the manual builds.

Test Plan:
skaffold dev cloud builds and runs the latest load_db image.
Prod cloud releases should build, push and apply the appropriate image.

Reviewers: michelle, philkuz

Reviewed By: michelle

Signed-off-by: Vihang Mehta <vihang@pixielabs.ai>

Differential Revision: https://phab.corp.pixielabs.ai/D12464

GitOrigin-RevId: 8b569b04c48535b4b3fd3bb58613bffc31a1d511
  • Loading branch information
vihangm authored and copybaranaut committed Oct 31, 2022
1 parent 1588c30 commit c2d4516
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
5 changes: 0 additions & 5 deletions ci/cloud_build_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@ if [[ "$PUBLIC" == "true" ]]; then
gsutil cp "${repo_path}/bazel-bin/tools/licenses/all_licenses.json" "gs://pixie-dev-public/oss-licenses/${image_tag}.json"
gsutil cp "${repo_path}/bazel-bin/tools/licenses/all_licenses.json" "gs://pixie-dev-public/oss-licenses/latest.json"

bazel run --stamp -c opt --action_env=GOOGLE_APPLICATION_CREDENTIALS --define BUNDLE_VERSION="${image_tag}" \
//src/cloud/plugin/load_db:push_plugin_db_updater_image
bazel run --stamp -c opt --action_env=GOOGLE_APPLICATION_CREDENTIALS --define BUNDLE_VERSION="latest" \
//src/cloud/plugin/load_db:push_plugin_db_updater_image

# Write YAMLs + image paths to a tar file to support easy deployment.
mkdir -p "${repo_path}/pixie_cloud"
mkdir -p "${repo_path}/pixie_cloud/yamls"
Expand Down
3 changes: 3 additions & 0 deletions k8s/cloud/public/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,6 @@ images:
- name: gcr.io/pixie-oss/pixie-dev/cloud/job/create_admin_job_image
newName: gcr.io/pixie-oss/pixie-prod/cloud/job/create_admin_job_image
newTag: latest
- name: gcr.io/pixie-oss/pixie-dev/cloud/plugin/load_db
newName: gcr.io/pixie-oss/pixie-prod/cloud/plugin/load_db
newTag: latest
4 changes: 4 additions & 0 deletions skaffold/skaffold_cloud.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ build:
context: .
bazel:
target: //src/cloud/jobs/create_admin_user:create_admin_job_image.tar
- image: gcr.io/pixie-oss/pixie-dev/cloud/plugin/load_db
context: .
bazel:
target: //src/cloud/plugin/load_db:plugin_db_updater_image.tar
- image: gcr.io/pixie-oss/pixie-dev/cloud/metrics_server_image
context: .
bazel:
Expand Down
3 changes: 1 addition & 2 deletions src/cloud/plugin/load_db/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@ container_push(
image = ":plugin_db_updater_image",
registry = "gcr.io",
repository = "pixie-oss/pixie-dev/cloud/plugin/load_db",
tag = "$(BUNDLE_VERSION)",
tags = ["manual"],
tag = "{STABLE_BUILD_TAG}",
)

go_test(
Expand Down

0 comments on commit c2d4516

Please sign in to comment.