Skip to content

Commit f972f3d

Browse files
Jonsy13git
authored and
UJESH2K
committed
Upgrading base images (#5300)
* Added fixes: Signed-off-by: git <[email protected]> * Added fixes: Signed-off-by: git <[email protected]> * Added fixes: Signed-off-by: git <[email protected]> * Added fixes: Signed-off-by: git <[email protected]> * Added fixes: Signed-off-by: git <[email protected]> --------- Signed-off-by: git <[email protected]> Co-authored-by: git <[email protected]> Signed-off-by: UJESH KUMAR YADAV <[email protected]>
1 parent b1ab00d commit f972f3d

File tree

12 files changed

+40
-27
lines changed

12 files changed

+40
-27
lines changed

‎.github/dependabot.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ updates:
1414
directory: "chaoscenter/subscriber"
1515
schedule:
1616
interval: "daily"
17+
ignore:
18+
- dependency-name: "github.com/argoproj/argo-workflows/v3"
1719

1820
- package-ecosystem: "gomod"
1921
directory: "chaoscenter/graphql/server"
2022
schedule:
21-
interval: "daily"
23+
interval: "daily"
24+
ignore:
25+
- dependency-name: "github.com/argoproj/argo-workflows/v3"

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ jobs:
149149
ignore-unfixed: true
150150
vuln-type: 'os,library'
151151
severity: 'CRITICAL,HIGH'
152+
ignore-policy: ignore.rego
152153

153154

154155
docker-build-authentication-server:
@@ -204,6 +205,7 @@ jobs:
204205
ignore-unfixed: true
205206
vuln-type: 'os,library'
206207
severity: 'CRITICAL,HIGH'
208+
ignore-policy: ignore.rego
207209

208210

209211
docker-build-frontend:

‎chaoscenter/authentication/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# BUILD STAGE
2-
FROM golang:1.24.0 AS builder
2+
FROM golang:1.24 AS builder
33

44
ARG TARGETOS=linux
55
ARG TARGETARCH
@@ -16,7 +16,7 @@ RUN CGO_ENABLED=0 go build -o /output/server -v ./api/
1616

1717
# PACKAGING STAGE
1818
# Use RedHat UBI minimal image as base
19-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
19+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6
2020

2121
LABEL maintainer="LitmusChaos"
2222

‎chaoscenter/event-tracker/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# BUILD STAGE
2-
FROM golang:1.24.0 AS builder
2+
FROM golang:1.24 AS builder
33

44
LABEL maintainer="LitmusChaos"
55

@@ -17,7 +17,7 @@ RUN CGO_ENABLED=0 go build -o /output/event-tracker -v
1717

1818
# Packaging stage
1919
# Use RedHat UBI minimal image as base
20-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
20+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6
2121

2222
LABEL maintainer="LitmusChaos"
2323

‎chaoscenter/event-tracker/go.mod‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
github.com/gogo/protobuf v1.3.2 // indirect
3434
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3535
github.com/golang/protobuf v1.5.4 // indirect
36-
github.com/google/go-cmp v0.5.5 // indirect
36+
github.com/google/go-cmp v0.5.9 // indirect
3737
github.com/google/gofuzz v1.1.0 // indirect
3838
github.com/google/uuid v1.1.2 // indirect
3939
github.com/googleapis/gnostic v0.5.5 // indirect
@@ -54,18 +54,17 @@ require (
5454
go.uber.org/zap v1.19.0 // indirect
5555
golang.org/x/crypto v0.43.0 // indirect
5656
golang.org/x/net v0.45.0 // indirect
57-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
57+
golang.org/x/oauth2 v0.27.0 // indirect
5858
golang.org/x/sys v0.37.0 // indirect
5959
golang.org/x/term v0.36.0 // indirect
6060
golang.org/x/text v0.30.0 // indirect
6161
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
6262
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
63-
google.golang.org/appengine v1.6.7 // indirect
6463
google.golang.org/protobuf v1.33.0 // indirect
6564
gopkg.in/inf.v0 v0.9.1 // indirect
6665
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
6766
gopkg.in/yaml.v2 v2.4.0 // indirect
68-
gopkg.in/yaml.v3 v3.0.0-20220521103104-8f96da9f5d5e // indirect
67+
gopkg.in/yaml.v3 v3.0.1 // indirect
6968
k8s.io/apiextensions-apiserver v0.22.1 // indirect
7069
k8s.io/component-base v0.22.1 // indirect
7170
k8s.io/klog/v2 v2.9.0 // indirect

‎chaoscenter/event-tracker/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,9 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
188188
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
189189
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
190190
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
191-
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
192191
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
192+
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
193+
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
193194
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
194195
github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
195196
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -527,8 +528,9 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG
527528
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
528529
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
529530
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
530-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
531531
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
532+
golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
533+
golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
532534
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
533535
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
534536
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -654,7 +656,6 @@ golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w
654656
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
655657
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
656658
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
657-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
658659
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
659660
gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY=
660661
gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY=
@@ -673,7 +674,6 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
673674
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
674675
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
675676
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
676-
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
677677
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
678678
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
679679
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -754,8 +754,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
754754
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
755755
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
756756
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
757-
gopkg.in/yaml.v3 v3.0.0-20220521103104-8f96da9f5d5e h1:3i3ny04XV6HbZ2N1oIBw1UBYATHAOpo4tfTF83JM3Z0=
758-
gopkg.in/yaml.v3 v3.0.0-20220521103104-8f96da9f5d5e/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
757+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
758+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
759759
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
760760
gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
761761
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

‎chaoscenter/graphql/server/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# BUILD STAGE
2-
FROM golang:1.24.0 AS builder
2+
FROM golang:1.24 AS builder
33

44
LABEL maintainer="LitmusChaos"
55

@@ -17,7 +17,7 @@ RUN CGO_ENABLED=0 go build -o /output/server -v
1717

1818
# DEPLOY STAGE
1919
# Use Red Hat UBI minimal image as base
20-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
20+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6
2121

2222
LABEL maintainer="LitmusChaos"
2323

‎chaoscenter/graphql/server/go.mod‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,13 @@ require (
101101
golang.org/x/arch v0.8.0 // indirect
102102
golang.org/x/mod v0.28.0 // indirect
103103
golang.org/x/net v0.45.0 // indirect
104-
golang.org/x/oauth2 v0.18.0 // indirect
104+
golang.org/x/oauth2 v0.27.0 // indirect
105105
golang.org/x/sync v0.17.0 // indirect
106106
golang.org/x/sys v0.37.0 // indirect
107107
golang.org/x/term v0.36.0 // indirect
108108
golang.org/x/text v0.30.0 // indirect
109109
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
110110
golang.org/x/tools v0.37.0 // indirect
111-
google.golang.org/appengine v1.6.8 // indirect
112111
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
113112
gopkg.in/inf.v0 v0.9.1 // indirect
114113
gopkg.in/warnings.v0 v0.1.2 // indirect

‎chaoscenter/graphql/server/go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,8 +1382,8 @@ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ
13821382
golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
13831383
golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
13841384
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
1385-
golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI=
1386-
golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8=
1385+
golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
1386+
golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
13871387
golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
13881388
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
13891389
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -1652,8 +1652,6 @@ google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww
16521652
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
16531653
google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
16541654
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
1655-
google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
1656-
google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
16571655
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
16581656
google.golang.org/genproto v0.0.0-20190128161407-8ac453e89fca/go.mod h1:L3J43x8/uS+qIUoksaLKe6OS3nUKxOKuIFz1sl2/jx4=
16591657
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=

‎chaoscenter/subscriber/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM golang:1.24.0 AS builder
1+
# BUILD STAGE
2+
FROM golang:1.24 AS builder
23

34
LABEL maintainer="LitmusChaos"
45

0 commit comments

Comments
 (0)