Final fixes

Author: Nhan-T-Hoang

go.mod

@@ -3,12 +3,17 @@ module github.com/IBM/multi-cluster-app-dispatcher
 go 1.16
 
 require (
-github.com/googleapis/gnostic v0.4.1 // indirect
-github.com/spf13/pflag v1.0.5 // indirect
-k8s.io/api v0.21.0 // indirect
-k8s.io/apimachinery v0.21.0 // indirect
-k8s.io/client-go v0.21.0 // indirect
-k8s.io/metrics v0.21.0 // indirect
+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
+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/metrics v0.21.0
 )
 
 replace (

pkg/controller/metrics/apiserver/installer/installer.go

@@ -18,12 +18,13 @@ package installer
 
 import (
 "fmt"
-"github.com/golang/glog"
 gpath "path"
 "reflect"
 "strings"
 "time"
 
+"github.com/golang/glog"
+
 "k8s.io/apimachinery/pkg/conversion"
 "k8s.io/apimachinery/pkg/runtime"
 "k8s.io/apimachinery/pkg/runtime/schema"
@@ -287,6 +288,6 @@ func restfulListResource(r rest.Lister, rw rest.Watcher, scope handlers.RequestS
 glog.Infof("Entered restfulListResource()")
 glog.Infof("restfulListResource(): restLister=%v, scope=%v", r, scope)
 return func(req *restful.Request, res *restful.Response) {
-handlers.ListResource(r, rw, scope, forceWatch, minRequestTimeout)(res.ResponseWriter, req.Request)
+handlers.ListResource(r, rw, &scope, forceWatch, minRequestTimeout)(res.ResponseWriter, req.Request)
 }
 }

pkg/controller/metrics/registry/custom_metrics/reststorage.go

@@ -19,6 +19,7 @@ package apiserver
 import (
 "context"
 "fmt"
+
 "github.com/golang/glog"
 
 "github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/provider"
@@ -38,7 +39,8 @@ type REST struct {
 }
 
 var _ rest.Storage = &REST{}
-var _ rest.Lister = &REST{}
+
+// var _ rest.Lister = &REST{}
 
 func NewREST(cmProvider provider.CustomMetricsProvider) *REST {
 return &REST{

pkg/controller/metrics/registry/external_metrics/reststorage.go

@@ -19,8 +19,9 @@ package apiserver
 import (
 "context"
 "fmt"
-"github.com/golang/glog"
+
 "github.com/IBM/multi-cluster-app-dispatcher/pkg/controller/metrics/provider"
+"github.com/golang/glog"
 metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
 "k8s.io/apimachinery/pkg/labels"
 "k8s.io/apimachinery/pkg/runtime"
@@ -37,7 +38,8 @@ type REST struct {
 }
 
 var _ rest.Storage = &REST{}
-var _ rest.Lister = &REST{}
+
+// var _ rest.Lister = &REST{}
 
 // NewREST returns new REST object for provided CustomMetricsProvider.
 func NewREST(emProvider provider.ExternalMetricsProvider) *REST {

pkg/controller/queuejob/queuejob_controller.go

@@ -17,13 +17,14 @@ limitations under the License.
 package queuejob
 
 import (
+"context"
 "fmt"
 "sync"
 "time"
 
 "github.com/golang/glog"
 
-"k8s.io/api/core/v1"
+v1 "k8s.io/api/core/v1"
 apierrors "k8s.io/apimachinery/pkg/api/errors"
 "k8s.io/apimachinery/pkg/api/meta"
 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -374,7 +375,11 @@ func (cc *Controller) manageQueueJob(qj *arbv1.QueueJob, pods map[string][]*v1.P
 go func(ix int32) {
 defer wait.Done()
 newPod := createQueueJobPod(qj, &ts.Template, ix)
-_, err := cc.clients.Core().Pods(newPod.Namespace).Create(newPod)
+_, err := cc.clients.CoreV1().Pods(newPod.Namespace).Create(context.Background(), newPod, metav1.CreateOptions{
+TypeMeta: metav1.TypeMeta{},
+DryRun: []string{},
+FieldManager: "",
+})
 if err != nil {
 // Failed to create Pod, wait a moment and then create it again
 // This is to ensure all pods under the same QueueJob created

pkg/controller/queuejobresources/genericresource/genericresource.go

@@ -70,7 +70,7 @@ func join(strs ...string) string {
 }
 
 func (gr *GenericResources) SyncQueueJob(aw *arbv1.AppWrapper, awr *arbv1.AppWrapperGenericResource) (podList []*v1.Pod, err error) {
-
+var unstruct unstructured.Unstructured
 startTime := time.Now()
 defer func() {
 glog.V(4).Infof("Finished syncing AppWrapper job resource %s (%v)", aw.Name, time.Now().Sub(startTime))
@@ -86,8 +86,8 @@ func (gr *GenericResources) SyncQueueJob(aw *arbv1.AppWrapper, awr *arbv1.AppWra
 }
 ext := awr.GenericTemplate
 restmapper := restmapper.NewDiscoveryRESTMapper(apigroups)
-versions := &runtime.VersionedObjects{}
-_, gvk, err := unstructured.UnstructuredJSONScheme.Decode(ext.Raw, nil, versions)
+// versions := &runtime.VersionedObjects{}
+_, gvk, err := unstructured.UnstructuredJSONScheme.Decode(ext.Raw, nil, &unstruct)
 if err != nil {
 glog.Errorf("Decoding error, please check your CR! Aborting handling the resource creation, err: `%v`", err)
 return []*v1.Pod{}, err
@@ -125,7 +125,7 @@ func (gr *GenericResources) SyncQueueJob(aw *arbv1.AppWrapper, awr *arbv1.AppWra
 }
 }
 }
-var unstruct unstructured.Unstructured
+// var unstruct unstructured.Unstructured
 unstruct.Object = make(map[string]interface{})
 var blob interface{}
 if err = json.Unmarshal(ext.Raw, &blob); err != nil {

pkg/controller/queuejobresources/pod/pod.go

@@ -299,7 +299,7 @@ func (qjrPod *QueueJobResPod) manageQueueJob(qj *arbv1.AppWrapper, pods []*v1.Po
 glog.Errorf("Failed to create a pod for Job %s, error: %#v.", qj.Name, err)
 errs = append(errs, err)
 } else {
-_, err := qjrPod.clients.CoreV1().Pods(newPod.Namespace).Create(context.Context, newPod, metav1.CreateOptions{})
+_, err := qjrPod.clients.CoreV1().Pods(newPod.Namespace).Create(context.Background(), newPod, metav1.CreateOptions{})
 if err != nil {
 // Failed to create Pod, wait a moment and then create it again
 // This is to ensure all pods under the same QueueJob created
@@ -395,7 +395,7 @@ func (qjrPod *QueueJobResPod) manageQueueJobPods(activePods []*v1.Pod, succeeded
 newPod.Name, qj.Name, err)
 } else {
 for {
-_, err := qjrPod.clients.CoreV1().Pods(newPod.Namespace).Create(context.Context, newPod, metav1.CreateOptions{})
+_, err := qjrPod.clients.CoreV1().Pods(newPod.Namespace).Create(context.Background(), newPod, metav1.CreateOptions{})
 if err == nil {
 // Create Pod successfully
 break