Skip to content

Commit 5b0741f

Browse files
yuumasatoyuumasato
authored
Merge pull request #62 from rhmdnd/CMP-3744
CMP-3744: Update Compliance Operator dependency
2 parents 58cd5d0 + ac36dcb commit 5b0741f

1,793 files changed

Lines changed: 333173 additions & 77079 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.golangci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ linters:
5252
- $gostd
5353
- github.com/ComplianceAsCode/ocp4e2e
5454
- github.com/cenkalti/backoff/v4
55-
- github.com/openshift/compliance-operator
55+
- github.com/ComplianceAsCode/compliance-operator
5656
- github.com/openshift/machine-config-operator
5757
- gopkg.in/yaml.v2
5858
- k8s.io

‎go.mod‎

Lines changed: 60 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3,79 +3,82 @@ module github.com/ComplianceAsCode/ocp4e2e
33
go 1.23
44

55
require (
6-
github.com/cenkalti/backoff/v4 v4.1.1
7-
github.com/openshift/compliance-operator v0.1.46
8-
github.com/openshift/machine-config-operator v0.0.1-0.20200913004441-7eba765c69c9
6+
github.com/ComplianceAsCode/compliance-operator v1.7.0
7+
github.com/cenkalti/backoff/v4 v4.3.0
8+
github.com/openshift/machine-config-operator v0.0.1-0.20250401081735-9026ff2d802e
99
gopkg.in/yaml.v2 v2.4.0
10-
k8s.io/api v0.21.1
11-
k8s.io/apiextensions-apiserver v0.21.1
12-
k8s.io/apimachinery v0.21.1
10+
k8s.io/api v0.32.3
11+
k8s.io/apiextensions-apiserver v0.32.1
12+
k8s.io/apimachinery v0.32.3
1313
k8s.io/client-go v12.0.0+incompatible
14-
sigs.k8s.io/controller-runtime v0.6.2
14+
sigs.k8s.io/controller-runtime v0.20.2
1515
)
1616

1717
require (
18-
github.com/davecgh/go-spew v1.1.1 // indirect
19-
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
20-
github.com/go-logr/logr v0.4.0 // indirect
18+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
19+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
20+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
21+
github.com/go-logr/logr v1.4.2 // indirect
22+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
23+
github.com/go-openapi/jsonreference v0.21.0 // indirect
24+
github.com/go-openapi/swag v0.23.0 // indirect
2125
github.com/gogo/protobuf v1.3.2 // indirect
22-
github.com/golang/protobuf v1.5.2 // indirect
23-
github.com/google/go-cmp v0.5.6 // indirect
26+
github.com/golang/protobuf v1.5.4 // indirect
27+
github.com/google/gnostic-models v0.6.9 // indirect
2428
github.com/google/gofuzz v1.2.0 // indirect
25-
github.com/googleapis/gnostic v0.5.5 // indirect
26-
github.com/imdario/mergo v0.3.12 // indirect
27-
github.com/json-iterator/go v1.1.11 // indirect
29+
github.com/google/uuid v1.6.0 // indirect
30+
github.com/imdario/mergo v0.3.16 // indirect
31+
github.com/josharian/intern v1.0.0 // indirect
32+
github.com/json-iterator/go v1.1.12 // indirect
33+
github.com/mailru/easyjson v0.9.0 // indirect
2834
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
29-
github.com/modern-go/reflect2 v1.0.1 // indirect
30-
github.com/onsi/gomega v1.19.0 // indirect
31-
github.com/openshift/api v0.0.0-20210521075222-e273a339932a // indirect
32-
github.com/operator-framework/operator-sdk v0.19.4 // indirect
33-
github.com/pkg/errors v0.9.1 // indirect
34-
github.com/spf13/pflag v1.0.5 // indirect
35-
github.com/stretchr/testify v1.7.2 // indirect
36-
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
37-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
38-
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c // indirect
39-
golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c // indirect
40-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
41-
golang.org/x/text v0.3.7 // indirect
42-
golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect
43-
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
44-
google.golang.org/appengine v1.6.7 // indirect
45-
google.golang.org/protobuf v1.26.0 // indirect
35+
github.com/modern-go/reflect2 v1.0.2 // indirect
36+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
37+
github.com/onsi/ginkgo/v2 v2.22.1 // indirect
38+
github.com/openshift/api v0.0.0-20250320115527-3aa9dd5b9002 // indirect
39+
github.com/spf13/pflag v1.0.6 // indirect
40+
golang.org/x/net v0.37.0 // indirect
41+
golang.org/x/oauth2 v0.28.0 // indirect
42+
golang.org/x/sys v0.31.0 // indirect
43+
golang.org/x/term v0.30.0 // indirect
44+
golang.org/x/text v0.23.0 // indirect
45+
golang.org/x/time v0.10.0 // indirect
46+
google.golang.org/protobuf v1.36.5 // indirect
4647
gopkg.in/inf.v0 v0.9.1 // indirect
4748
gopkg.in/yaml.v3 v3.0.1 // indirect
48-
k8s.io/klog/v2 v2.9.0 // indirect
49-
k8s.io/utils v0.0.0-20210527160623-6fdb442a123b // indirect
50-
sigs.k8s.io/structured-merge-diff/v4 v4.1.1 // indirect
51-
sigs.k8s.io/yaml v1.2.0 // indirect
49+
k8s.io/klog/v2 v2.130.1 // indirect
50+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
51+
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
52+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
53+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
54+
sigs.k8s.io/yaml v1.4.0 // indirect
5255
)
5356

5457
replace (
5558
github.com/go-log/log => github.com/go-log/log v0.1.1-0.20181211034820-a514cf01a3eb
5659
github.com/openshift/machine-config-operator => github.com/openshift/machine-config-operator v0.0.1-0.20200913004441-7eba765c69c9
57-
k8s.io/api => k8s.io/api v0.19.11
58-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.11
59-
k8s.io/apimachinery => k8s.io/apimachinery v0.19.11
60-
k8s.io/apiserver => k8s.io/apiserver v0.19.11
61-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.11
62-
k8s.io/client-go => k8s.io/client-go v0.19.11 // Required by prometheus-operator
63-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.11
64-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.11
65-
k8s.io/code-generator => k8s.io/code-generator v0.19.11
66-
k8s.io/component-base => k8s.io/component-base v0.19.11
67-
k8s.io/cri-api => k8s.io/cri-api v0.19.11
68-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.11
69-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.11
70-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.11
71-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.11
72-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.11
73-
k8s.io/kubectl => k8s.io/kubectl v0.19.11
74-
k8s.io/kubelet => k8s.io/kubelet v0.19.11
60+
k8s.io/api => k8s.io/api v0.30.0
61+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.0
62+
k8s.io/apimachinery => k8s.io/apimachinery v0.30.0
63+
k8s.io/apiserver => k8s.io/apiserver v0.30.0
64+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.0
65+
k8s.io/client-go => k8s.io/client-go v0.30.0 // Required by prometheus-operator
66+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.0
67+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.0
68+
k8s.io/code-generator => k8s.io/code-generator v0.30.0
69+
k8s.io/component-base => k8s.io/component-base v0.30.0
70+
k8s.io/cri-api => k8s.io/cri-api v0.30.0
71+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.0
72+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.0
73+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.0
74+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.0
75+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.0
76+
k8s.io/kubectl => k8s.io/kubectl v0.30.0
77+
k8s.io/kubelet => k8s.io/kubelet v0.30.0
7578
k8s.io/kubernetes => k8s.io/kubernetes v1.19.0
76-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.11
77-
k8s.io/metrics => k8s.io/metrics v0.19.11
78-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.11
79+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.0
80+
k8s.io/metrics => k8s.io/metrics v0.30.0
81+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.0
7982
)
8083

8184
replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm

0 commit comments

Comments
 (0)