Ddelnano/remove unnecessary changes #2319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

ddelnano wants to merge 93 commits into pixie-io:main from k8sstormcenter:ddelnano/remove-unnecessary-changes

.bazelrc

-Original file line number
+Diff line change
@@ -1,8 +1,15 @@
     # Global bazelrc file, see https://docs.bazel.build/versions/master/guide.html#bazelrc.
+    # Use local Cache directory if building on a VM:
+    # On Chef VM, create a directory and comment in the following line:
+    # build --disk_cache=</tmp/bazel/> # Optional for multi-user cache: Make this directory owned by a group name e.g. "bazelcache"
     # Use strict action env to prevent leaks of env vars.
     build --incompatible_strict_action_env
+    # Use cache
+    # build --disk_cache=/tmp/bazel/cache # must not be merged dev only settng
     # Only pass through GH_API_KEY for stamped builds.
     # This is still not ideal as it still busts the cache of stamped builds.
     build:stamp --stamp
@@ Expand Down @@

.github/workflows/build_and_test.yaml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -36,7 +36,7 @@ jobs:
  
          image-base-name: "dev_image_with_extras"

          ref: ${{ needs.env-protect-setup.outputs.ref }}

      clang-tidy:

        runs-on: oracle-16cpu-64gb-x86-64

        runs-on: oracle-vm-16cpu-64gb-x86-64

        needs: [authorize, env-protect-setup, get-dev-image]

        container:

          image: ${{ needs.get-dev-image.outputs.image-with-tag }}

    @@ -64,7 +64,7 @@ jobs:
  
      code-coverage:

        if: github.event_name == 'push'

        needs: [authorize, env-protect-setup, get-dev-image]

        runs-on: oracle-16cpu-64gb-x86-64

        runs-on: oracle-vm-16cpu-64gb-x86-64

        container:

          image: ${{ needs.get-dev-image.outputs.image-with-tag }}

        steps:

    @@ -88,7 +88,7 @@ jobs:
  
            ./ci/collect_coverage.sh -u -b main -c "$(git rev-parse HEAD)" -r pixie-io/pixie

      generate-matrix:

        needs: [authorize, env-protect-setup, get-dev-image]

        runs-on: oracle-16cpu-64gb-x86-64

        runs-on: oracle-vm-16cpu-64gb-x86-64

        container:

          image: ${{ needs.get-dev-image.outputs.image-with-tag }}

        outputs:

    @@ -120,7 +120,7 @@ jobs:
  
              bazel_tests_*

      build-and-test:

        needs: [authorize, env-protect-setup, get-dev-image, generate-matrix]

        runs-on: oracle-16cpu-64gb-x86-64

        runs-on: oracle-vm-16cpu-64gb-x86-64

        permissions:

          contents: read

          actions: read

    @@ -160,6 +160,10 @@ jobs:
  
          run: |

            # Github actions container runner creates a docker network without IPv6 support. We enable it manually.

            sysctl -w net.ipv6.conf.lo.disable_ipv6=0

            # Our qemu builds require unprivileged user namespaces to run.

            sysctl -w kernel.unprivileged_userns_clone=1

            sysctl -w kernel.apparmor_restrict_unprivileged_userns=0

            ./scripts/bazel_ignore_codes.sh test ${{ matrix.args }} --target_pattern_file=target_files/${{ matrix.tests }} \

              2> >(tee bazel_stderr)

        - name: Parse junit reports

DEVELOPMENT.md

-Original file line number
+Diff line change
@@ Expand Up @@
     ## Setting up the Environment
+    Decide first if you'd like a full buildsystem (on a VM) or a containerized dev environment.
+    ### VM as buildsystem
+    This utilizes `chef` to setup all dependencies and is based on `ubuntu`.
+    > [!Important]
+    >  The below description defaults to using a `minikube` on this VM for the developer to have an `all-in-one` setup. The VM type must support nested virtualization for `minikube` to work. Please confirm that the nested virtualization really is turned on before you continue, not all VM-types support it.
+    >  If you `bring-your-own-k8s`, you may disregard this.
+    ```yaml
+    advancedMachineFeatures:
+      enableNestedVirtualization: true
+    ```
+    The following specifics were tested on GCP on a Ubuntu 24.04 (May 2025). Please see the latest [packer file](https://github.com/pixie-io/pixie/blob/main/tools/chef/Makefile#L56) for the current supported Ubuntu version: The initial compilation is CPU intense and `16vcpu` were a good trade-off, a balanced disk of 500 GB seems convenient and overall `n2-standard-16` works well.
+    > [!Warning]
+    >  The first `full build` takes several hours and at least 160 Gb of space
+    >  The first `vizier build` on these parameters takes approx. 1 hr and 45 Gb of space.
+    #### 1) Install chef and some dependencies
+    First, install `chef` to cook your `recipies`:
+    ```bash
+    curl -L https://chefdownload-community.chef.io/install.sh | sudo bash
+    ```
+    You may find it helpful to use a terminal manager like `screen` or `tmux`, esp to detach the builds.
+    ```bash
+    sudo apt install -y screen git
+    ```
+    In order to very significantly speed up your work, you may opt for a local cache directory. This can be shared between users of the VM, if both are part of the same group.
+    Create a cache dir under <directory-path> such as e.g. /tmp/bazel
+    ```sh
+    sudo groupadd bazelcache
+    sudo usermod -aG bazelcache $USER
+    sudo mkdir -p <directory-path>
+    sudo chown -R :bazelcache <directory-path>
+    sudo chmod -R 2775 <directory-path>
+    ```
+    Now, on this VM, clone pixie (or your fork of it)
+    ```bash
+    git clone https://github.com/pixie-io/pixie.git
+    cd pixie/tools/chef
+    sudo chef-solo -c solo.rb -j node_workstation.json
+    sudo usermod -aG libvirt $USER
+    ```
+    Make permanent the env loading via your bashrc
+    ```sh
+    echo "source /opt/px_dev/pxenv.inc " >> ~/.bashrc
+    ```
+    #### 2) If using cache, tell bazel about it
+    Edit the `<directory-path>` into the .bazelrc and put it into your homedir:
+    ```
+    # Global bazelrc file, see https://docs.bazel.build/versions/master/guide.html#bazelrc.
+    # Use local Cache directory if building on a VM:
+    # On Chef VM, create a directory and comment in the following line:
+     build --disk_cache=/tmp/bazel/ # Optional for multi-user cache: Make this directory owned by a group name e.g. "bazelcache"
+    ```
+    ```sh
+    cp .bazelrc ~/.
+    ```
+    #### 3) Create/Use a registry you control and login
+    ```sh
+    docker login ghcr.io/<myregistry>
+    ```
+    #### 4) Prepare your kubernetes
+    > [!Important]
+    >  The below description defaults to using a `minikube` on this VM for the developer to have an `all-in-one` setup.
+    >  If you `bring-your-own-k8s`, please prepare your preferred setup and go to Step 5
+    If you added your user to the libvirt group (`sudo usermod -aG libvirt $USER`), starting the development environment on this VM will now work (if you did this interactively: you need to refresh your group membership, e.g. by logout/login). The following command will, amongst other things, start minikube
+    ```sh
+    make dev-env-start
+    ```
+    #### 5) Deploy a vanilla pixie
+    First deploy the upstream pixie (`vizier`, `kelvin` and `pem`) using the hosted cloud. Follow [these instructions](https://docs.px.dev/installing-pixie/install-schemes/cli) to install the `px` command line interface and Pixie:
+    ```sh
+    px auth login
+    ```
+    Once logged in to pixie, we found that limiting the memory is useful, thus after login, set the deploy option like so:
+    ```sh
+    px deploy -p=1Gi
+    ```
+    For reference and further information https://docs.px.dev/installing-pixie/install-guides/hosted-pixie/cosmic-cloud.
+    Optional on `minikube`:
+    You may encounter the following WARNING, which is related to the kernel headers missing on the minikube node (this is not your VM node). This is safe to ignore if Pixie starts up properly and your cluster is queryable from Pixie's [Live UI](https://docs.px.dev/using-pixie/using-live-ui). Please see [pixie-issue2051](https://github.com/pixie-io/pixie/issues/2051) for further details.
+    ```
+    ERR: Detected missing kernel headers on your cluster's nodes. This may cause issues with the Pixie agent. Please install kernel headers on all nodes.
+    ```
+    #### 6) Skaffold deploy your changes
+    Once you make changes to the source code, or switch to another source code version, use Skaffold to deploy (after you have the vanilla setup working on minikube)
+    Ensure that you have commented in the bazelcache-directory into the bazel config (see Step 2).
+    Review the compilation-mode suits your purposes:
+    ```
+    cat skaffold/skaffold_vizier.yaml
+    # Note: You will want to stick with a sysroot based build (-p x86_64_sysroot or -p aarch64_sysroot),
+    # but you may want to change the --complication_mode setting based on your needs.
+    # opt builds remove assert/debug checks, while dbg builds work with debuggers (gdb).
+    # See the bazel docs for more details https://bazel.build/docs/user-manual#compilation-mode
+    - name: x86_64_sysroot
+      patches:
+      - op: add
+        path: /build/artifacts/context=./bazel/args
+        value:
+        - --config=x86_64_sysroot
+        - --compilation_mode=dbg
+    #    - --compilation_mode=opt
+    ```
+    Optional: you can make permanent your <default-repo> in the skaffold config:
+    ```sh
+    skaffold config set default-repo <myregistry>
+    skaffold run -f skaffold/skaffold_vizier.yaml -p x86_64_sysroot
+    ```
+    Check that your docker login token is still valid, then
+    ```sh
+    skaffold run -f skaffold/skaffold_vizier.yaml -p x86_64_sysroot --default-repo=<myregistry>
+    ```
+    #### 7) Golden Image
+    Once all the above is working and the first cache has been built, bake an image of your VM for safekeeping.
+    ### Containerized Devenv
     To set up the developer environment required to start building Pixie's components, run the `run_docker.sh` script. The following script will run the Docker container and dump you out inside the docker container console from which you can run all the necessary tools to build, test, and deploy Pixie in development mode.
 . Since this script runs a Docker container, you must have Docker installed. To install it follow these instructions [here](https://docs.docker.com/get-docker/).
@@ Expand Down Expand Up @@
     - `bazel run //src/pixie_cli:px -- deploy` will be equivalent to `px deploy`
     - `bazel run //src/pixie_cli:px -- run px/cluster` is the same as `px run px/cluster`
+    # Using a Custom Pixie without Development Environment
+    This section is on deploying pixie when it is in a state where parts are official and parts are self-developped, without setting up the Development environment
+    First, get yourself a kubernetes and have helm, kubectl and your favourite tools in your favourite places.

PLATFORM.md

-Original file line number
+Diff line change
@@ -0,0 +1,5 @@
+    # Using a Custom Pixie without Development Environment
+    This section is on deploying pixie when it is in a state where parts are official and parts are self-developped, without setting up the Development environment
+    First, get yourself a kubernetes and have helm, kubectl and your favourite tools in your favourite places.

WORKSPACE

-Original file line number
+Diff line change
@@ Expand Up / @@ -204,7 +204,7 @@ bind( @@
     )
     # gazelle:repo bazel_gazelle
-    # Gazelle depes need to be loaded last to make sure they don't override our dependencies.
+    # Gazelle deps need to be loaded last to make sure they don't override our dependencies.
     # The first one wins when it comes to package declaration.
     load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
@@ Expand Down @@

bazel/container_images.bzl

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ @@
     #
     # SPDX-License-Identifier: Apache-2.0
-    load("@io_bazel_rules_docker//container:container.bzl", "container_pull")
+    load("@io_bazel_rules_docker//container:container.bzl", "container_pull", "container_image", "container_layer")
     # When adding an image here, first add it to scripts/regclient/regbot_deps.yaml
     # Once that is in, trigger the github workflow that mirrors the required image
@@ Expand Down Expand Up / @@ -367,3 +367,12 @@ def stirling_test_images(): @@
             repository = "golang_1_22_grpc_server_with_buildinfo",
             digest = "sha256:67adba5e8513670fa37bd042862e7844f26239e8d2997ed8c3b0aa527bc04cc3",
         )
+        # ClickHouse server image for testing.
+        # clickhouse/clickhouse-server:25.7-alpine
+        container_pull(
+            name = "clickhouse_server_base_image",
+            registry = "docker.io",
+            repository = "clickhouse/clickhouse-server",
+            digest = "sha256:60c53a520a1caad6555eb6772a8a9c91bb09774c1c7ec87e3371ea3da254eeab",
+        )

bazel/external/clickhouse_cpp.BUILD

-Original file line number
+Diff line change
@@ -0,0 +1,64 @@
+    # Copyright 2018- The Pixie Authors.
+    #
+    # Licensed under the Apache License, Version 2.0 (the "License");
+    # you may not use this file except in compliance with the License.
+    # You may obtain a copy of the License at
+    #
+    #     http://www.apache.org/licenses/LICENSE-2.0
+    #
+    # Unless required by applicable law or agreed to in writing, software
+    # distributed under the License is distributed on an "AS IS" BASIS,
+    # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    # See the License for the specific language governing permissions and
+    # limitations under the License.
+    #
+    # SPDX-License-Identifier: Apache-2.0
+    load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake")
+    licenses(["notice"])
+    exports_files(["LICENSE"])
+    filegroup(
+        name = "all",
+        srcs = glob(["**"]),
+    )
+    cmake(
+        name = "clickhouse_cpp",
+        build_args = [
+            "--",  # <- Pass remaining options to the native tool.
+            "-j`nproc`",
+            "-l`nproc`",
+        ],
+        cache_entries = {
+            "BUILD_BENCHMARK": "OFF",
+            "BUILD_TESTS": "OFF",
+            "BUILD_SHARED_LIBS": "OFF",
+            "CMAKE_BUILD_TYPE": "Release",
+            "WITH_OPENSSL": "OFF",         # Disable OpenSSL for now
+            "WITH_SYSTEM_ABSEIL": "OFF",   # Use bundled abseil
+            "WITH_SYSTEM_LZ4": "OFF",      # Use bundled for now
+            "WITH_SYSTEM_CITYHASH": "OFF", # Use bundled for now
+            "WITH_SYSTEM_ZSTD": "OFF",     # Use bundled for now
+            "CMAKE_POSITION_INDEPENDENT_CODE": "ON",
+        },
+        lib_source = ":all",
+        out_static_libs = [
+            "libclickhouse-cpp-lib.a",
+            "liblz4.a",
+            "libcityhash.a",
+            "libzstdstatic.a",
+            "libabsl_int128.a",
+        ],
+        targets = [
+            "clickhouse-cpp-lib",
+            "lz4",
+            "cityhash",
+            "zstdstatic",
+            "absl_int128",
+        ],
+        visibility = ["//visibility:public"],
+        working_directory = "",
+    )

bazel/repositories.bzl

-Original file line number
+Diff line change
@@ Expand Up / @@ -147,6 +147,7 @@ def _cc_deps(): @@
         _bazel_repo("com_github_ariafallah_csv_parser", build_file = "//bazel/external:csv_parser.BUILD")
         _bazel_repo("com_github_arun11299_cpp_jwt", build_file = "//bazel/external:cpp_jwt.BUILD")
         _bazel_repo("com_github_cameron314_concurrentqueue", build_file = "//bazel/external:concurrentqueue.BUILD")
+        _bazel_repo("com_github_clickhouse_clickhouse_cpp", build_file = "//bazel/external:clickhouse_cpp.BUILD")
         _bazel_repo("com_github_cyan4973_xxhash", build_file = "//bazel/external:xxhash.BUILD")
         _bazel_repo("com_github_nlohmann_json", build_file = "//bazel/external:nlohmann_json.BUILD")
         _bazel_repo("com_github_packetzero_dnsparser", build_file = "//bazel/external:dnsparser.BUILD")
@@ Expand Down @@

bazel/repository_locations.bzl

-Original file line number
+Diff line change
@@ Expand Up / @@ -71,6 +71,11 @@ REPOSITORY_LOCATIONS = dict( @@
             strip_prefix = "concurrentqueue-1.0.3",
             urls = ["https://github.com/cameron314/concurrentqueue/archive/refs/tags/v1.0.3.tar.gz"],
         ),
+        com_github_clickhouse_clickhouse_cpp = dict(
+            sha256 = "1029a1bb0da8a72db1662a0418267742e66c82bb3e6b0ed116623a2fa8c65a58",
+            strip_prefix = "clickhouse-cpp-22dc9441cd807156511c6dcf97b1b878bd663d77",
+            urls = ["https://github.com/ClickHouse/clickhouse-cpp/archive/22dc9441cd807156511c6dcf97b1b878bd663d77.tar.gz"],
+        ),
         com_github_cyan4973_xxhash = dict(
             sha256 = "952ebbf5b11fbf59ae5d760a562d1e9112278f244340ad7714e8556cbe54f7f7",
             strip_prefix = "xxHash-0.7.3",
@@ Expand Down @@

ci/github/bazelrc

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,9 +5,6 @@ common --color=yes @@
     # a given run.
     common --keep_going
-    # Always use remote exec
-    build --config=remote
     build --build_metadata=HOST=github-actions
     build --build_metadata=USER=github-actions
     build --build_metadata=REPO_URL=https://github.com/pixie-io/pixie
@@ Expand Down @@

k8s/cloud/dev/plugin_db_updater_job.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -62,7 +62,7 @@ spec: @@
                   name: pl-service-config
                   key: PL_PLUGIN_SERVICE
             - name: PL_PLUGIN_REPO
-              value: "pixie-io/pixie-plugin"
+              value: "k8sstormcenter/pixie-plugin"
             - name: PL_GH_API_KEY
               valueFrom:
                 secretKeyRef:
@@ Expand Down @@

k8s/cloud/overlays/plugin_job/plugin_job.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,7 @@ spec: @@
                   name: pl-service-config
                   key: PL_PLUGIN_SERVICE
             - name: PL_PLUGIN_REPO
-              value: "pixie-io/pixie-plugin"
+              value: "k8sstormcenter/pixie-plugin"
           # The alpine based image contains a shell and is needed for this command to work.
           # yamllint disable-line rule:line-length
           - image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.11.3-alpine@sha256:4885fd3e6362ba22abff1804a7f5e75cec5fafbeb4e41be8b0059ecad94a16f1
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ddelnano/remove unnecessary changes #2319

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!