Merge pull request vmware#40 from jwsui/update-dependency

update dependency and golang

build/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.13 as antrea-operator-build
+FROM golang:1.16 as antrea-operator-build
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

controllers/antreainstall_controller.go

@@ -357,7 +357,7 @@ func (r *AntreaInstallReconciler) SetupWithManager(mgr ctrl.Manager) error {
 // +kubebuilder:rbac:urls=/agentinfo;/addressgroups;/appliedtogroups;/networkpolicies;/ovsflows;/ovstracing;/podinterfaces,verbs=get
 // +kubebuilder:rbac:groups=security.openshift.io,resources=securitycontextconstraints,resourceNames=hostnetwork,verbs=use
 
-func (r *AntreaInstallReconciler) Reconcile(request ctrl.Request) (reconcile.Result, error) {
+func (r *AntreaInstallReconciler) Reconcile(cxt context.Context, request ctrl.Request) (reconcile.Result, error) {
 	return r.Adaptor.Reconcile(r, request)
 }
 

controllers/pod_controller.go

@@ -49,7 +49,7 @@ func (r *PodReconciler) SetupWithManager(mgr ctrl.Manager) error {
 }
 
 // Reconcile updates the ClusterOperator.Status to match the current state of the watched Deployments/DaemonSets
-func (r *PodReconciler) Reconcile(request reconcile.Request) (reconcile.Result, error) {
+func (r *PodReconciler) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
 	reqLogger := r.Log.WithValues("Request.Namespace", request.Namespace, "Request.Name", request.Name)
 	reqLogger.Info("Reconciling pod update")
 
@@ -82,7 +82,7 @@ func (r *PodReconciler) isAntreaResource(request *reconcile.Request) bool {
 func (r *PodReconciler) recreateResourceIfNotExist(request *reconcile.Request) error {
 	r.SharedInfo.Lock()
 	defer r.SharedInfo.Unlock()
-	var curObject runtime.Object
+	var curObject client.Object
 	var objectSpec *uns.Unstructured
 	if request.Name == r.SharedInfo.AntreaAgentDaemonSetSpec.GetName() && request.Namespace == r.SharedInfo.AntreaAgentDaemonSetSpec.GetNamespace() {
 		curObject = &appsv1.DaemonSet{}

go.mod

@@ -1,20 +1,25 @@
 module github.com/vmware/antrea-operator-for-kubernetes
 
-go 1.13
+go 1.16
 
 require (
 	github.com/containerd/go-cni v1.0.1
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
-	github.com/go-logr/logr v0.1.0
-	github.com/onsi/gomega v1.10.1
-	github.com/openshift/api v0.0.0-20200701144905-de5b010b2b38
-	github.com/openshift/cluster-network-operator v0.0.0-20200820075439-92e466db53cc
-	github.com/openshift/library-go v0.0.0-20200630145007-34ebc8778b33
-	gopkg.in/yaml.v2 v2.3.0
-	k8s.io/api v0.18.6
-	k8s.io/apimachinery v0.18.6
-	k8s.io/client-go v12.0.0+incompatible
-	sigs.k8s.io/controller-runtime v0.6.3
+	github.com/go-logr/logr v0.4.0
+	github.com/onsi/gomega v1.13.0
+	github.com/openshift/api v0.0.0-20211203184245-fb6f933bb8d5
+	github.com/openshift/cluster-network-operator v0.0.0-20220125073742-83efd7f8d510
+	github.com/openshift/library-go v0.0.0-20210708173104-7e7d216ed91c
+	gopkg.in/yaml.v2 v2.4.0
+	k8s.io/api v0.22.1
+	k8s.io/apimachinery v0.22.1
+	k8s.io/client-go v0.22.1
+	sigs.k8s.io/controller-runtime v0.9.0-beta.0
 )
 
-replace k8s.io/client-go => k8s.io/client-go v0.18.6
+replace (
+	github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt v3.2.1+incompatible
+	sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20201125052318-b85a18cbf338
+	sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20201130182513-88b90230f2a4
+	sigs.k8s.io/cluster-api-provider-openstack => github.com/openshift/cluster-api-provider-openstack v0.0.0-20210107201226-5f60693f7a71
+)