From b505e3d250678db83908cb5521cd9deabe2de9c8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 15:42:59 +0000 Subject: [PATCH 1/5] fix(deps): update module github.com/docker/docker to v24 [security] (cherry picked from commit a4cbe0ab14864e7b12de9c09f0da0c359ebb866c) --- KubeArmor/go.mod | 2 +- KubeArmor/go.sum | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/KubeArmor/go.mod b/KubeArmor/go.mod index c974bd8fbe..00adb421e4 100644 --- a/KubeArmor/go.mod +++ b/KubeArmor/go.mod @@ -30,7 +30,7 @@ require ( github.com/cilium/ebpf v0.11.0 github.com/containerd/containerd v1.7.1 github.com/containerd/typeurl/v2 v2.1.1 - github.com/docker/docker v23.0.6+incompatible + github.com/docker/docker v24.0.7+incompatible github.com/golang/protobuf v1.5.3 github.com/google/uuid v1.3.0 github.com/kubearmor/KubeArmor/pkg/KubeArmorController v0.0.0-20230510133055-4e30a28b6352 diff --git a/KubeArmor/go.sum b/KubeArmor/go.sum index bb6ea9dd6c..764ffc8074 100644 --- a/KubeArmor/go.sum +++ b/KubeArmor/go.sum @@ -86,6 +86,8 @@ github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6 github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v23.0.6+incompatible h1:aBD4np894vatVX99UTx/GyOUOK4uEcROwA3+bQhEcoU= github.com/docker/docker v23.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= +github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -112,6 +114,7 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -223,10 +226,12 @@ github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7P github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= @@ -262,6 +267,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo/v2 v2.9.7 h1:06xGQy5www2oN160RtEZoTvnP2sPhEfePYmCDc2szss= From 806814f6690eb8a8e72e7f17480a08f963579b9d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 Nov 2023 11:15:52 +0000 Subject: [PATCH 2/5] fix(deps): update module google.golang.org/grpc to v1.56.3 [security] (cherry picked from commit 77c4f0b18ab7681d7a44b6d02b30cb3ced9035bd) --- KubeArmor/go.mod | 2 +- KubeArmor/go.sum | 4 ++-- protobuf/go.mod | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/KubeArmor/go.mod b/KubeArmor/go.mod index 00adb421e4..10de20e116 100644 --- a/KubeArmor/go.mod +++ b/KubeArmor/go.mod @@ -39,7 +39,7 @@ require ( github.com/spf13/viper v1.15.0 go.uber.org/zap v1.24.0 golang.org/x/sys v0.10.0 - google.golang.org/grpc v1.55.0 + google.golang.org/grpc v1.56.3 k8s.io/api v0.27.1 k8s.io/apimachinery v0.27.1 k8s.io/client-go v0.27.1 diff --git a/KubeArmor/go.sum b/KubeArmor/go.sum index 764ffc8074..d385e3b7cc 100644 --- a/KubeArmor/go.sum +++ b/KubeArmor/go.sum @@ -690,8 +690,8 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= -google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= +google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= +google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/protobuf/go.mod b/protobuf/go.mod index 840f0119c1..baf70595ae 100644 --- a/protobuf/go.mod +++ b/protobuf/go.mod @@ -12,7 +12,7 @@ replace ( require ( github.com/golang/protobuf v1.5.3 - google.golang.org/grpc v1.55.0 + google.golang.org/grpc v1.56.3 google.golang.org/protobuf v1.30.0 ) From c59f5bea889c706cc05eeacb459c979a677fed26 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Sep 2023 14:04:54 +0000 Subject: [PATCH 3/5] Update alpine Docker tag to v3.18 (cherry picked from commit df71f325d7e3121411657608c7dcbf91f9dd671f) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 33980b8856..be34e07ddf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN make ### Make executable image -FROM alpine:3.17 as kubearmor +FROM alpine:3.18 as kubearmor RUN echo "@community http://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories From 01d23c4c4bce8384830a0805f6c679bb5133a892 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 4 Nov 2023 15:18:27 +0000 Subject: [PATCH 4/5] chore(deps): update module github.com/mattn/go-sqlite3 to v1.14.18 (cherry picked from commit 6396252b9247e5c6e8ac84bb3683c65cfeb578bc) --- protobuf/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protobuf/go.mod b/protobuf/go.mod index baf70595ae..76e7ce9ed6 100644 --- a/protobuf/go.mod +++ b/protobuf/go.mod @@ -5,7 +5,7 @@ go 1.20 replace ( github.com/kubearmor/KubeArmor => ../ github.com/kubearmor/KubeArmor/protobuf => ./ - github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.14.15 + github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.14.18 github.com/pkg/sftp => github.com/pkg/sftp v1.11.0 golang.org/x/image => golang.org/x/image v0.7.0 ) From 4af933a9423edb1ac0baadb7efc5504aecc20f66 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 04:27:32 +0000 Subject: [PATCH 5/5] chore(deps): update apache/skywalking-eyes digest to a790ab8 (cherry picked from commit 9b28d945b0db80d7dee21446f1edebfa8e06e6fb) --- .github/workflows/ci-test-go.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test-go.yml b/.github/workflows/ci-test-go.yml index f78b1e680a..d2b30ed8fb 100644 --- a/.github/workflows/ci-test-go.yml +++ b/.github/workflows/ci-test-go.yml @@ -80,6 +80,6 @@ jobs: - uses: actions/checkout@v3 - name: Check License Header - uses: apache/skywalking-eyes@9bd5feb86b5817aa6072b008f9866a2c3bbc8587 + uses: apache/skywalking-eyes@a790ab8dd23a7f861c18bd6aaa9b012e3a234bce env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}