Skip to content

[CNF-5643] bump api version to add new capability #937

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

Closed
qJkee wants to merge 3 commits into from
Closed

[CNF-5643] bump api version to add new capability #937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6381540
vendor: upgrade openshift/api
qJkee May 18, 2023
20d0ffe
update tests with new capabilities
qJkee May 18, 2023
ef7fb50
feat(golangci-lint): fix linter warnings
qJkee May 22, 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
  •  
  •  
  •  
47 changes: 22 additions & 25 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ require (
github.com/blang/semver/v4 v4.0.0
github.com/davecgh/go-spew v1.1.1
github.com/ghodss/yaml v1.0.0
github.com/google/go-cmp v0.5.6
github.com/google/uuid v1.2.0
github.com/openshift/api v0.0.0-20230106230226-5ad311dde226
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.3.0
github.com/openshift/api v0.0.0-20230518131117-f36cfb9a9909
github.com/openshift/client-go v0.0.0-20220915152853-9dfefb19db2e
github.com/openshift/library-go v0.0.0-20221012165547-f859132ee700
github.com/operator-framework/api v0.17.1
Expand All @@ -18,40 +18,39 @@ require (
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.32.1
github.com/spf13/cobra v1.4.0
golang.org/x/net v0.7.0
golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29
golang.org/x/net v0.8.0
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
gopkg.in/fsnotify.v1 v1.4.7
k8s.io/api v0.25.0
k8s.io/api v0.27.2
k8s.io/apiextensions-apiserver v0.25.0
k8s.io/apimachinery v0.25.0
k8s.io/client-go v0.25.0
k8s.io/klog/v2 v2.80.1
k8s.io/apimachinery v0.27.2
k8s.io/client-go v0.27.2
k8s.io/klog/v2 v2.90.1
k8s.io/kube-aggregator v0.25.0
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
k8s.io/utils v0.0.0-20230209194617-a36077c30491
)

require (
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
Expand All @@ -60,21 +59,19 @@ require (
github.com/prometheus/procfs v0.7.3 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/term v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.25.0 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
sigs.k8s.io/controller-runtime v0.12.1 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
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 // indirect
)
120 changes: 58 additions & 62 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions hack/test-prerequisites.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package main

import (
"context"
"io/ioutil"
"log"
"os"
"time"

"github.com/ghodss/yaml"
Expand Down Expand Up @@ -31,8 +31,10 @@ func main() {
"vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml",
} {
var name string
//nolint:staticcheck
// until https://github.com/kubernetes/kubernetes/issues/116712 is resolved
err := wait.PollImmediate(time.Second, 30*time.Second, func() (bool, error) {
data, err := ioutil.ReadFile(path)
data, err := os.ReadFile(path)
if err != nil {
log.Fatalf("Unable to read %s: %v", path, err)
}
Expand Down
6 changes: 6 additions & 0 deletions lib/capability/capability_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityStorage),
string(configv1.ClusterVersionCapabilityCSISnapshot),
string(configv1.ClusterVersionCapabilityNodeTuning),
string(configv1.ClusterVersionCapabilityMachineAPI),
},
wantEnabledKeys: []string{},
},
Expand All @@ -64,6 +65,7 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityStorage),
string(configv1.ClusterVersionCapabilityCSISnapshot),
string(configv1.ClusterVersionCapabilityNodeTuning),
string(configv1.ClusterVersionCapabilityMachineAPI),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
Expand All @@ -89,6 +91,7 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityStorage),
string(configv1.ClusterVersionCapabilityCSISnapshot),
string(configv1.ClusterVersionCapabilityNodeTuning),
string(configv1.ClusterVersionCapabilityMachineAPI),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
Expand All @@ -99,6 +102,7 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityStorage),
string(configv1.ClusterVersionCapabilityCSISnapshot),
string(configv1.ClusterVersionCapabilityNodeTuning),
string(configv1.ClusterVersionCapabilityMachineAPI),
},
},
{name: "set capabilities None with additional",
Expand All @@ -119,6 +123,7 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityStorage),
string(configv1.ClusterVersionCapabilityCSISnapshot),
string(configv1.ClusterVersionCapabilityNodeTuning),
string(configv1.ClusterVersionCapabilityMachineAPI),
},
wantEnabledKeys: []string{"cap1", "cap2", "cap3"},
},
Expand All @@ -140,6 +145,7 @@ func TestSetCapabilities(t *testing.T) {
string(configv1.ClusterVersionCapabilityStorage),
string(configv1.ClusterVersionCapabilityCSISnapshot),
string(configv1.ClusterVersionCapabilityNodeTuning),
string(configv1.ClusterVersionCapabilityMachineAPI),
},
wantEnabledKeys: []string{
string(configv1.ClusterVersionCapabilityBaremetal),
Expand Down
4 changes: 2 additions & 2 deletions lib/resourceapply/apps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func ApplyDeploymentv1(ctx context.Context, client appsclientv1.DeploymentsGette

var original appsv1.Deployment
existing.DeepCopyInto(&original)
modified := pointer.BoolPtr(false)
modified := pointer.Bool(false)
resourcemerge.EnsureDeployment(modified, existing, *required)
if !*modified {
return existing, false, nil
Expand Down Expand Up @@ -64,7 +64,7 @@ func ApplyDaemonSetv1(ctx context.Context, client appsclientv1.DaemonSetsGetter,
return nil, false, nil
}

modified := pointer.BoolPtr(false)
modified := pointer.Bool(false)
resourcemerge.EnsureDaemonSet(modified, existing, *required)
if !*modified {
return existing, false, nil
Expand Down
4 changes: 2 additions & 2 deletions lib/resourceapply/batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func ApplyJobv1(ctx context.Context, client batchclientv1.JobsGetter, required *

var original batchv1.Job
existing.DeepCopyInto(&original)
modified := pointer.BoolPtr(false)
modified := pointer.Bool(false)
resourcemerge.EnsureJob(modified, existing, *required)
if !*modified {
return existing, false, nil
Expand Down Expand Up @@ -66,7 +66,7 @@ func ApplyCronJobv1(ctx context.Context, client batchclientv1.CronJobsGetter, re

var original batchv1.CronJob
existing.DeepCopyInto(&original)
modified := pointer.BoolPtr(false)
modified := pointer.Bool(false)
resourcemerge.EnsureCronJob(modified, existing, *required)
if !*modified {
return existing, false, nil
Expand Down
8 changes: 4 additions & 4 deletions lib/resourceapply/core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func ApplyNamespacev1(ctx context.Context, client coreclientv1.NamespacesGetter,
return nil, false, nil
}

modified := pointer.BoolPtr(false)
modified := pointer.Bool(false)
resourcemerge.EnsureObjectMeta(modified, &existing.ObjectMeta, required.ObjectMeta)
if !*modified {
return existing, false, nil
Expand Down Expand Up @@ -63,7 +63,7 @@ func ApplyServicev1(ctx context.Context, client coreclientv1.ServicesGetter, req
return nil, false, nil
}

modified := pointer.BoolPtr(false)
modified := pointer.Bool(false)
resourcemerge.EnsureObjectMeta(modified, &existing.ObjectMeta, required.ObjectMeta)
resourcemerge.EnsureServicePorts(modified, &existing.Spec.Ports, required.Spec.Ports)
resourcemerge.EnsureServiceType(modified, &existing.Spec.Type, required.Spec.Type)
Expand Down Expand Up @@ -98,7 +98,7 @@ func ApplyServiceAccountv1(ctx context.Context, client coreclientv1.ServiceAccou
return nil, false, nil
}

modified := pointer.BoolPtr(false)
modified := pointer.Bool(false)
resourcemerge.EnsureServiceAccount(modified, existing, *required)
if !*modified {
return existing, false, nil
Expand Down Expand Up @@ -128,7 +128,7 @@ func ApplyConfigMapv1(ctx context.Context, client coreclientv1.ConfigMapsGetter,
return nil, false, nil
}

modified := pointer.BoolPtr(false)
modified := pointer.Bool(false)
resourcemerge.EnsureConfigMap(modified, existing, *required)
if !*modified {
return existing, false, nil
Expand Down
2 changes: 1 addition & 1 deletion lib/resourceapply/cv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func ApplyClusterVersionFromCache(ctx context.Context, lister configlistersv1.Cl

// Don't want to mutate cache.
existing := obj.DeepCopy()
modified := pointer.BoolPtr(false)
modified := pointer.Bool(false)
resourcemerge.EnsureClusterVersion(modified, existing, *required)
if !*modified {
return existing, false, nil
Expand Down
2 changes: 1 addition & 1 deletion lib/resourceapply/imagestream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func ApplyImageStreamv1(ctx context.Context, client imageclientv1.ImageStreamsGe

var original imagev1.ImageStream
existing.DeepCopyInto(&original)
modified := pointer.BoolPtr(false)
modified := pointer.Bool(false)
resourcemerge.EnsureImagestreamv1(modified, existing, *required)
if !*modified {
return existing, false, nil
Expand Down
8 changes: 4 additions & 4 deletions lib/resourceapply/rbac.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func ApplyClusterRoleBindingv1(ctx context.Context, client rbacclientv1.ClusterR
return nil, false, nil
}

modified := pointer.BoolPtr(false)
modified := pointer.Bool(false)
resourcemerge.EnsureClusterRoleBinding(modified, existing, *required)
if !*modified {
return existing, false, nil
Expand Down Expand Up @@ -58,7 +58,7 @@ func ApplyClusterRolev1(ctx context.Context, client rbacclientv1.ClusterRolesGet
return nil, false, nil
}

modified := pointer.BoolPtr(false)
modified := pointer.Bool(false)
resourcemerge.EnsureClusterRole(modified, existing, *required)
if !*modified {
return existing, false, nil
Expand Down Expand Up @@ -87,7 +87,7 @@ func ApplyRoleBindingv1(ctx context.Context, client rbacclientv1.RoleBindingsGet
return nil, false, nil
}

modified := pointer.BoolPtr(false)
modified := pointer.Bool(false)
resourcemerge.EnsureRoleBinding(modified, existing, *required)
if !*modified {
return existing, false, nil
Expand Down Expand Up @@ -116,7 +116,7 @@ func ApplyRolev1(ctx context.Context, client rbacclientv1.RolesGetter, required
return nil, false, nil
}

modified := pointer.BoolPtr(false)
modified := pointer.Bool(false)
resourcemerge.EnsureRole(modified, existing, *required)
if !*modified {
return existing, false, nil
Expand Down
2 changes: 1 addition & 1 deletion lib/resourceapply/security.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func ApplySecurityContextConstraintsv1(ctx context.Context, client securityclien
return nil, false, nil
}

modified := pointer.BoolPtr(false)
modified := pointer.Bool(false)
resourcemerge.EnsureObjectMeta(modified, &existing.ObjectMeta, required.ObjectMeta)
if !*modified {
return existing, false, nil
Expand Down
2 changes: 2 additions & 0 deletions lib/resourcebuilder/batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import (

// WaitForJobCompletion waits for job to complete.
func WaitForJobCompletion(ctx context.Context, client batchclientv1.JobsGetter, job *batchv1.Job) error {
//nolint:staticcheck
// until https://github.com/kubernetes/kubernetes/issues/116712 is resolved
return wait.PollImmediateUntil(defaultObjectPollInterval, func() (bool, error) {
j, err := client.Jobs(job.Namespace).Get(ctx, job.Name, metav1.GetOptions{})
if err != nil {
Expand Down
2 changes: 2 additions & 0 deletions pkg/autoupdate/autoupdate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ func New(
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "autoupdater"),
}

//nolint:errcheck
cvInformer.Informer().AddEventHandler(ctrl.eventHandler())

@wking wking May 23, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fdf3419 (#934), I'm plumbing through error checks for these calls. Some of the other commits in that in-flight pull request address other Go-lint/modernization issues too, if you want to pick them up here.

//nolint:errcheck
coInformer.Informer().AddEventHandler(ctrl.eventHandler())

ctrl.syncHandler = ctrl.sync
Expand Down
6 changes: 4 additions & 2 deletions pkg/cincinnati/cincinnati.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"net/url"
"sort"
Expand Down Expand Up @@ -113,6 +113,8 @@ func (c Client) GetUpdates(ctx context.Context, uri *url.URL, desiredArch, curre
if c.transport.TLSClientConfig.ClientCAs == nil {
klog.V(2).Infof("Using a root CA pool with 0 root CA subjects to request updates from %s", uri)
} else {
//nolint:staticcheck
// it's not returned by SystemCertPool
klog.V(2).Infof("Using a root CA pool with %n root CA subjects to request updates from %s", len(c.transport.TLSClientConfig.RootCAs.Subjects()), uri)
}
}
Expand Down Expand Up @@ -141,7 +143,7 @@ func (c Client) GetUpdates(ctx context.Context, uri *url.URL, desiredArch, curre
}

// Parse the graph.
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
return current, nil, nil, &Error{Reason: "ResponseFailed", Message: err.Error(), cause: err}
}
Expand Down
6 changes: 6 additions & 0 deletions pkg/cvo/cvo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,14 @@ func New(
conditionRegistry: standard.NewConditionRegistry(kubeClient),
}

// nolint: errcheck
cvInformer.Informer().AddEventHandler(optr.clusterVersionEventHandler())
// nolint: errcheck
cmConfigInformer.Informer().AddEventHandler(optr.adminAcksEventHandler())
// nolint: errcheck
cmConfigManagedInformer.Informer().AddEventHandler(optr.adminGatesEventHandler())

// nolint: errcheck
coInformer.Informer().AddEventHandler(optr.clusterOperatorEventHandler())
optr.coLister = coInformer.Lister()
optr.cacheSynced = append(optr.cacheSynced, coInformer.Informer().HasSynced)
Expand All @@ -240,6 +244,8 @@ func New(
func (optr *Operator) InitializeFromPayload(ctx context.Context, restConfig *rest.Config, burstRestConfig *rest.Config) error {

// wait until cluster version object exists
//nolint:staticcheck
// until https://github.com/kubernetes/kubernetes/issues/116712 is resolved
if err := wait.PollImmediateInfiniteWithContext(ctx, 3*time.Second, func(ctx context.Context) (bool, error) {
var err error

Expand Down
Loading