Skip to content

Commit 5781f69

Browse files
authored
Merge pull request #870 from swastik959/bump-v1.4.7-rc.1
[release/v1.4] bumped security scan,charts and go version
2 parents 0b27508 + 2ee61b0 commit 5781f69

4 files changed

Lines changed: 164 additions & 147 deletions

File tree

chart/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ annotations:
1212
catalog.cattle.io/type: cluster-tool
1313
catalog.cattle.io/ui-component: rancher-cis-benchmark
1414
apiVersion: v1
15-
appVersion: v8.6.0
15+
appVersion: v8.6.1-rc.1
1616
description: The cis-operator enables running CIS benchmark security scans on a kubernetes
1717
cluster
1818
icon: https://charts.rancher.io/assets/logos/cis-kube-bench.svg
1919
keywords:
2020
- security
2121
name: rancher-cis-benchmark
22-
version: 8.6.0
22+
version: 8.6.1-rc.1

chart/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
image:
66
cisoperator:
77
repository: rancher/cis-operator
8-
tag: v1.4.6
8+
tag: v1.4.7-rc.1
99
securityScan:
1010
repository: rancher/security-scan
11-
tag: v0.6.6
11+
tag: v0.6.7-rc.1
1212
sonobuoy:
1313
repository: rancher/mirrored-sonobuoy-sonobuoy
1414
tag: v0.57.3

go.mod

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/rancher/cis-operator
22

3-
go 1.24.9
3+
go 1.24.11
4+
5+
replace golang.org/x/tools => golang.org/x/tools v0.37.0
46

57
require (
68
github.com/blang/semver v3.5.1+incompatible
@@ -9,31 +11,31 @@ require (
911
github.com/prometheus/client_golang v1.21.1
1012
github.com/rancher/kubernetes-provider-detector v0.1.5
1113
github.com/rancher/lasso v0.2.1
12-
github.com/rancher/security-scan v0.6.6
14+
github.com/rancher/security-scan v0.6.7-rc.1
1315
github.com/rancher/wrangler/v3 v3.2.0
1416
github.com/robfig/cron v1.2.0
1517
github.com/sirupsen/logrus v1.9.3
1618
github.com/urfave/cli/v2 v2.27.6
1719
golang.org/x/crypto/x509roots/fallback v0.0.0-20250406160420-959f8f3db0fb
18-
k8s.io/api v0.33.4
20+
k8s.io/api v0.34.2
1921
k8s.io/apiextensions-apiserver v0.32.3
20-
k8s.io/apimachinery v0.33.4
21-
k8s.io/client-go v0.33.4
22+
k8s.io/apimachinery v0.34.3
23+
k8s.io/client-go v0.34.2
2224
)
2325

2426
require (
25-
github.com/aquasecurity/kube-bench v0.13.0 // indirect
26-
github.com/aws/aws-sdk-go-v2 v1.39.2 // indirect
27-
github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.2 // indirect
28-
github.com/aws/smithy-go v1.23.0 // indirect
27+
github.com/aquasecurity/kube-bench v0.14.1 // indirect
28+
github.com/aws/aws-sdk-go-v2 v1.41.0 // indirect
29+
github.com/aws/aws-sdk-go-v2/service/securityhub v1.67.2 // indirect
30+
github.com/aws/smithy-go v1.24.0 // indirect
2931
github.com/beorn7/perks v1.0.1 // indirect
3032
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3133
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
3234
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
33-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
35+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
3436
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
35-
github.com/fsnotify/fsnotify v1.8.0 // indirect
36-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
37+
github.com/fsnotify/fsnotify v1.9.0 // indirect
38+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
3739
github.com/ghodss/yaml v1.0.0 // indirect
3840
github.com/go-logr/logr v1.4.2 // indirect
3941
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -42,42 +44,44 @@ require (
4244
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
4345
github.com/gogo/protobuf v1.3.2 // indirect
4446
github.com/golang/glog v1.2.5 // indirect
45-
github.com/google/gnostic-models v0.6.9 // indirect
47+
github.com/google/gnostic-models v0.7.0 // indirect
4648
github.com/google/go-cmp v0.7.0 // indirect
4749
github.com/google/uuid v1.6.0 // indirect
4850
github.com/josharian/intern v1.0.0 // indirect
4951
github.com/json-iterator/go v1.1.12 // indirect
5052
github.com/klauspost/compress v1.17.11 // indirect
5153
github.com/mailru/easyjson v0.9.0 // indirect
5254
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
53-
github.com/modern-go/reflect2 v1.0.2 // indirect
55+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
5456
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5557
github.com/onsi/ginkgo v1.16.5 // indirect
56-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
58+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
5759
github.com/pkg/errors v0.9.1 // indirect
60+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
5861
github.com/prometheus/client_model v0.6.1 // indirect
5962
github.com/prometheus/common v0.62.0 // indirect
6063
github.com/prometheus/procfs v0.15.1 // indirect
6164
github.com/russross/blackfriday/v2 v2.1.0 // indirect
62-
github.com/sagikazarmark/locafero v0.7.0 // indirect
63-
github.com/sourcegraph/conc v0.3.0 // indirect
64-
github.com/spf13/afero v1.12.0 // indirect
65-
github.com/spf13/cast v1.7.1 // indirect
66-
github.com/spf13/pflag v1.0.6 // indirect
67-
github.com/spf13/viper v1.20.1 // indirect
65+
github.com/sagikazarmark/locafero v0.11.0 // indirect
66+
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
67+
github.com/spf13/afero v1.15.0 // indirect
68+
github.com/spf13/cast v1.10.0 // indirect
69+
github.com/spf13/pflag v1.0.10 // indirect
70+
github.com/spf13/viper v1.21.0 // indirect
6871
github.com/subosito/gotenv v1.6.0 // indirect
6972
github.com/x448/float16 v0.8.4 // indirect
7073
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
71-
go.uber.org/multierr v1.11.0 // indirect
72-
golang.org/x/mod v0.26.0 // indirect
73-
golang.org/x/net v0.42.0 // indirect
74+
go.yaml.in/yaml/v2 v2.4.2 // indirect
75+
go.yaml.in/yaml/v3 v3.0.4 // indirect
76+
golang.org/x/mod v0.29.0 // indirect
77+
golang.org/x/net v0.47.0 // indirect
7478
golang.org/x/oauth2 v0.27.0 // indirect
75-
golang.org/x/sync v0.16.0 // indirect
76-
golang.org/x/sys v0.34.0 // indirect
77-
golang.org/x/term v0.33.0 // indirect
78-
golang.org/x/text v0.27.0 // indirect
79+
golang.org/x/sync v0.18.0 // indirect
80+
golang.org/x/sys v0.38.0 // indirect
81+
golang.org/x/term v0.37.0 // indirect
82+
golang.org/x/text v0.31.0 // indirect
7983
golang.org/x/time v0.9.0 // indirect
80-
golang.org/x/tools v0.35.0 // indirect
84+
golang.org/x/tools v0.38.0 // indirect
8185
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
8286
google.golang.org/protobuf v1.36.5 // indirect
8387
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
@@ -86,13 +90,13 @@ require (
8690
gopkg.in/yaml.v3 v3.0.1 // indirect
8791
k8s.io/code-generator v0.32.3 // indirect
8892
k8s.io/gengo v0.0.0-20250130153323-76c5745d3511 // indirect
89-
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
93+
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
9094
k8s.io/klog/v2 v2.130.1 // indirect
91-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
92-
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
95+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
96+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
9397
sigs.k8s.io/controller-runtime v0.20.3 // indirect
9498
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
9599
sigs.k8s.io/randfill v1.0.0 // indirect
96-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
97-
sigs.k8s.io/yaml v1.4.0 // indirect
100+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
101+
sigs.k8s.io/yaml v1.6.0 // indirect
98102
)

0 commit comments

Comments
 (0)