diff --git a/.github/workflows/kindling-ci.yaml b/.github/workflows/kindling-ci.yaml index 2a737f009..fd4fae3e6 100644 --- a/.github/workflows/kindling-ci.yaml +++ b/.github/workflows/kindling-ci.yaml @@ -7,7 +7,7 @@ on: jobs: build-latest-test: - if: github.repository == 'KindlingProject/kindling' + if: github.repository == 'harmonycloud/kindling' runs-on: ubuntu-latest permissions: contents: write @@ -18,7 +18,7 @@ jobs: - name: build-by-builder-container uses: addnab/docker-run-action@v3 with: - image: kindlingproject/agent-builder:latest + image: kindlingproject/agent-builder:flamegraph-amd64 options: -v ${{ github.workspace }}:/kindling -w /kindling run: make - name: Login to DockerHub diff --git a/.github/workflows/kindling-front-CI.yml b/.github/workflows/kindling-front-CI.yml index 929de36de..5823d8bd3 100644 --- a/.github/workflows/kindling-front-CI.yml +++ b/.github/workflows/kindling-front-CI.yml @@ -7,7 +7,7 @@ on: jobs: build-latest-test: - if: github.repository == 'KindlingProject/kindling' + if: github.repository == 'harmonycloud/kindling' runs-on: ubuntu-latest permissions: contents: write diff --git a/.github/workflows/metadata-provider-ci.yml b/.github/workflows/metadata-provider-ci.yml index 4673f44e8..c242acc87 100644 --- a/.github/workflows/metadata-provider-ci.yml +++ b/.github/workflows/metadata-provider-ci.yml @@ -7,7 +7,7 @@ on: jobs: build-latest-test: - if: github.repository == 'KindlingProject/kindling' + if: github.repository == 'harmonycloud/kindling' runs-on: ubuntu-latest permissions: contents: write diff --git a/.gitmodules b/.gitmodules index 18ad8a026..12a4d3b04 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "probe/libs/agent-libs"] path = probe/libs/agent-libs - url = https://github.com/KindlingProject/agent-libs.git + url = https://github.com/harmonycloud/agent-libs.git branch = kindling-dev diff --git a/collector/docker/Dockerfile b/collector/docker/Dockerfile index a091de8b1..96445c0c2 100644 --- a/collector/docker/Dockerfile +++ b/collector/docker/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /app/ RUN yum install -y qt5-qtbase-devel RUN yum install -y gdb COPY gdb_print.sh /app/ -RUN curl https://k8s-bpf-probes-public.oss-cn-hangzhou.aliyuncs.com/kindling-falcolib-probe-latest.tar.gz -o kindling-falcolib-probe.tar.gz +RUN curl https://github.com/harmonycloud/agent-libs/releases/download/kindling-falcolib-probe-29721003629/kindling-falcolib-probe.tar.gz -o kindling-falcolib-probe.tar.gz COPY build-asyncprofiler.sh /app/ RUN sh build-asyncprofiler.sh diff --git a/deploy/recompile-probe/recompile-module.sh b/deploy/recompile-probe/recompile-module.sh index a9c42cdf8..e982d113e 100644 --- a/deploy/recompile-probe/recompile-module.sh +++ b/deploy/recompile-probe/recompile-module.sh @@ -1,15 +1,13 @@ -AGENT_LIBS_COMMIT_ID=5a0edd80166ea059336945a3771eb565885adf26 - mkdir -p rebuild-kindling-agent cd rebuild-kindling-agent -curl -O https://k8s-bpf-probes-public.oss-cn-hangzhou.aliyuncs.com/agent-libs-${AGENT_LIBS_COMMIT_ID}.tar.gz -tar -zvxf agent-libs-${AGENT_LIBS_COMMIT_ID}.tar.gz -cd agent-libs-${AGENT_LIBS_COMMIT_ID} +curl -O https://github.com/harmonycloud/agent-libs/archive/refs/tags/kindling-falcolib-probe-29721003629.tar.gz +tar -zvxf kindling-falcolib-probe-29721003629.tar.gz -C agent-libs +cd agent-libs docker pull kindlingproject/kernel-builder:latest docker run -it -v /usr:/host/usr -v /lib/modules:/host/lib/modules -v $PWD:/source kindlingproject/kernel-builder:latest cd .. cat < Dockerfile FROM kindlingproject/kindling-agent:latest -COPY ./agent-libs-${AGENT_LIBS_COMMIT_ID}/kindling-falcolib-probe/* /opt/kindling-extra-probe/ +COPY ./agent-libs/kindling-falcolib-probe/* /opt/kindling-extra-probe/ EOF docker build -t kindlingproject/kindling-agent:latest-bymyself . \ No newline at end of file