Skip to content

Commit 4259ed7

Browse files
tremestremes
committed
Relax some warnings by updating the versions & minor cleanup
1 parent 21488f4 commit 4259ed7

29 files changed

+26
-63
lines changed

Diff for: ‎pkg/gather/clusterconfig/0_gatherer.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ import (
1212
"k8s.io/client-go/rest"
1313
"k8s.io/klog/v2"
1414

15-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
16-
1715
"github.com/openshift/insights-operator/pkg/record"
1816
)
1917

@@ -66,7 +64,7 @@ var gatherFunctions = map[string]gatherFunction{
6664
"netnamespaces": GatherNetNamespace,
6765
"openshift_apiserver_operator_logs": GatherOpenShiftAPIServerOperatorLogs,
6866
"openshift_sdn_logs": GatherOpenshiftSDNLogs,
69-
"olm_operators": GatherOLMOperators,
67+
"olm_operators": GatherOLMOperators,
7068
}
7169

7270
// New creates new Gatherer

Diff for: ‎pkg/gather/clusterconfig/0_utils.go

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
networkv1 "github.com/openshift/api/network/v1"
2525
openshiftscheme "github.com/openshift/client-go/config/clientset/versioned/scheme"
2626
appsv1 "k8s.io/api/apps/v1"
27-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
2827
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
2928
)
3029

Diff for: ‎pkg/gather/clusterconfig/authentications.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package clusterconfig
22

33
import (
44
"context"
5+
56
"k8s.io/apimachinery/pkg/api/errors"
67
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
78

89
configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
9-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
1010

1111
"github.com/openshift/insights-operator/pkg/record"
1212
)

Diff for: ‎pkg/gather/clusterconfig/certificate_signing_requests.go

+13-15
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@ import (
88
"fmt"
99
"time"
1010

11-
"k8s.io/api/certificates/v1beta1"
12-
certificatesv1b1api "k8s.io/api/certificates/v1beta1"
11+
certificatesv1api "k8s.io/api/certificates/v1"
1312
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1413
"k8s.io/apimachinery/pkg/util/json"
1514
"k8s.io/client-go/kubernetes"
1615
"k8s.io/klog/v2"
1716

1817
"k8s.io/apimachinery/pkg/api/errors"
1918

20-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
21-
certificatesv1beta1 "k8s.io/client-go/kubernetes/typed/certificates/v1beta1"
19+
certificatesv1 "k8s.io/client-go/kubernetes/typed/certificates/v1"
2220

2321
"github.com/openshift/insights-operator/pkg/record"
2422
)
@@ -40,10 +38,10 @@ func GatherCertificateSigningRequests(g *Gatherer) ([]record.Record, []error) {
4038
if err != nil {
4139
return nil, []error{err}
4240
}
43-
return gatherCertificateSigningRequests(g.ctx, gatherKubeClient.CertificatesV1beta1())
41+
return gatherCertificateSigningRequests(g.ctx, gatherKubeClient.CertificatesV1())
4442
}
4543

46-
func gatherCertificateSigningRequests(ctx context.Context, certClient certificatesv1beta1.CertificatesV1beta1Interface) ([]record.Record, []error) {
44+
func gatherCertificateSigningRequests(ctx context.Context, certClient certificatesv1.CertificateSigningRequestsGetter) ([]record.Record, []error) {
4745
requests, err := certClient.CertificateSigningRequests().List(ctx, metav1.ListOptions{
4846
Limit: csrGatherLimit,
4947
})
@@ -82,11 +80,11 @@ func (a CSRAnonymizer) GetExtension() string {
8280
}
8381

8482
type CSRs struct {
85-
Requests []v1beta1.CertificateSigningRequest
83+
Requests []certificatesv1api.CertificateSigningRequest
8684
Anonymized []CSRAnonymizer
8785
}
8886

89-
func FromCSRs(requests *v1beta1.CertificateSigningRequestList) *CSRs {
87+
func FromCSRs(requests *certificatesv1api.CertificateSigningRequestList) *CSRs {
9088
return &CSRs{Requests: requests.Items}
9189
}
9290

@@ -153,7 +151,7 @@ func IncludeCSR(c *CSRAnonymizedFeatures, opts ...FilterOptFunc) bool {
153151
return true
154152
}
155153

156-
func anonymizeCSRRequest(r *certificatesv1b1api.CertificateSigningRequest, c *CSRAnonymizedFeatures) {
154+
func anonymizeCSRRequest(r *certificatesv1api.CertificateSigningRequest, c *CSRAnonymizedFeatures) {
157155
if r == nil || c == nil {
158156
return
159157
}
@@ -231,7 +229,7 @@ func anonymizePkxName(s pkix.Name) (a pkix.Name) {
231229
}
232230

233231
// returns true if certificate is valid
234-
func anonymizeCSRCert(r *certificatesv1b1api.CertificateSigningRequest, c *CSRAnonymizedFeatures) {
232+
func anonymizeCSRCert(r *certificatesv1api.CertificateSigningRequest, c *CSRAnonymizedFeatures) {
235233
if r == nil || c == nil {
236234
return
237235
}
@@ -258,17 +256,17 @@ func anonymizeCSRCert(r *certificatesv1b1api.CertificateSigningRequest, c *CSRAn
258256
c.Status.Cert.NotAfter = cert.NotAfter.Format(time.RFC3339)
259257
}
260258

261-
func addMeta(r *certificatesv1b1api.CertificateSigningRequest, c *CSRAnonymizedFeatures) {
259+
func addMeta(r *certificatesv1api.CertificateSigningRequest, c *CSRAnonymizedFeatures) {
262260
if r == nil || c == nil {
263261
return
264262
}
265263
c.TypeMeta = r.TypeMeta
266264
c.ObjectMeta = r.ObjectMeta
267265
}
268266

269-
func anonymizeCSR(r *certificatesv1b1api.CertificateSigningRequest) *CSRAnonymizedFeatures {
267+
func anonymizeCSR(r *certificatesv1api.CertificateSigningRequest) *CSRAnonymizedFeatures {
270268
c := &CSRAnonymizedFeatures{}
271-
fns := []func(r *certificatesv1b1api.CertificateSigningRequest, c *CSRAnonymizedFeatures){
269+
fns := []func(r *certificatesv1api.CertificateSigningRequest, c *CSRAnonymizedFeatures){
272270
addMeta,
273271
anonymizeCSRRequest,
274272
anonymizeCSRCert,
@@ -299,13 +297,13 @@ type StateFeatures struct {
299297
UID string
300298
Username string
301299
Groups []string
302-
Usages []v1beta1.KeyUsage
300+
Usages []certificatesv1api.KeyUsage
303301

304302
Request *CsrFeatures
305303
}
306304

307305
type StatusFeatures struct {
308-
Conditions []v1beta1.CertificateSigningRequestCondition
306+
Conditions []certificatesv1api.CertificateSigningRequestCondition
309307
Cert *CertFeatures
310308
}
311309

Diff for: ‎pkg/gather/clusterconfig/certificate_signing_requests_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"testing"
1010
"time"
1111

12-
certificatesv1b1api "k8s.io/api/certificates/v1beta1"
12+
certificatesv1api "k8s.io/api/certificates/v1"
1313
)
1414

1515
func TestCSRs(t *testing.T) {
@@ -24,7 +24,7 @@ func TestCSRs(t *testing.T) {
2424
for _, tt := range files {
2525
t.Run(tt.dataFile, func(t *testing.T) {
2626

27-
r := &certificatesv1b1api.CertificateSigningRequest{}
27+
r := &certificatesv1api.CertificateSigningRequest{}
2828

2929
f, err := os.Open(tt.dataFile)
3030
if err != nil {

Diff for: ‎pkg/gather/clusterconfig/config_maps.go

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import (
1111
"k8s.io/client-go/kubernetes"
1212
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
1313

14-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
15-
1614
"github.com/openshift/insights-operator/pkg/record"
1715
)
1816

Diff for: ‎pkg/gather/clusterconfig/container_images.go

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ import (
1212
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
1313
"k8s.io/klog/v2"
1414

15-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
16-
1715
"github.com/openshift/insights-operator/pkg/record"
1816
"github.com/openshift/library-go/pkg/image/reference"
1917
)

Diff for: ‎pkg/gather/clusterconfig/container_runtime_configs.go

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import (
99
"k8s.io/apimachinery/pkg/runtime/schema"
1010
"k8s.io/client-go/dynamic"
1111

12-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
13-
1412
"github.com/openshift/insights-operator/pkg/record"
1513
)
1614

Diff for: ‎pkg/gather/clusterconfig/custom_resource_definitions.go

+3-5
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ import (
44
"context"
55
"fmt"
66

7-
apixv1beta1client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1"
7+
apixv1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
88
"k8s.io/apimachinery/pkg/api/errors"
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1010
"k8s.io/klog/v2"
1111

12-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
13-
1412
"github.com/openshift/insights-operator/pkg/record"
1513
)
1614

@@ -25,14 +23,14 @@ import (
2523
// Location in archive: config/crd/
2624
// Id in config: crds
2725
func GatherCRD(g *Gatherer) ([]record.Record, []error) {
28-
crdClient, err := apixv1beta1client.NewForConfig(g.gatherKubeConfig)
26+
crdClient, err := apixv1.NewForConfig(g.gatherKubeConfig)
2927
if err != nil {
3028
return nil, []error{err}
3129
}
3230
return gatherCRD(g.ctx, crdClient)
3331
}
3432

35-
func gatherCRD(ctx context.Context, crdClient apixv1beta1client.ApiextensionsV1beta1Interface) ([]record.Record, []error) {
33+
func gatherCRD(ctx context.Context, crdClient apixv1.ApiextensionsV1Interface) ([]record.Record, []error) {
3634
toBeCollected := []string{
3735
"volumesnapshots.snapshot.storage.k8s.io",
3836
"volumesnapshotcontents.snapshot.storage.k8s.io",

Diff for: ‎pkg/gather/clusterconfig/custom_resource_definitions_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import (
55
"reflect"
66
"testing"
77

8-
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
9-
apixv1beta1clientfake "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake"
8+
v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
9+
apixv1clientfake "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake"
1010
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1111
)
1212

1313
func TestCollectVolumeSnapshotCRD(t *testing.T) {
14-
expectedRecords := map[string]v1beta1.CustomResourceDefinition{
14+
expectedRecords := map[string]v1.CustomResourceDefinition{
1515
"config/crd/volumesnapshots.snapshot.storage.k8s.io": {ObjectMeta: metav1.ObjectMeta{Name: "volumesnapshots.snapshot.storage.k8s.io"}},
1616
"config/crd/volumesnapshotcontents.snapshot.storage.k8s.io": {ObjectMeta: metav1.ObjectMeta{Name: "volumesnapshotcontents.snapshot.storage.k8s.io"}},
1717
}
@@ -24,16 +24,16 @@ func TestCollectVolumeSnapshotCRD(t *testing.T) {
2424
"this.should.not.be.gathered.k8s.io",
2525
}
2626

27-
crdClientset := apixv1beta1clientfake.NewSimpleClientset()
27+
crdClientset := apixv1clientfake.NewSimpleClientset()
2828

2929
for _, name := range crdNames {
30-
crdClientset.ApiextensionsV1beta1().CustomResourceDefinitions().Create(context.Background(), &v1beta1.CustomResourceDefinition{
30+
crdClientset.ApiextensionsV1().CustomResourceDefinitions().Create(context.Background(), &v1.CustomResourceDefinition{
3131
ObjectMeta: metav1.ObjectMeta{Name: name},
3232
}, metav1.CreateOptions{})
3333
}
3434

3535
ctx := context.Background()
36-
records, errs := gatherCRD(ctx, crdClientset.ApiextensionsV1beta1())
36+
records, errs := gatherCRD(ctx, crdClientset.ApiextensionsV1())
3737
if len(errs) != 0 {
3838
t.Fatalf("gather CRDs resulted in error: %#v", errs)
3939
}

Diff for: ‎pkg/gather/clusterconfig/feature_gates.go

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
configv1 "github.com/openshift/api/config/v1"
1111
configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
12-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
1312

1413
"github.com/openshift/insights-operator/pkg/record"
1514
)

Diff for: ‎pkg/gather/clusterconfig/host_subnets.go

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010

1111
networkv1 "github.com/openshift/api/network/v1"
1212
networkv1client "github.com/openshift/client-go/network/clientset/versioned/typed/network/v1"
13-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
1413

1514
"github.com/openshift/insights-operator/pkg/record"
1615
)

Diff for: ‎pkg/gather/clusterconfig/image_pruners.go

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
registryv1 "github.com/openshift/api/imageregistry/v1"
1414
imageregistryv1client "github.com/openshift/client-go/imageregistry/clientset/versioned"
1515
imageregistryv1 "github.com/openshift/client-go/imageregistry/clientset/versioned/typed/imageregistry/v1"
16-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
1716

1817
"github.com/openshift/insights-operator/pkg/record"
1918
)

Diff for: ‎pkg/gather/clusterconfig/image_registries.go

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
registryv1 "github.com/openshift/api/imageregistry/v1"
1414
imageregistryv1client "github.com/openshift/client-go/imageregistry/clientset/versioned"
1515
imageregistryv1 "github.com/openshift/client-go/imageregistry/clientset/versioned/typed/imageregistry/v1"
16-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
1716

1817
"github.com/openshift/insights-operator/pkg/record"
1918
)

Diff for: ‎pkg/gather/clusterconfig/infrastructures.go

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
configv1 "github.com/openshift/api/config/v1"
1111
configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
12-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
1312

1413
"github.com/openshift/insights-operator/pkg/record"
1514
)

Diff for: ‎pkg/gather/clusterconfig/ingresses.go

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
configv1 "github.com/openshift/api/config/v1"
1111
configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
12-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
1312

1413
"github.com/openshift/insights-operator/pkg/record"
1514
)

Diff for: ‎pkg/gather/clusterconfig/install_plans.go

-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import (
1414
"k8s.io/client-go/kubernetes"
1515
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
1616

17-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
18-
1917
"github.com/openshift/insights-operator/pkg/record"
2018
)
2119

Diff for: ‎pkg/gather/clusterconfig/machine_config_pools.go

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import (
99
"k8s.io/apimachinery/pkg/runtime/schema"
1010
"k8s.io/client-go/dynamic"
1111

12-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
13-
1412
"github.com/openshift/insights-operator/pkg/record"
1513
)
1614

Diff for: ‎pkg/gather/clusterconfig/machine_sets.go

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import (
99
"k8s.io/apimachinery/pkg/runtime/schema"
1010
"k8s.io/client-go/dynamic"
1111

12-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
13-
1412
"github.com/openshift/insights-operator/pkg/record"
1513
)
1614

Diff for: ‎pkg/gather/clusterconfig/netnamespaces.go

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
networkv1 "github.com/openshift/api/network/v1"
1111
networkv1client "github.com/openshift/client-go/network/clientset/versioned/typed/network/v1"
12-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
1312

1413
"github.com/openshift/insights-operator/pkg/record"
1514
)

Diff for: ‎pkg/gather/clusterconfig/networks.go

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
88

99
configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
10-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
1110

1211
"github.com/openshift/insights-operator/pkg/record"
1312
)

Diff for: ‎pkg/gather/clusterconfig/nodes.go

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
corev1 "k8s.io/api/core/v1"
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
12-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
1312
"k8s.io/client-go/kubernetes"
1413
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
1514

Diff for: ‎pkg/gather/clusterconfig/oauths.go

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
88

99
configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
10-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
1110

1211
"github.com/openshift/insights-operator/pkg/record"
1312
)

Diff for: ‎pkg/gather/clusterconfig/operators.go

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121

2222
configv1 "github.com/openshift/api/config/v1"
2323
configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
24-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
2524
"k8s.io/client-go/discovery"
2625
"k8s.io/client-go/dynamic"
2726
"k8s.io/client-go/kubernetes"

Diff for: ‎pkg/gather/clusterconfig/pod_disruption_budgets.go

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import (
1111

1212
policyclient "k8s.io/client-go/kubernetes/typed/policy/v1beta1"
1313

14-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
15-
1614
"github.com/openshift/insights-operator/pkg/record"
1715
)
1816

Diff for: ‎pkg/gather/clusterconfig/proxies.go

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
configv1 "github.com/openshift/api/config/v1"
1111
configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
12-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
1312

1413
"github.com/openshift/insights-operator/pkg/record"
1514
)

Diff for: ‎pkg/gather/clusterconfig/service_accounts.go

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ import (
1313
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
1414
"k8s.io/klog/v2"
1515

16-
_ "k8s.io/apimachinery/pkg/runtime/serializer/yaml"
17-
1816
"github.com/openshift/insights-operator/pkg/record"
1917
)
2018

0 commit comments

Comments
 (0)