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.

Sign up for GitHub

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

Jump to bottom

Bump controller-runtime, k8s libraries, openshift/library go, adjust CO to the new versions #337

Merged
merged 9 commits into from
Jul 25, 2023
Merged

Bump controller-runtime, k8s libraries, openshift/library go, adjust CO to the new versions #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
774dd7a
fix(deps): update module sigs.k8s.io/controller-runtime to v0.15.0
renovate[bot] May 27, 2023
acfda34
Bump openshift/library-go
jhrozek May 30, 2023
97ec6bc
bump k8s.io/pod-security-admission to v0.27.2
jhrozek May 30, 2023
5a4d4c9
bump sigs.k8s.io/controller-tools to v0.12.0
jhrozek May 30, 2023
02b4117
Adjust CO reconcile loop setup and unit tests for the new controller-…
jhrozek May 30, 2023
11751a3
tests: Set logger to an empty sink in tests
jhrozek Jun 28, 2023
46c71c9
complianceremediation: Workaround for k8s changing its error types
jhrozek Jul 5, 2023
39a0218
Run make bundle
jhrozek Jul 5, 2023
28c02dd
Bump sigs.k8s.io/controller-tools to 0.12.1, go mod tidy
jhrozek Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 6 additions & 1 deletion cmd/manager/aggregator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,12 @@ var _ = Describe("Aggregator Tests", func() {
},
}

client := fake.NewFakeClientWithScheme(scheme, scan, rem)
client := fake.NewClientBuilder().
WithScheme(scheme).
WithStatusSubresource(scan, rem, &ocpcfgv1.ClusterOperator{}).
WithRuntimeObjects(scan, rem).
Build()

fakerecorder = fakerec.NewFakeRecorder(1)
crClient = &aggregatorCrClientFake{
scheme: scheme,
Expand Down
3 changes: 1 addition & 2 deletions config/crd/bases/compliance.openshift.io_compliancecheckresults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.12.0
name: compliancecheckresults.compliance.openshift.io
spec:
group: compliance.openshift.io
Expand Down
3 changes: 1 addition & 2 deletions config/crd/bases/compliance.openshift.io_complianceremediations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.12.0
name: complianceremediations.compliance.openshift.io
spec:
group: compliance.openshift.io
Expand Down
3 changes: 1 addition & 2 deletions config/crd/bases/compliance.openshift.io_compliancescans.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.12.0
name: compliancescans.compliance.openshift.io
spec:
group: compliance.openshift.io
Expand Down
3 changes: 1 addition & 2 deletions config/crd/bases/compliance.openshift.io_compliancesuites.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.12.0
name: compliancesuites.compliance.openshift.io
spec:
group: compliance.openshift.io
Expand Down
3 changes: 1 addition & 2 deletions config/crd/bases/compliance.openshift.io_profilebundles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.12.0
name: profilebundles.compliance.openshift.io
spec:
group: compliance.openshift.io
Expand Down
3 changes: 1 addition & 2 deletions config/crd/bases/compliance.openshift.io_profiles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.12.0
name: profiles.compliance.openshift.io
spec:
group: compliance.openshift.io
Expand Down
3 changes: 1 addition & 2 deletions config/crd/bases/compliance.openshift.io_rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.12.0
name: rules.compliance.openshift.io
spec:
group: compliance.openshift.io
Expand Down
3 changes: 1 addition & 2 deletions config/crd/bases/compliance.openshift.io_scansettingbindings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.12.0
name: scansettingbindings.compliance.openshift.io
spec:
group: compliance.openshift.io
Expand Down
3 changes: 1 addition & 2 deletions config/crd/bases/compliance.openshift.io_scansettings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.12.0
name: scansettings.compliance.openshift.io
spec:
group: compliance.openshift.io
Expand Down
3 changes: 1 addition & 2 deletions config/crd/bases/compliance.openshift.io_tailoredprofiles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.12.0
name: tailoredprofiles.compliance.openshift.io
spec:
group: compliance.openshift.io
Expand Down
3 changes: 1 addition & 2 deletions config/crd/bases/compliance.openshift.io_variables.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.12.0
name: variables.compliance.openshift.io
spec:
group: compliance.openshift.io
Expand Down
43 changes: 19 additions & 24 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ go 1.19

require (
github.com/onsi/ginkgo v1.16.5
github.com/onsi/ginkgo/v2 v2.11.0
github.com/onsi/gomega v1.27.8
github.com/wI2L/jsondiff v0.4.0
k8s.io/apimachinery v0.26.3
k8s.io/client-go v0.26.3
sigs.k8s.io/controller-runtime v0.14.6
k8s.io/apimachinery v0.27.2
k8s.io/client-go v0.27.2
sigs.k8s.io/controller-runtime v0.15.0
)

require (
Expand Down Expand Up @@ -43,8 +42,8 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/openshift/api v0.0.0-20230426193520-54a14470e5dc
github.com/openshift/library-go v0.0.0-20230502125217-e45be8351afe
github.com/openshift/api v0.0.0-20230503133300-8bbcb7ca7183
github.com/openshift/library-go v0.0.0-20230523150659-ab179469ba38
github.com/openshift/machine-config-operator v0.0.1-0.20230124070108-2d92b8d47e80
github.com/pborman/uuid v1.2.1
github.com/pkg/errors v0.9.1
Expand All @@ -70,22 +69,22 @@ require (
golang.org/x/term v0.9.0 // indirect
golang.org/x/text v0.10.0 // indirect
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.26.3
k8s.io/apiextensions-apiserver v0.26.3
k8s.io/apiserver v0.26.3
k8s.io/component-base v0.26.3 // indirect
k8s.io/klog/v2 v2.90.0 // indirect
k8s.io/kube-openapi v0.0.0-20230202010329-39b3636cbaa3 // indirect
k8s.io/pod-security-admission v0.26.3
k8s.io/utils v0.0.0-20230202215443-34013725500c // indirect
sigs.k8s.io/controller-tools v0.11.3
k8s.io/api v0.27.2
k8s.io/apiextensions-apiserver v0.27.2
k8s.io/apiserver v0.27.2
k8s.io/component-base v0.27.2 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/pod-security-admission v0.27.2
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
sigs.k8s.io/controller-tools v0.12.1
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0
Expand All @@ -104,34 +103,30 @@ require (
github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 // indirect
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gobuffalo/flect v0.3.0 // indirect
github.com/gobuffalo/flect v1.0.2 // indirect
github.com/golang/glog v1.0.0 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/gookit/color v1.5.3 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/itchyny/timefmt-go v0.1.5 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/openshift/client-go v0.0.0-20230120202327-72f107311084 // indirect
github.com/onsi/ginkgo/v2 v2.11.0 // indirect
github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
github.com/tidwall/gjson v1.14.3 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
github.com/vincent-petithory/dataurl v1.0.0 // indirect
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
go4.org v0.0.0-20200104003542-c7e774b10ea0 // indirect
Expand Down
Loading