Skip to content

Commit 110a775

Browse files
zasgarzasgar
committed
Move Pixie CLI to top level directory
Summary: It's more than a util now. Test Plan: existing Reviewers: michelle, #engineering Reviewed By: michelle, #engineering Differential Revision: https://phab.corp.pixielabs.ai/D7033 GitOrigin-RevId: 79fbc74
1 parent 66766d8 commit 110a775

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+177
-177
lines changed

‎Jenkinsfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,8 +1060,8 @@ def deployWithSkaffold(String profile, String namespace, String skaffoldFile) {
10601060
serverUrl: K8S_PROD_CLUSTER, namespace: namespace]) {
10611061
sh "skaffold build -q -o '{{json .}}' -p ${profile} -f ${skaffoldFile} --cache-artifacts=false > manifest.json"
10621062
sh "skaffold deploy -p ${profile} --build-artifacts=manifest.json -f ${skaffoldFile}"
1063-
sh 'bazel build //src/utils/pixie_cli:px'
1064-
sh 'mv bazel-bin/src/utils/pixie_cli/px_/px /usr/local/bin/'
1063+
sh 'bazel build //src/pixie_cli:px'
1064+
sh 'mv bazel-bin/src/pixie_cli/px_/px /usr/local/bin/'
10651065
dir ('src/pxl_scripts') {
10661066
if (profile == 'prod') {
10671067
sh 'make update_bundle'

‎ci/cli_build_release.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ pkg_prefix="pixie-px-${release_tag}.${arch}"
1414
versions_file="${repo_path}/src/utils/artifacts/artifact_db_updater/VERSIONS.json"
1515

1616
echo "The release tag is: ${release_tag}"
17-
linux_binary=bazel-bin/src/utils/pixie_cli/px_/px
17+
linux_binary=bazel-bin/src/pixie_cli/px_/px
1818
docker_repo="pixielabs/px"
1919

2020
bazel run -c opt //src/utils/artifacts/versions_gen:versions_gen -- \
2121
--repo_path "${repo_path}" --artifact_name cli --versions_file "${versions_file}"
2222

23-
bazel build -c opt --build_event_text_file=/tmp/darwin_build --stamp //src/utils/pixie_cli:px_darwin
23+
bazel build -c opt --build_event_text_file=/tmp/darwin_build --stamp //src/pixie_cli:px_darwin
2424

25-
bazel build -c opt --stamp //src/utils/pixie_cli:px
25+
bazel build -c opt --stamp //src/pixie_cli:px
2626

2727
# Create and push docker image.
28-
bazel run -c opt --stamp //src/utils/pixie_cli:push_px_image
28+
bazel run -c opt --stamp //src/pixie_cli:push_px_image
2929

3030
if [[ ! "$release_tag" == *"-"* ]]; then
3131
# Make tmp directory, because the binary path is a symlink.
@@ -68,7 +68,7 @@ if [[ ! "$release_tag" == *"-"* ]]; then
6868
px
6969

7070
# Push officially releases to docker hub.
71-
bazel run -c opt --stamp //src/utils/pixie_cli:push_px_image_to_docker
71+
bazel run -c opt --stamp //src/pixie_cli:push_px_image_to_docker
7272

7373
# Update latest tag.
7474
docker pull "${docker_repo}:${release_tag}"

‎scripts/create_release_tag.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ check_args() {
5252

5353
get_bazel_target() {
5454
case "$ARTIFACT_TYPE" in
55-
cli) BAZEL_TARGET=//src/utils/pixie_cli:px;;
55+
cli) BAZEL_TARGET=//src/pixie_cli:px;;
5656
vizier) BAZEL_TARGET=//k8s/vizier:public_vizier_images_bundle;;
5757
esac
5858
}

‎scripts/load_vizier_secrets.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ fi
88

99
workspace=$(bazel info workspace 2> /dev/null)
1010

11-
cd ${workspace}/src/utils/pixie_cli/
11+
cd ${workspace}/src/pixie_cli/
1212
bazel run :px -- install-certs --namespace="$namespace" 2>/dev/null

‎scripts/update_tls_certs.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fi
4747

4848
workspace=$(bazel info workspace 2> /dev/null)
4949
pushd "${dir}"
50-
bazel run //src/utils/pixie_cli:px -- install-certs --namespace="$namespace"
50+
bazel run //src/pixie_cli:px -- install-certs --namespace="$namespace"
5151
kubectl -n "${namespace}" get secrets service-tls-certs -o yaml | \
5252
python "${workspace}/scripts/decode_yaml_secret.py" > out.unenc.yaml
5353
sops --encrypt out.unenc.yaml > service_tls_certs.yaml

‎src/carnot/planner/benchmark/BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ go_test(
88
srcs = ["logical_planner_benchmark.go", "proto.go"],
99
deps = [
1010
"//src/carnot/planner:go_default_library",
11-
"//src/utils/pixie_cli/pkg/script:go_default_library",
12-
"//src/utils/pixie_cli/pkg/vizier:go_default_library",
11+
"//src/pixie_cli/pkg/script:go_default_library",
12+
"//src/pixie_cli/pkg/vizier:go_default_library",
1313
"//src/shared/vispb:vis_pl_go_proto",
1414
"//src/vizier/services/query_broker/controllers:go_default_library",
1515
"//src/vizier/vizierpb:vizier_pl_go_proto",

‎src/carnot/planner/benchmark/logical_planner_benchmark.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
log "github.com/sirupsen/logrus"
88

99
"pixielabs.ai/pixielabs/src/carnot/planner/plannerpb"
10+
"pixielabs.ai/pixielabs/src/pixie_cli/pkg/script"
11+
"pixielabs.ai/pixielabs/src/pixie_cli/pkg/vizier"
1012
schemapb "pixielabs.ai/pixielabs/src/table_store/proto"
11-
"pixielabs.ai/pixielabs/src/utils/pixie_cli/pkg/script"
12-
"pixielabs.ai/pixielabs/src/utils/pixie_cli/pkg/vizier"
1313
"pixielabs.ai/pixielabs/src/vizier/services/query_broker/controllers"
1414

1515
"github.com/gogo/protobuf/proto"

‎src/cloud/api/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ go_library(
1515
"//src/cloud/cloudapipb:cloudapi_pl_go_proto",
1616
"//src/cloud/shared/esutils:go_default_library",
1717
"//src/cloud/shared/vzshard:go_default_library",
18+
"//src/pixie_cli/pkg/script:go_default_library",
1819
"//src/shared/services:go_default_library",
1920
"//src/shared/services/env:go_default_library",
2021
"//src/shared/services/handler:go_default_library",
2122
"//src/shared/services/healthz:go_default_library",
22-
"//src/utils/pixie_cli/pkg/script:go_default_library",
2323
"//src/vizier/vizierpb:vizier_pl_go_proto",
2424
"@com_github_gorilla_handlers//:go_default_library",
2525
"@com_github_nats_io_nats_go//:go_default_library",

‎src/cloud/api/api_server.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import (
2222
"pixielabs.ai/pixielabs/src/cloud/api/apienv"
2323
"pixielabs.ai/pixielabs/src/cloud/api/controller"
2424
"pixielabs.ai/pixielabs/src/cloud/shared/esutils"
25+
"pixielabs.ai/pixielabs/src/pixie_cli/pkg/script"
2526
"pixielabs.ai/pixielabs/src/shared/services"
2627
svcEnv "pixielabs.ai/pixielabs/src/shared/services/env"
2728
"pixielabs.ai/pixielabs/src/shared/services/handler"
2829
"pixielabs.ai/pixielabs/src/shared/services/healthz"
29-
"pixielabs.ai/pixielabs/src/utils/pixie_cli/pkg/script"
3030
)
3131

3232
const defaultBundleFile = "https://storage.googleapis.com/pixie-prod-artifacts/script-bundles/bundle-core.json"

‎src/cloud/autocomplete/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ go_library(
1616
"//src/cloud/cloudapipb:cloudapi_pl_go_proto",
1717
"//src/cloud/indexer/md:go_default_library",
1818
"//src/cloud/profile/profilepb:service_go_proto",
19+
"//src/pixie_cli/pkg/script:go_default_library",
1920
"//src/shared/services/utils:go_default_library",
2021
"//src/utils:go_default_library",
21-
"//src/utils/pixie_cli/pkg/script:go_default_library",
2222
"@com_github_olivere_elastic_v7//:go_default_library",
2323
"@com_github_sahilm_fuzzy//:go_default_library",
2424
"@com_github_satori_go_uuid//:go_default_library",

0 commit comments

Comments
 (0)