Skip to content

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

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

Merged
openshift-merge-robot merged 4 commits into from
Jun 21, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23079f2
vendor: bump openshift/api
qJkee Jun 20, 2023
47b993e
vendor: fix code according new api
qJkee Jun 20, 2023
1f2bf74
update tests with new capabilities
qJkee May 18, 2023
8913d38
feat(golangci-lint): fix linter warnings
qJkee Jun 20, 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
  •  
  •  
  •  
42 changes: 21 additions & 21 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/davecgh/go-spew v1.1.1
github.com/ghodss/yaml v1.0.0
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.2.0
github.com/openshift/api v0.0.0-20230426142911-5900934dde86
github.com/google/uuid v1.3.0
github.com/openshift/api v0.0.0-20230615141659-a6fbaf36017d
github.com/openshift/client-go v0.0.0-20230120202327-72f107311084
github.com/openshift/library-go v0.0.0-20230426173432-af831435a04c
github.com/operator-framework/api v0.17.1
Expand All @@ -19,16 +19,16 @@ require (
github.com/prometheus/common v0.37.0
github.com/spf13/cobra v1.6.0
golang.org/x/crypto v0.1.0
golang.org/x/net v0.7.0
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.26.1
k8s.io/apiextensions-apiserver v0.26.1
k8s.io/apimachinery v0.26.1
k8s.io/client-go v0.26.1
k8s.io/klog/v2 v2.80.1
k8s.io/api v0.27.1
k8s.io/apiextensions-apiserver v0.27.1
k8s.io/apimachinery v0.27.1
k8s.io/client-go v0.27.1
k8s.io/klog/v2 v2.90.1
k8s.io/kube-aggregator v0.26.1
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
k8s.io/utils v0.0.0-20230209194617-a36077c30491
)

require (
Expand All @@ -37,41 +37,41 @@ require (
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.20.0 // 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.1 // 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 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/spf13/pflag v1.0.5 // 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/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.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.26.1 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/apiserver v0.27.1 // indirect
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // 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
)
114 changes: 60 additions & 54 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions hack/test-prerequisites.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func main() {
"vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml",
} {
var name string
err := wait.PollImmediate(time.Second, 30*time.Second, func() (bool, error) {
err := wait.PollUntilContextTimeout(ctx, time.Second, 30*time.Second, true, func(localCtx context.Context) (bool, error) {
data, err := os.ReadFile(path)
if err != nil {
log.Fatalf("Unable to read %s: %v", path, err)
Expand All @@ -41,7 +41,7 @@ func main() {
log.Fatalf("Unable to parse CRD %s: %v", path, err)
}
name = crd.Name
_, err = client.ApiextensionsV1().CustomResourceDefinitions().Create(ctx, &crd, metav1.CreateOptions{})
_, err = client.ApiextensionsV1().CustomResourceDefinitions().Create(localCtx, &crd, metav1.CreateOptions{})
if errors.IsAlreadyExists(err) {
return true, nil
}
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
8 changes: 4 additions & 4 deletions lib/resourcebuilder/batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ import (

// WaitForJobCompletion waits for job to complete.
func WaitForJobCompletion(ctx context.Context, client batchclientv1.JobsGetter, job *batchv1.Job) error {
return wait.PollImmediateUntil(defaultObjectPollInterval, func() (bool, error) {
j, err := client.Jobs(job.Namespace).Get(ctx, job.Name, metav1.GetOptions{})
return wait.PollUntilContextCancel(ctx, defaultObjectPollInterval, true, func(localCtx context.Context) (bool, error) {
j, err := client.Jobs(job.Namespace).Get(localCtx, job.Name, metav1.GetOptions{})
if err != nil {
return false, fmt.Errorf("error getting Job %s: %v", job.Name, err)
}

if done, err := checkJobHealth(ctx, j); err != nil && done {
if done, err := checkJobHealth(localCtx, j); err != nil && done {
return false, err
} else if err != nil {
klog.Error(err)
Expand All @@ -30,7 +30,7 @@ func WaitForJobCompletion(ctx context.Context, client batchclientv1.JobsGetter,
return false, nil
}
return true, nil
}, ctx.Done())
})
}

func (b *builder) checkJobHealth(ctx context.Context, job *batchv1.Job) error {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cvo/cvo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func New(
func (optr *Operator) InitializeFromPayload(ctx context.Context, restConfig *rest.Config, burstRestConfig *rest.Config) error {

// wait until cluster version object exists
if err := wait.PollImmediateInfiniteWithContext(ctx, 3*time.Second, func(ctx context.Context) (bool, error) {
if err := wait.PollUntilContextCancel(ctx, 3*time.Second, true, func(ctx context.Context) (bool, error) {
var err error

// ensure the cluster version exists
Expand Down
Loading