Skip to content
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

feat: Added changes for upgrading some of the binaries & Go-Version in Litmuschecker #389

Merged
merged 6 commits into from
Jul 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions custom/dns_interceptor/go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/litmuschaos/dns_interceptor

go 1.19
go 1.20
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It has cgo dependency - we can test the binary once

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested -

vedant_shrotria@qa-lci-vm-2:~/test-tools/custom/dns_interceptor$ go mod tidy
go: downloading github.com/miekg/dns v1.1.41
go: downloading github.com/sirupsen/logrus v1.9.3
go: downloading golang.org/x/sys v0.5.0
go: downloading github.com/stretchr/testify v1.7.0
go: downloading golang.org/x/net v0.7.0
go: downloading golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
go: downloading github.com/davecgh/go-spew v1.1.1
go: downloading github.com/pmezard/go-difflib v1.0.0
go: downloading gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
vedant_shrotria@qa-lci-vm-2:~/test-tools/custom/dns_interceptor$ go build
vedant_shrotria@qa-lci-vm-2:~/test-tools/custom/dns_interceptor$ ls
README.md  dns_interceptor  go.mod  go.sum  main.go  server
vedant_shrotria@qa-lci-vm-2:~/test-tools/custom/dns_interceptor$ ./dns_interceptor
[INFO] No PID mentioned running in current ns
INFO[0000] DNS Interceptor Port                          port=53
INFO[0000] Upstream DNS Server                           server="127.0.0.53:53"
INFO[0000] Chaos Error Targets                           targets="[]"
INFO[0000] Chaos Spoof Map                               spoof_map="map[]"
FATA[0000] Failed to create Interceptor                  error="wrong chaos type for dns chaos"
vedant_shrotria@qa-lci-vm-2:~/test-tools/custom/dns_interceptor$ cat go.mod
module github.com/litmuschaos/dns_interceptor

go 1.20

require (
        github.com/miekg/dns v1.1.41
        github.com/sirupsen/logrus v1.9.3
)

require (
        golang.org/x/net v0.0.0-20220906165146-f3363e06e74c // indirect
        golang.org/x/sys v0.5.0 // indirect
)

replace golang.org/x/net => golang.org/x/net v0.7.0
vedant_shrotria@qa-lci-vm-2:~/test-tools/custom/dns_interceptor$ go version
go version go1.20.3 linux/amd64


require (
github.com/miekg/dns v1.1.41
github.com/sirupsen/logrus v1.8.1
github.com/sirupsen/logrus v1.9.3
)

require (
Expand Down
15 changes: 10 additions & 5 deletions custom/dns_interceptor/go.sum
Original file line number Diff line number Diff line change
@@ -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=
Expand All @@ -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=
Expand All @@ -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=
2 changes: 1 addition & 1 deletion custom/hardened-alpine/experiment/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}
2 changes: 1 addition & 1 deletion custom/hardened-alpine/infra/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}
2 changes: 1 addition & 1 deletion custom/k8s/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion custom/litmus-checker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Build Stage
FROM golang:1.19 AS builder
FROM golang:1.20 AS builder

LABEL maintainer="LitmusChaos"

Expand Down
2 changes: 1 addition & 1 deletion custom/litmus-checker/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/gdsoumya/resourceChecker

go 1.19
go 1.20

require (
k8s.io/apimachinery v0.21.2
Expand Down
2 changes: 1 addition & 1 deletion custom/nsutil/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/litmuschaos/nsutil

go 1.19
go 1.20

require (
github.com/sirupsen/logrus v1.9.3
Expand Down
Loading