From a23296b7c0c6513bce1d38febfdab5b30d9e4579 Mon Sep 17 00:00:00 2001 From: Vedant Shrotria <vedant.shrotria@harness.io> Date: Fri, 21 Jul 2023 14:23:50 +0530 Subject: [PATCH] feat: Added changes for upgrading some of the binaries & Go-Version in Litmuschecker (#389) * Added changes for upgrading some of the binaries Signed-off-by: Jonsy13 <vedant.shrotria@harness.io> * changed alpine image to 3.17.4 Signed-off-by: Jonsy13 <vedant.shrotria@harness.io> * changed alpine image to 3.17.4 Signed-off-by: Jonsy13 <vedant.shrotria@harness.io> * changed alpine image to 3.17.4 Signed-off-by: Jonsy13 <vedant.shrotria@harness.io> * fixed one more vuln Signed-off-by: Jonsy13 <vedant.shrotria@harness.io> * fixed one more vuln Signed-off-by: Jonsy13 <vedant.shrotria@harness.io> --------- Signed-off-by: Jonsy13 <vedant.shrotria@harness.io> --- custom/dns_interceptor/go.mod | 4 ++-- custom/dns_interceptor/go.sum | 15 ++++++++++----- custom/hardened-alpine/experiment/Dockerfile | 2 +- custom/hardened-alpine/infra/Dockerfile | 2 +- custom/k8s/Dockerfile | 2 +- custom/litmus-checker/Dockerfile | 2 +- custom/litmus-checker/go.mod | 2 +- custom/nsutil/go.mod | 2 +- 8 files changed, 18 insertions(+), 13 deletions(-) diff --git a/custom/dns_interceptor/go.mod b/custom/dns_interceptor/go.mod index 830d96c7..6f4b2955 100644 --- a/custom/dns_interceptor/go.mod +++ b/custom/dns_interceptor/go.mod @@ -1,10 +1,10 @@ module github.com/litmuschaos/dns_interceptor -go 1.19 +go 1.20 require ( github.com/miekg/dns v1.1.41 - github.com/sirupsen/logrus v1.8.1 + github.com/sirupsen/logrus v1.9.3 ) require ( diff --git a/custom/dns_interceptor/go.sum b/custom/dns_interceptor/go.sum index 109dbc08..b7355c3c 100644 --- a/custom/dns_interceptor/go.sum +++ b/custom/dns_interceptor/go.sum @@ -1,13 +1,15 @@ +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= @@ -17,10 +19,10 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -33,3 +35,6 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/custom/hardened-alpine/experiment/Dockerfile b/custom/hardened-alpine/experiment/Dockerfile index 34e0ea33..239f0752 100644 --- a/custom/hardened-alpine/experiment/Dockerfile +++ b/custom/hardened-alpine/experiment/Dockerfile @@ -171,4 +171,4 @@ RUN find /bin /etc /lib /sbin /usr -xdev -type l -exec test ! -e {} \; -delete # default directory is /litmus WORKDIR $APP_DIR -USER ${APP_USER} +USER ${APP_USER} \ No newline at end of file diff --git a/custom/hardened-alpine/infra/Dockerfile b/custom/hardened-alpine/infra/Dockerfile index df1b58fa..92a1a4de 100644 --- a/custom/hardened-alpine/infra/Dockerfile +++ b/custom/hardened-alpine/infra/Dockerfile @@ -113,4 +113,4 @@ RUN find /bin /etc /lib /sbin /usr -xdev -type l -exec test ! -e {} \; -delete # default directory is /litmus WORKDIR $APP_DIR -USER ${APP_USER} +USER ${APP_USER} \ No newline at end of file diff --git a/custom/k8s/Dockerfile b/custom/k8s/Dockerfile index 45417b16..76df25b4 100644 --- a/custom/k8s/Dockerfile +++ b/custom/k8s/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.18.0 ARG TARGETARCH -ENV KUBECTL_VERSION="v1.27.2" +ENV KUBECTL_VERSION="v1.27.4" LABEL maintainer="LitmusChaos" diff --git a/custom/litmus-checker/Dockerfile b/custom/litmus-checker/Dockerfile index 0a90e3c5..74bfa69d 100644 --- a/custom/litmus-checker/Dockerfile +++ b/custom/litmus-checker/Dockerfile @@ -1,5 +1,5 @@ #Build Stage -FROM golang:1.19 AS builder +FROM golang:1.20 AS builder LABEL maintainer="LitmusChaos" diff --git a/custom/litmus-checker/go.mod b/custom/litmus-checker/go.mod index 7b7cc35e..33526561 100644 --- a/custom/litmus-checker/go.mod +++ b/custom/litmus-checker/go.mod @@ -1,6 +1,6 @@ module github.com/gdsoumya/resourceChecker -go 1.19 +go 1.20 require ( k8s.io/apimachinery v0.21.2 diff --git a/custom/nsutil/go.mod b/custom/nsutil/go.mod index 72c21b0e..6f5abd1b 100644 --- a/custom/nsutil/go.mod +++ b/custom/nsutil/go.mod @@ -1,6 +1,6 @@ module github.com/litmuschaos/nsutil -go 1.19 +go 1.20 require ( github.com/sirupsen/logrus v1.9.3