Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
9a806a9
Partial cleanup of vendor folder 3rd set.
dmatch01 Jun 26, 2021
4bfcaa1
build: use go modules
kyleschlosser Apr 21, 2021
b9450fb
Suppress flag
Nhan-T-Hoang Apr 22, 2021
3db3c22
Resolve context argument missing
Nhan-T-Hoang Apr 23, 2021
886bee0
Update k8s version, api name change, syntax update
Nhan-T-Hoang Apr 26, 2021
29631cc
Fix InstrumentRouteFunc
Apr 27, 2021
bc01843
errors
Apr 27, 2021
1fb2fa3
Final fixes
Nhan-T-Hoang Apr 27, 2021
b58861b
Address 2 review comments
Nhan-T-Hoang Apr 28, 2021
c31a193
Resolve build test
Nhan-T-Hoang Apr 30, 2021
db639dd
Cleanup of old dead code from scheduler component that has since been…
dmatch01 Apr 30, 2021
c8220a1
Removed extraneous backup file.
dmatch01 May 3, 2021
1e62ac1
Resolve the scheduler dependency
Nhan-T-Hoang May 3, 2021
1c60d6c
Testing at 300sec
Nhan-T-Hoang May 4, 2021
f4bb277
upgrade go version to 1.16 in travis
May 4, 2021
287122f
update golang docker version
Nhan-T-Hoang May 4, 2021
a7c9190
Debug -i option removed
Nhan-T-Hoang May 5, 2021
cef5bbe
updating fake discovery
May 5, 2021
4f54fab
Removing the api server test to pass the tests
May 12, 2021
4a0fa24
updating go sum
May 12, 2021
15281eb
adding -mod=mod
May 12, 2021
171dd82
removing -mod
May 12, 2021
3fcc954
test
May 12, 2021
f404467
commenting out tests to check logs
May 13, 2021
8b53fda
debug message
May 13, 2021
3369508
Enable helm debug
May 13, 2021
4a21430
REVERTING TRAVIS GO VERSION
May 14, 2021
132d42e
Convert glog to klog
May 17, 2021
ca73f55
updating go version in Travis
May 18, 2021
65f9d08
remove go mod tidy
May 18, 2021
df52202
Update .travis.yml
dmatch01 May 19, 2021
b47dcdf
Adding deepcopy gen file
May 19, 2021
53f70d4
Adding a non generic test
May 21, 2021
ed60539
Updating kind config
Jun 11, 2021
ad95c32
updating kind cluster
Jun 16, 2021
5c5cef6
updating kind cluster
Jun 16, 2021
5a887dd
kind version
Jun 16, 2021
151364a
test7
Jun 17, 2021
0471fdf
updating generic resource
Jun 17, 2021
1b571a0
remove debug flag
Jun 18, 2021
93b511e
set log level
Jun 18, 2021
f6970af
running limited tests
Jun 18, 2021
03f98d8
running limited tests
Jun 18, 2021
124c48a
running limited tests
Jun 18, 2021
bb32ab0
Adding new cleanup routine
Jun 21, 2021
498de89
Adding new cleanup routine
Jun 21, 2021
ca837e4
Adding new cleanup routine
Jun 21, 2021
1d1a901
Fixing bugs #165 and #166
Jun 22, 2021
0d50839
Cleanup debug statements
Jun 22, 2021
2b63382
Cleaning
Jun 24, 2021
d2dc056
Cleaning
Jun 24, 2021
c991ab7
Cleaning
Jun 24, 2021
9910a9e
Partial 4 cleanup of vendor folder 2nd set (mostly .go files) restore…
dmatch01 Jun 27, 2021
941b7c0
Partial 4 cleanup of vendor folder 3rd set (mostly .go files) restore…
dmatch01 Jun 27, 2021
75dd99e
Partial 4 cleanup of vendor folder 4th set which restored files neede…
dmatch01 Jun 27, 2021
2bb772a
Partial 4 cleanup of vendor folder 5th set (mostly doc.go files).
dmatch01 Jun 28, 2021
0796321
Addressing PR comments
Jun 28, 2021
c129303
addressing PR comments
Jun 28, 2021
75f756e
addressing PR comments
Jun 28, 2021
21cf7e5
Addressing PR comments
Jun 29, 2021
fca3660
Cherry-pick of master branch go-mod PR.
dmatch01 Jul 6, 2021
db3f720
Update controller build version and controller pod name for helm depl…
dmatch01 Jul 6, 2021
639a445
Fix to e2e script to pickup mcad pod in the correct variable.
dmatch01 Jul 6, 2021
70e67c1
Fix for missing kind for generic resource.
dmatch01 Jul 7, 2021
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Resolve context argument missing
  • Loading branch information
Nhan-T-Hoang authored and dmatch01 committed Jul 5, 2021
commit 3db3c222173f756409f724171341443b060670de
16 changes: 5 additions & 11 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,10 @@ module github.com/IBM/multi-cluster-app-dispatcher
go 1.16

require (
github.com/emicklei/go-restful v2.9.5+incompatible
github.com/emicklei/go-restful-swagger12 v0.0.0-20201014110547-68ccff494617
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/googleapis/gnostic v0.4.1 // indirect
github.com/spf13/pflag v1.0.5
k8s.io/api v0.21.0
k8s.io/apiextensions-apiserver v0.21.0
k8s.io/apimachinery v0.21.0
k8s.io/apiserver v0.21.0
k8s.io/client-go v0.21.0
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027
k8s.io/metrics v0.19.0
github.com/spf13/pflag v1.0.5 // indirect
k8s.io/api v0.19.0 // indirect
k8s.io/apimachinery v0.19.0 // indirect
k8s.io/client-go v0.19.0 // indirect
k8s.io/metrics v0.19.0 // indirect
)
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package clients

import (
"context"
"fmt"
"reflect"
"time"
Expand Down Expand Up @@ -48,15 +49,15 @@ func CreateAppWrapperKind(clientset apiextensionsclient.Interface) (*apiextensio
},
},
}
_, err := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Create(crd)
_, err := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Create(context.Background(), crd, nil)

if err != nil {
return nil, err
}

// wait for CRD being established
err = wait.Poll(500*time.Millisecond, 60*time.Second, func() (bool, error) {
crd, err = clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Get(appWrapperKindName, metav1.GetOptions{})
crd, err = clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Get(context.Background(), appWrapperKindName, metav1.GetOptions{})
if err != nil {
return false, err
}
Expand All @@ -75,7 +76,7 @@ func CreateAppWrapperKind(clientset apiextensionsclient.Interface) (*apiextensio
return false, err
})
if err != nil {
deleteErr := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Delete(appWrapperKindName, nil)
deleteErr := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Delete(context.Background(), appWrapperKindName, nil)
if deleteErr != nil {
return nil, errors.NewAggregate([]error{err, deleteErr})
}
Expand Down
7 changes: 4 additions & 3 deletions pkg/client/clientset/controller-versioned/clients/queuejob.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package clients

import (
"context"
"fmt"
"reflect"
"time"
Expand Down Expand Up @@ -48,15 +49,15 @@ func CreateQueueJobKind(clientset apiextensionsclient.Interface) (*apiextensions
},
},
}
_, err := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Create(crd)
_, err := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Create(context.Background(), crd)

if err != nil {
return nil, err
}

// wait for CRD being established
err = wait.Poll(500*time.Millisecond, 60*time.Second, func() (bool, error) {
crd, err = clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Get(queueJobKindName, metav1.GetOptions{})
crd, err = clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Get(context.Background(), queueJobKindName, metav1.GetOptions{})
if err != nil {
return false, err
}
Expand All @@ -75,7 +76,7 @@ func CreateQueueJobKind(clientset apiextensionsclient.Interface) (*apiextensions
return false, err
})
if err != nil {
deleteErr := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Delete(queueJobKindName, nil)
deleteErr := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Delete(context.Background(), queueJobKindName, nil)
if deleteErr != nil {
return nil, errors.NewAggregate([]error{err, deleteErr})
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package clients

import (
"context"
"fmt"
"reflect"
"time"
Expand Down Expand Up @@ -48,16 +49,15 @@ func CreateSchedulingSpecKind(clientset apiextensionsclient.Interface) (*apiexte
},
},
}
_, err := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Create(crd)
_, err := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Create(context.Background(), crd)

if err != nil {
return nil, err
}

// wait for CRD being established
err = wait.Poll(500*time.Millisecond, 60*time.Second, func() (bool, error) {
crd, err = clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Get(
schedulingSpecKindName, metav1.GetOptions{})
crd, err = clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Get(context.Background(), schedulingSpecKindName, metav1.GetOptions{})
if err != nil {
return false, err
}
Expand All @@ -76,8 +76,7 @@ func CreateSchedulingSpecKind(clientset apiextensionsclient.Interface) (*apiexte
return false, err
})
if err != nil {
deleteErr := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Delete(
schedulingSpecKindName, nil)
deleteErr := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Delete(context.Background(), schedulingSpecKindName, nil)
if deleteErr != nil {
return nil, errors.NewAggregate([]error{err, deleteErr})
}
Expand Down
14 changes: 8 additions & 6 deletions pkg/client/clientset/controller-versioned/typed/v1/appwrapper.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ limitations under the License.
package v1

import (
"context"

v1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/client/clientset/controller-versioned/scheme"

Expand Down Expand Up @@ -58,7 +60,7 @@ func (c *appwrappers) Create(appwrapper *v1.AppWrapper) (result *v1.AppWrapper,
Namespace(c.ns).
Resource(v1.AppWrapperPlural).
Body(appwrapper).
Do().
Do(context.Background()).
Into(result)
return
}
Expand All @@ -71,7 +73,7 @@ func (c *appwrappers) Update(appwrapper *v1.AppWrapper) (result *v1.AppWrapper,
Resource(v1.AppWrapperPlural).
Name(appwrapper.Name).
Body(appwrapper).
Do().
Do(context.Background()).
Into(result)
return
}
Expand All @@ -87,7 +89,7 @@ func (c *appwrappers) UpdateStatus(appwrapper *v1.AppWrapper) (result *v1.AppWra
Name(appwrapper.Name).
SubResource("status").
Body(appwrapper).
Do().
Do(context.Background()).
Into(result)
return
}
Expand All @@ -99,7 +101,7 @@ func (c *appwrappers) Delete(name string, options *meta_v1.DeleteOptions) error
Resource(v1.AppWrapperPlural).
Name(name).
Body(options).
Do().
Do(context.Background()).
Error()
}

Expand All @@ -111,7 +113,7 @@ func (c *appwrappers) Get(name string, options meta_v1.GetOptions) (result *v1.A
Resource(v1.AppWrapperPlural).
Name(name).
VersionedParams(&options, scheme.ParameterCodec).
Do().
Do(context.Background()).
Into(result)
return
}
Expand All @@ -123,7 +125,7 @@ func (c *appwrappers) List(opts meta_v1.ListOptions) (result *v1.AppWrapperList,
Namespace(c.ns).
Resource(v1.AppWrapperPlural).
VersionedParams(&opts, scheme.ParameterCodec).
Do().
Do(context.Background()).
Into(result)
return
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func setConfigDefaults(config *rest.Config) error {
config.GroupVersion = &v1.SchemeGroupVersion
config.APIPath = "/apis"
config.ContentType = runtime.ContentTypeJSON
config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: serializer.NewCodecFactory(scheme)}
config.NegotiatedSerializer = serializer.WithoutConversionCodecFactory{CodecFactory: serializer.NewCodecFactory(scheme)} // serializer.DirectCodecFactory{CodecFactory: serializer.NewCodecFactory(scheme)}

return nil
}
Expand Down
14 changes: 8 additions & 6 deletions pkg/client/clientset/controller-versioned/typed/v1/queuejob.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ limitations under the License.
package v1

import (
"context"

v1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/client/clientset/controller-versioned/scheme"

Expand Down Expand Up @@ -58,7 +60,7 @@ func (c *queuejobs) Create(queuejob *v1.QueueJob) (result *v1.QueueJob, err erro
Namespace(c.ns).
Resource(v1.QueueJobPlural).
Body(queuejob).
Do().
Do(context.Background()).
Into(result)
return
}
Expand All @@ -71,7 +73,7 @@ func (c *queuejobs) Update(queuejob *v1.QueueJob) (result *v1.QueueJob, err erro
Resource(v1.QueueJobPlural).
Name(queuejob.Name).
Body(queuejob).
Do().
Do(context.Background()).
Into(result)
return
}
Expand All @@ -87,7 +89,7 @@ func (c *queuejobs) UpdateStatus(queuejob *v1.QueueJob) (result *v1.QueueJob, er
Name(queuejob.Name).
SubResource("status").
Body(queuejob).
Do().
Do(context.Background()).
Into(result)
return
}
Expand All @@ -99,7 +101,7 @@ func (c *queuejobs) Delete(name string, options *meta_v1.DeleteOptions) error {
Resource(v1.QueueJobPlural).
Name(name).
Body(options).
Do().
Do(context.Background()).
Error()
}

Expand All @@ -111,7 +113,7 @@ func (c *queuejobs) Get(name string, options meta_v1.GetOptions) (result *v1.Que
Resource(v1.QueueJobPlural).
Name(name).
VersionedParams(&options, scheme.ParameterCodec).
Do().
Do(context.Background()).
Into(result)
return
}
Expand All @@ -123,7 +125,7 @@ func (c *queuejobs) List(opts meta_v1.ListOptions) (result *v1.QueueJobList, err
Namespace(c.ns).
Resource(v1.QueueJobPlural).
VersionedParams(&opts, scheme.ParameterCodec).
Do().
Do(context.Background()).
Into(result)
return
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ limitations under the License.
package v1

import (
"context"

v1 "github.com/IBM/multi-cluster-app-dispatcher/pkg/apis/controller/v1alpha1"
"github.com/IBM/multi-cluster-app-dispatcher/pkg/client/clientset/controller-versioned/scheme"

Expand Down Expand Up @@ -58,7 +60,7 @@ func (c *schedulingSpecs) Create(queue *v1.SchedulingSpec) (result *v1.Schedulin
Namespace(c.ns).
Resource(v1.SchedulingSpecPlural).
Body(queue).
Do().
Do(context.Background()).
Into(result)
return
}
Expand All @@ -71,7 +73,7 @@ func (c *schedulingSpecs) Update(queue *v1.SchedulingSpec) (result *v1.Schedulin
Resource(v1.SchedulingSpecPlural).
Name(queue.Name).
Body(queue).
Do().
Do(context.Background()).
Into(result)
return
}
Expand All @@ -87,7 +89,7 @@ func (c *schedulingSpecs) UpdateStatus(queue *v1.SchedulingSpec) (result *v1.Sch
Name(queue.Name).
SubResource("status").
Body(queue).
Do().
Do(context.Background()).
Into(result)
return
}
Expand All @@ -99,7 +101,7 @@ func (c *schedulingSpecs) Delete(name string, options *meta_v1.DeleteOptions) er
Resource(v1.SchedulingSpecPlural).
Name(name).
Body(options).
Do().
Do(context.Background()).
Error()
}

Expand All @@ -111,7 +113,7 @@ func (c *schedulingSpecs) Get(name string, options meta_v1.GetOptions) (result *
Resource(v1.SchedulingSpecPlural).
Name(name).
VersionedParams(&options, scheme.ParameterCodec).
Do().
Do(context.Background()).
Into(result)
return
}
Expand All @@ -123,7 +125,7 @@ func (c *schedulingSpecs) List(opts meta_v1.ListOptions) (result *v1.SchedulingS
Namespace(c.ns).
Resource(v1.SchedulingSpecPlural).
VersionedParams(&opts, scheme.ParameterCodec).
Do().
Do(context.Background()).
Into(result)
return
}
2 changes: 1 addition & 1 deletion pkg/controller/metrics/dynamicmapper/fake_discovery.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"

swagger "github.com/emicklei/go-restful-swagger12"
openapi_v2 "github.com/googleapis/gnostic/openapiv2" // Nhan edited
openapi_v2 "github.com/googleapis/gnostic/openapiv2" // fix case sensitive
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down
3 changes: 2 additions & 1 deletion pkg/controller/metrics/provider/helpers/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package helpers

import (
"context"
"fmt"

apimeta "k8s.io/apimachinery/pkg/api/meta"
Expand Down Expand Up @@ -83,7 +84,7 @@ func ListObjectNames(mapper apimeta.RESTMapper, client dynamic.Interface, namesp
resClient = client.Resource(res)
}

matchingObjectsRaw, err := resClient.List(metav1.ListOptions{LabelSelector: selector.String()})
matchingObjectsRaw, err := resClient.List(context.Background(), metav1.ListOptions{LabelSelector: selector.String()})
if err != nil {
return nil, err
}
Expand Down
Loading