From 6bae7d6e0110dcb57cd48e813d1dbaf4fe1c9293 Mon Sep 17 00:00:00 2001 From: Dileep Ranganathan Date: Sat, 10 Aug 2019 16:53:06 -0700 Subject: Upgraded Daemonset apiversion to apps/v1 Upgraded Daemonset apiversion to apps/v1 Issue-ID: ONAPARC-461 Signed-off-by: Dileep Ranganathan Change-Id: I6cf5d355808fb0c86bfb469018ae570c6f7465f7 --- .../pkg/controller/collectdglobal/collectdglobal_controller.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdglobal/collectdglobal_controller.go') diff --git a/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdglobal/collectdglobal_controller.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdglobal/collectdglobal_controller.go index 539b680d..0c4064e7 100644 --- a/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdglobal/collectdglobal_controller.go +++ b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdglobal/collectdglobal_controller.go @@ -16,7 +16,6 @@ import ( appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" - extensionsv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" @@ -191,7 +190,7 @@ func (r *ReconcileCollectdGlobal) handleCollectdGlobal(reqLogger logr.Logger, cr // Retrieve the latest version of Daemonset before attempting update // RetryOnConflict uses exponential backoff to avoid exhausting the apiserver // Select DaemonSets with label - dsList := &extensionsv1beta1.DaemonSetList{} + dsList := &appsv1.DaemonSetList{} opts := &client.ListOptions{} labelSelector, err := collectdutils.GetWatchLabels() if err != nil { @@ -312,7 +311,7 @@ func (r *ReconcileCollectdGlobal) addFinalizer(reqLogger logr.Logger, cr *onapv1 return nil } -func (r *ReconcileCollectdGlobal) handleTypesDB(reqLogger logr.Logger, cr *onapv1alpha1.CollectdGlobal, ds *extensionsv1beta1.DaemonSet, isDelete bool) error { +func (r *ReconcileCollectdGlobal) handleTypesDB(reqLogger logr.Logger, cr *onapv1alpha1.CollectdGlobal, ds *appsv1.DaemonSet, isDelete bool) error { if isDelete || cr.Spec.ConfigMap == "" { dsutils.RemoveTypesDB(ds) return nil -- cgit 1.2.3-korg