Skip to content

Commit 2c09090

Browse files
authored
Merge pull request #620 from vardhaman22/v1.3/bump-chart
[release/v1.3] bump chart version
2 parents 17ec466 + 2ef0820 commit 2c09090

16 files changed

+322
-175
lines changed

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: v7.2.0
15+
appVersion: v7.3.0-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: 7.2.0
22+
version: 7.3.0-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.3.5
8+
tag: v1.3.6-rc.1
99
securityScan:
1010
repository: rancher/security-scan
11-
tag: v0.5.3
11+
tag: v0.5.4-rc.1
1212
sonobuoy:
1313
repository: rancher/mirrored-sonobuoy-sonobuoy
1414
tag: v0.57.2

go.mod

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,37 @@
11
module github.com/rancher/cis-operator
22

3-
go 1.22.0
3+
go 1.23.4
44

55
toolchain go1.23.5
66

7+
// to keep dependencies in sync with rancher
8+
// k8s deps bumped due to kube bench bump in security-scan
9+
replace (
10+
k8s.io/api => k8s.io/api v0.31.5
11+
k8s.io/apimachinery => k8s.io/apimachinery v0.31.5
12+
k8s.io/client-go => k8s.io/client-go v0.31.5
13+
k8s.io/gengo/v2 => k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70
14+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8
15+
sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.1
16+
)
17+
718
require (
819
github.com/blang/semver v3.5.1+incompatible
920
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.2
1021
github.com/prometheus-operator/prometheus-operator/pkg/client v0.76.2
1122
github.com/prometheus/client_golang v1.20.5
1223
github.com/rancher/kubernetes-provider-detector v0.1.5
1324
github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813
14-
github.com/rancher/security-scan v0.5.3
25+
github.com/rancher/security-scan v0.5.4-rc.1
1526
github.com/rancher/wrangler/v3 v3.1.0
1627
github.com/robfig/cron v1.2.0
1728
github.com/sirupsen/logrus v1.9.3
1829
github.com/urfave/cli v1.22.16
1930
golang.org/x/crypto/x509roots/fallback v0.0.0-20231030152948-74c2ba9521f1
20-
k8s.io/api v0.31.5
31+
k8s.io/api v0.32.0
2132
k8s.io/apiextensions-apiserver v0.31.5
22-
k8s.io/apimachinery v0.31.5
23-
k8s.io/client-go v0.31.5
33+
k8s.io/apimachinery v0.32.0
34+
k8s.io/client-go v0.32.0
2435
)
2536

2637
require (
@@ -34,13 +45,13 @@ require (
3445
go.uber.org/multierr v1.11.0 // indirect
3546
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
3647
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
37-
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
48+
k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7 // indirect
3849
)
3950

4051
require (
41-
github.com/aquasecurity/kube-bench v0.9.4 // indirect
42-
github.com/aws/aws-sdk-go-v2 v1.32.6 // indirect
43-
github.com/aws/aws-sdk-go-v2/service/securityhub v1.55.0 // indirect
52+
github.com/aquasecurity/kube-bench v0.10.0 // indirect
53+
github.com/aws/aws-sdk-go-v2 v1.32.8 // indirect
54+
github.com/aws/aws-sdk-go-v2/service/securityhub v1.55.3 // indirect
4455
github.com/aws/smithy-go v1.22.1 // indirect
4556
github.com/beorn7/perks v1.0.1 // indirect
4657
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -55,7 +66,7 @@ require (
5566
github.com/go-openapi/jsonreference v0.21.0 // indirect
5667
github.com/go-openapi/swag v0.23.0 // indirect
5768
github.com/gogo/protobuf v1.3.2 // indirect
58-
github.com/golang/glog v1.2.3 // indirect
69+
github.com/golang/glog v1.2.4 // indirect
5970
github.com/golang/protobuf v1.5.4 // indirect
6071
github.com/google/go-cmp v0.6.0 // indirect
6172
github.com/google/gofuzz v1.2.0 // indirect
@@ -82,27 +93,27 @@ require (
8293
github.com/spf13/pflag v1.0.5 // indirect
8394
github.com/spf13/viper v1.19.0 // indirect
8495
github.com/subosito/gotenv v1.6.0 // indirect
85-
golang.org/x/mod v0.20.0 // indirect
86-
golang.org/x/net v0.28.0 // indirect
87-
golang.org/x/oauth2 v0.22.0 // indirect
96+
golang.org/x/mod v0.21.0 // indirect
97+
golang.org/x/net v0.33.0 // indirect
98+
golang.org/x/oauth2 v0.23.0 // indirect
8899
golang.org/x/sync v0.10.0 // indirect
89100
golang.org/x/sys v0.28.0 // indirect
90101
golang.org/x/term v0.27.0 // indirect
91102
golang.org/x/text v0.21.0 // indirect
92-
golang.org/x/time v0.6.0 // indirect
93-
golang.org/x/tools v0.24.0 // indirect
94-
google.golang.org/protobuf v1.34.2 // indirect
103+
golang.org/x/time v0.7.0 // indirect
104+
golang.org/x/tools v0.26.0 // indirect
105+
google.golang.org/protobuf v1.35.1 // indirect
95106
gopkg.in/inf.v0 v0.9.1 // indirect
96107
gopkg.in/ini.v1 v1.67.0 // indirect
97108
gopkg.in/yaml.v2 v2.4.0 // indirect
98109
gopkg.in/yaml.v3 v3.0.1 // indirect
99110
k8s.io/code-generator v0.31.5 // indirect
100111
k8s.io/gengo v0.0.0-20240826214909-a7b603a56eb7 // indirect
101112
k8s.io/klog/v2 v2.130.1 // indirect
102-
k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 // indirect
103-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
113+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
114+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
104115
sigs.k8s.io/controller-runtime v0.19.0 // indirect
105-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
106-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
116+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
117+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
107118
sigs.k8s.io/yaml v1.4.0 // indirect
108119
)

0 commit comments

Comments
 (0)