Merge pull request #43 in DEV/k8s-argus from DEV-58267-change-deployment-client-to-apps-v1-apps-v1betv2-is-no-more-could-not-list-deployments to feature/upgrade

* commit '753ff7ac22ea8517204025937da6f7acc494f207':
  DEV-58267:  updated v1betv2 client to v1 for deployment watcher.

Author: lmvaibhavk

pkg/argus.go

@@ -208,6 +208,8 @@ func getK8sRESTClient(clientset *kubernetes.Clientset, apiVersion string) rest.I
 		return clientset.CoreV1().RESTClient()
 	case constants.K8sAPIVersionAppsV1beta2:
 		return clientset.AppsV1beta2().RESTClient()
+	case constants.K8sAPIVersionAppsV1:
+		return clientset.AppsV1().RESTClient()
 	default:
 		return clientset.CoreV1().RESTClient()
 	}

pkg/constants/constants.go

@@ -101,4 +101,6 @@ const (
 	K8sAPIVersionAppsV1beta1 = "apps/v1beta1"
 	// K8sAPIVersionAppsV1beta2 is the version 'apps/v1beta2' of k8s api
 	K8sAPIVersionAppsV1beta2 = "apps/v1beta2"
+	// K8sAPIVersionAppsV1 is the version 'apps/v1' of k8s api
+	K8sAPIVersionAppsV1 = "apps/v1"
 )

pkg/permission/permission.go

@@ -26,7 +26,7 @@ func HasDeploymentPermissions() bool {
 	if deploymentPermissionFlag != nil {
 		return *deploymentPermissionFlag
 	}
-	_, err := client.AppsV1beta2().Deployments(v1.NamespaceAll).List(metav1.ListOptions{})
+	_, err := client.AppsV1().Deployments(v1.NamespaceAll).List(metav1.ListOptions{})
 	if err != nil {
 		deploymentPermissionFlag = &disable
 		log.Errorf("Failed to list deployments: %+v", err)

pkg/watch/deployment/deployment.go

@@ -10,7 +10,7 @@ import (
 	"github.com/logicmonitor/k8s-argus/pkg/permission"
 	"github.com/logicmonitor/k8s-argus/pkg/types"
 	log "github.com/sirupsen/logrus"
-	"k8s.io/api/apps/v1beta2"
+	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes"
@@ -27,7 +27,7 @@ type Watcher struct {
 
 // APIVersion is a function that implements the Watcher interface.
 func (w *Watcher) APIVersion() string {
-	return constants.K8sAPIVersionAppsV1beta2
+	return constants.K8sAPIVersionAppsV1
 }
 
 // Enabled is a function that check the resource can watch.
@@ -42,13 +42,13 @@ func (w *Watcher) Resource() string {
 
 // ObjType is a function that implements the Watcher interface.
 func (w *Watcher) ObjType() runtime.Object {
-	return &v1beta2.Deployment{}
+	return &appsv1.Deployment{}
 }
 
 // AddFunc is a function that implements the Watcher interface.
 func (w *Watcher) AddFunc() func(obj interface{}) {
 	return func(obj interface{}) {
-		deployment := obj.(*v1beta2.Deployment)
+		deployment := obj.(*appsv1.Deployment)
 		log.Infof("Handling add deployment event: %s", deployment.Name)
 		w.add(deployment)
 	}
@@ -57,8 +57,8 @@ func (w *Watcher) AddFunc() func(obj interface{}) {
 // UpdateFunc is a function that implements the Watcher interface.
 func (w *Watcher) UpdateFunc() func(oldObj, newObj interface{}) {
 	return func(oldObj, newObj interface{}) {
-		old := oldObj.(*v1beta2.Deployment)
-		new := newObj.(*v1beta2.Deployment)
+		old := oldObj.(*appsv1.Deployment)
+		new := newObj.(*appsv1.Deployment)
 
 		w.update(old, new)
 	}
@@ -67,7 +67,7 @@ func (w *Watcher) UpdateFunc() func(oldObj, newObj interface{}) {
 // DeleteFunc is a function that implements the Watcher interface.
 func (w *Watcher) DeleteFunc() func(obj interface{}) {
 	return func(obj interface{}) {
-		deployment := obj.(*v1beta2.Deployment)
+		deployment := obj.(*appsv1.Deployment)
 		log.Debugf("Handling delete deployment event: %s", deployment.Name)
 		// Delete the deployment.
 		if w.Config().DeleteDevices {
@@ -85,7 +85,7 @@ func (w *Watcher) DeleteFunc() func(obj interface{}) {
 }
 
 // nolint: dupl
-func (w *Watcher) add(deployment *v1beta2.Deployment) {
+func (w *Watcher) add(deployment *appsv1.Deployment) {
 	if _, err := w.Add(
 		w.args(deployment, constants.DeploymentCategory)...,
 	); err != nil {
@@ -95,7 +95,7 @@ func (w *Watcher) add(deployment *v1beta2.Deployment) {
 	log.Infof("Added deployment %q", fmtDeploymentDisplayName(deployment))
 }
 
-func (w *Watcher) update(old, new *v1beta2.Deployment) {
+func (w *Watcher) update(old, new *appsv1.Deployment) {
 	if _, err := w.UpdateAndReplaceByDisplayName(
 		fmtDeploymentDisplayName(old),
 		w.args(new, constants.DeploymentCategory)...,
@@ -106,15 +106,15 @@ func (w *Watcher) update(old, new *v1beta2.Deployment) {
 	log.Infof("Updated deployment %q", fmtDeploymentDisplayName(old))
 }
 
-func (w *Watcher) move(deployment *v1beta2.Deployment) {
+func (w *Watcher) move(deployment *appsv1.Deployment) {
 	if _, err := w.UpdateAndReplaceFieldByDisplayName(fmtDeploymentDisplayName(deployment), constants.CustomPropertiesFieldName, w.args(deployment, constants.DeploymentDeletedCategory)...); err != nil {
 		log.Errorf("Failed to move deployment %q: %v", fmtDeploymentDisplayName(deployment), err)
 		return
 	}
 	log.Infof("Moved deployment %q", fmtDeploymentDisplayName(deployment))
 }
 
-func (w *Watcher) args(deployment *v1beta2.Deployment, category string) []types.DeviceOption {
+func (w *Watcher) args(deployment *appsv1.Deployment, category string) []types.DeviceOption {
 	return []types.DeviceOption{
 		w.Name(deployment.Name),
 		w.ResourceLabels(deployment.Labels),
@@ -130,14 +130,14 @@ func (w *Watcher) args(deployment *v1beta2.Deployment, category string) []types.
 }
 
 // fmtDeploymentDisplayName implements the conversion for the deployment display name
-func fmtDeploymentDisplayName(deployment *v1beta2.Deployment) string {
+func fmtDeploymentDisplayName(deployment *appsv1.Deployment) string {
 	return fmt.Sprintf("%s.%s.deploy-%s", deployment.Name, deployment.Namespace, string(deployment.UID))
 }
 
 // GetDeploymentsMap implements the getting deployments map info from k8s
 func GetDeploymentsMap(k8sClient *kubernetes.Clientset, namespace string) (map[string]string, error) {
 	deploymentsMap := make(map[string]string)
-	deploymentList, err := k8sClient.AppsV1beta2().Deployments(namespace).List(v1.ListOptions{})
+	deploymentList, err := k8sClient.AppsV1().Deployments(namespace).List(v1.ListOptions{})
 	if err != nil || deploymentList == nil {
 		log.Warnf("Failed to get the deployments from k8s")
 		return nil, err