diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 3f17e48..9be64bc 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -28,7 +28,7 @@ import ( // to ensure that exec-entrypoint and run can make use of them. _ "k8s.io/client-go/plugin/pkg/client/auth" - api "github.com/openebs/jiva-operator/pkg/apis/openebs/v1" + jivaAPI "github.com/openebs/jiva-operator/pkg/apis/openebs/v1" "github.com/openebs/jiva-operator/pkg/controllers" "github.com/openebs/jiva-operator/version" "github.com/sirupsen/logrus" @@ -48,7 +48,7 @@ var ( func init() { utilruntime.Must(clientgoscheme.AddToScheme(scheme)) - utilruntime.Must(api.AddToScheme(scheme)) + utilruntime.Must(jivaAPI.AddToScheme(scheme)) // +kubebuilder:scaffold:scheme } diff --git a/pkg/apis/addtoscheme_openebs_v1.go b/pkg/apis/addtoscheme_openebs_v1.go index 3d36594..eec905a 100644 --- a/pkg/apis/addtoscheme_openebs_v1.go +++ b/pkg/apis/addtoscheme_openebs_v1.go @@ -17,10 +17,10 @@ limitations under the License. package apis import ( - api "github.com/openebs/jiva-operator/pkg/apis/openebs/v1" + jivaAPI "github.com/openebs/jiva-operator/pkg/apis/openebs/v1" ) func init() { // Register the types with the Scheme so the components can map objects to GroupVersionKinds and back - AddToSchemes = append(AddToSchemes, api.SchemeBuilder.AddToScheme) + AddToSchemes = append(AddToSchemes, jivaAPI.SchemeBuilder.AddToScheme) } diff --git a/pkg/controllers/jivavolume_controller.go b/pkg/controllers/jivavolume_controller.go index d3a5ce9..d0eb3e6 100644 --- a/pkg/controllers/jivavolume_controller.go +++ b/pkg/controllers/jivavolume_controller.go @@ -54,7 +54,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/reconcile" - api "github.com/openebs/jiva-operator/pkg/apis/openebs/v1" + jivaAPI "github.com/openebs/jiva-operator/pkg/apis/openebs/v1" ) // JivaVolumeReconciler reconciles a JivaVolume object @@ -65,11 +65,11 @@ type JivaVolumeReconciler struct { } type upgradeParams struct { - j *api.JivaVolume + j *jivaAPI.JivaVolume client client.Client } -type upgradeFunc func(u *upgradeParams) (*api.JivaVolume, error) +type upgradeFunc func(u *upgradeParams) (*jivaAPI.JivaVolume, error) var ( upgradeMap = map[string]upgradeFunc{} @@ -86,10 +86,10 @@ const ( openebsPVC = "openebs.io/persistent-volume-claim" ) -type policyOptFuncs func(*api.JivaVolumePolicySpec, api.JivaVolumePolicySpec) +type policyOptFuncs func(*jivaAPI.JivaVolumePolicySpec, jivaAPI.JivaVolumePolicySpec) var ( - installFuncs = []func(r *JivaVolumeReconciler, cr *api.JivaVolume) error{ + installFuncs = []func(r *JivaVolumeReconciler, cr *jivaAPI.JivaVolume) error{ populateJivaVolumePolicy, createControllerService, createControllerDeployment, @@ -118,7 +118,7 @@ var ( func (r *JivaVolumeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { // Fetch the JivaVolume instance - instance := &api.JivaVolume{} + instance := &jivaAPI.JivaVolume{} err := r.Get(context.TODO(), req.NamespacedName, instance) if err != nil { if errors.IsNotFound(err) { @@ -156,7 +156,7 @@ func (r *JivaVolumeReconciler) Reconcile(ctx context.Context, req ctrl.Request) // depends upon the error. If bootstrap is successful it will set the Phase // to syncing which will be changed to Ready later when volume becomes RW switch instance.Status.Phase { - case api.JivaVolumePhaseReady: + case jivaAPI.JivaVolumePhaseReady: // fetching the latest status before performing // other operations err = r.getAndUpdateVolumeStatus(instance) @@ -181,12 +181,12 @@ func (r *JivaVolumeReconciler) Reconcile(ctx context.Context, req ctrl.Request) instance.Name, err.Error()) } return reconcile.Result{}, nil - case api.JivaVolumePhaseSyncing, api.JivaVolumePhaseUnkown: + case jivaAPI.JivaVolumePhaseSyncing, jivaAPI.JivaVolumePhaseUnkown: return reconcile.Result{}, r.getAndUpdateVolumeStatus(instance) - case api.JivaVolumePhaseDeleting: + case jivaAPI.JivaVolumePhaseDeleting: logrus.Info("start tearing down jiva components", "JivaVolume: ", instance.Name) return reconcile.Result{}, nil - case "", api.JivaVolumePhasePending, api.JivaVolumePhaseFailed: + case "", jivaAPI.JivaVolumePhasePending, jivaAPI.JivaVolumePhaseFailed: if ok { logrus.Info("start bootstraping jiva components", "JivaVolume: ", instance.Name) return reconcile.Result{}, r.bootstrapJiva(instance) @@ -196,7 +196,7 @@ func (r *JivaVolumeReconciler) Reconcile(ctx context.Context, req ctrl.Request) return reconcile.Result{}, nil } -func (r *JivaVolumeReconciler) updatePodIPMap(cr *api.JivaVolume) error { +func (r *JivaVolumeReconciler) updatePodIPMap(cr *jivaAPI.JivaVolume) error { var ( controllerLabel = "openebs.io/component=jiva-controller,openebs.io/persistent-volume=" ) @@ -245,7 +245,7 @@ func isNodeReady(node *corev1.Node) bool { return false } -func (r *JivaVolumeReconciler) isScaleup(cr *api.JivaVolume) bool { +func (r *JivaVolumeReconciler) isScaleup(cr *jivaAPI.JivaVolume) bool { if cr.Spec.DesiredReplicationFactor > cr.Spec.Policy.Target.ReplicationFactor { if cr.Spec.Policy.Target.ReplicationFactor != cr.Status.ReplicaCount { r.Recorder.Eventf(cr, corev1.EventTypeWarning, @@ -278,7 +278,7 @@ func (r *JivaVolumeReconciler) isScaleup(cr *api.JivaVolume) bool { // isHAVolume checks if the volume has atleast // qurom number of replicas in RW state -func isHAVolume(cr *api.JivaVolume) bool { +func isHAVolume(cr *jivaAPI.JivaVolume) bool { if cr.Spec.Policy.Target.ReplicationFactor < 3 { return false } @@ -295,7 +295,7 @@ func isHAVolume(cr *api.JivaVolume) bool { return false } -func (r *JivaVolumeReconciler) moveReplicasForMissingNodes(cr *api.JivaVolume) error { +func (r *JivaVolumeReconciler) moveReplicasForMissingNodes(cr *jivaAPI.JivaVolume) error { // if the volume does not HA replicas in // RW mode skip the process @@ -432,19 +432,19 @@ func (r *JivaVolumeReconciler) SetupWithManager(mgr ctrl.Manager) error { return err } return ctrl.NewControllerManagedBy(mgr). - For(&api.JivaVolume{}). + For(&jivaAPI.JivaVolume{}). Owns(&appsv1.Deployment{}). Owns(&corev1.Service{}). Owns(&appsv1.StatefulSet{}). Complete(r) } -func (r *JivaVolumeReconciler) finally(err error, cr *api.JivaVolume) { +func (r *JivaVolumeReconciler) finally(err error, cr *jivaAPI.JivaVolume) { if err != nil { - cr.Status.Phase = api.JivaVolumePhaseFailed + cr.Status.Phase = jivaAPI.JivaVolumePhaseFailed logrus.Errorf("failed to bootstrap volume %s, due to error: %v", cr.Name, err) } else { - cr.Status.Phase = api.JivaVolumePhaseSyncing + cr.Status.Phase = jivaAPI.JivaVolumePhaseSyncing } if err := r.updateJivaVolume(cr); err != nil { @@ -452,7 +452,7 @@ func (r *JivaVolumeReconciler) finally(err error, cr *api.JivaVolume) { } } -func (r *JivaVolumeReconciler) shouldReconcile(cr *api.JivaVolume) (bool, error) { +func (r *JivaVolumeReconciler) shouldReconcile(cr *jivaAPI.JivaVolume) (bool, error) { operatorVersion := version.Version jivaVolumeVersion := cr.VersionDetails.Status.Current @@ -467,7 +467,7 @@ func (r *JivaVolumeReconciler) shouldReconcile(cr *api.JivaVolume) (bool, error) // 1. Create controller svc // 2. Create controller deploy // 3. Create replica statefulset -func (r *JivaVolumeReconciler) bootstrapJiva(cr *api.JivaVolume) (err error) { +func (r *JivaVolumeReconciler) bootstrapJiva(cr *jivaAPI.JivaVolume) (err error) { for _, f := range installFuncs { if err = f(r, cr); err != nil { r.Recorder.Eventf(cr, corev1.EventTypeWarning, @@ -480,7 +480,7 @@ func (r *JivaVolumeReconciler) bootstrapJiva(cr *api.JivaVolume) (err error) { } // TODO: add logic to create disruption budget for replicas -func createReplicaPodDisruptionBudget(r *JivaVolumeReconciler, cr *api.JivaVolume) error { +func createReplicaPodDisruptionBudget(r *JivaVolumeReconciler, cr *jivaAPI.JivaVolume) error { min := cr.Spec.Policy.Target.ReplicationFactor pdbObj := &policyv1beta1.PodDisruptionBudget{ TypeMeta: metav1.TypeMeta{ @@ -524,7 +524,7 @@ func createReplicaPodDisruptionBudget(r *JivaVolumeReconciler, cr *api.JivaVolum return nil } -func (r *JivaVolumeReconciler) performScaleup(cr *api.JivaVolume) error { +func (r *JivaVolumeReconciler) performScaleup(cr *jivaAPI.JivaVolume) error { // update the replica sts with the desired replica count // this will bring a new hostpath pvc on a new node and a // new pod @@ -563,14 +563,14 @@ func (r *JivaVolumeReconciler) performScaleup(cr *api.JivaVolume) error { } cr.Spec.Policy.Target.ReplicationFactor = int(desiredReplicas) - cr.Status.Phase = api.JivaVolumePhaseSyncing + cr.Status.Phase = jivaAPI.JivaVolumePhaseSyncing if err := r.updateJivaVolume(cr); err != nil { return fmt.Errorf("failed to update JivaVolume phase: %s", err.Error()) } return nil } -func createControllerDeployment(r *JivaVolumeReconciler, cr *api.JivaVolume) error { +func createControllerDeployment(r *JivaVolumeReconciler, cr *jivaAPI.JivaVolume) error { reps := int32(1) dep, err := deploy.NewBuilder().WithName(cr.Name + "-jiva-ctrl"). @@ -783,7 +783,7 @@ func defaultServiceLabels(pv string) map[string]string { } } -func createReplicaStatefulSet(r *JivaVolumeReconciler, cr *api.JivaVolume) error { +func createReplicaStatefulSet(r *JivaVolumeReconciler, cr *jivaAPI.JivaVolume) error { var ( err error @@ -950,7 +950,7 @@ func createReplicaStatefulSet(r *JivaVolumeReconciler, cr *api.JivaVolume) error return nil } -func updateJivaVolumeWithServiceInfo(r *JivaVolumeReconciler, cr *api.JivaVolume) error { +func updateJivaVolumeWithServiceInfo(r *JivaVolumeReconciler, cr *jivaAPI.JivaVolume) error { ctrlSVC := &corev1.Service{} if err := r.Get(context.TODO(), types.NamespacedName{ @@ -974,7 +974,7 @@ func updateJivaVolumeWithServiceInfo(r *JivaVolumeReconciler, cr *api.JivaVolume } logrus.Info("Updating JivaVolume with iscsi spec", "ISCSISpec", cr.Spec.ISCSISpec) - cr.Status.Phase = api.JivaVolumePhasePending + cr.Status.Phase = jivaAPI.JivaVolumePhasePending if err := r.Update(context.TODO(), cr); err != nil { return fmt.Errorf("%s, err: %v", updateErrMsg, err) } @@ -1063,11 +1063,11 @@ func getBaseTargetTolerations() []corev1.Toleration { } // getDefaultPolicySpec gives the default policy spec for jiva volume. -func getDefaultPolicySpec() api.JivaVolumePolicySpec { - return api.JivaVolumePolicySpec{ +func getDefaultPolicySpec() jivaAPI.JivaVolumePolicySpec { + return jivaAPI.JivaVolumePolicySpec{ ReplicaSC: defaultStorageClass, - Target: api.TargetSpec{ - PodTemplateResources: api.PodTemplateResources{ + Target: jivaAPI.TargetSpec{ + PodTemplateResources: jivaAPI.PodTemplateResources{ Tolerations: getBaseTargetTolerations(), Resources: &corev1.ResourceRequirements{ Requests: corev1.ResourceList{ @@ -1093,8 +1093,8 @@ func getDefaultPolicySpec() api.JivaVolumePolicySpec { ReplicationFactor: defaultReplicationFactor, DisableMonitor: defaultDisableMonitor, }, - Replica: api.ReplicaSpec{ - PodTemplateResources: api.PodTemplateResources{ + Replica: jivaAPI.ReplicaSpec{ + PodTemplateResources: jivaAPI.PodTemplateResources{ Tolerations: getBaseReplicaTolerations(), Resources: &corev1.ResourceRequirements{ Requests: corev1.ResourceList{ @@ -1111,47 +1111,47 @@ func getDefaultPolicySpec() api.JivaVolumePolicySpec { } } -func defaultRF(policy *api.JivaVolumePolicySpec, defaultPolicy api.JivaVolumePolicySpec) { +func defaultRF(policy *jivaAPI.JivaVolumePolicySpec, defaultPolicy jivaAPI.JivaVolumePolicySpec) { if policy.Target.ReplicationFactor == 0 { policy.Target.ReplicationFactor = defaultPolicy.Target.ReplicationFactor } } -func defaultSC(policy *api.JivaVolumePolicySpec, defaultPolicy api.JivaVolumePolicySpec) { +func defaultSC(policy *jivaAPI.JivaVolumePolicySpec, defaultPolicy jivaAPI.JivaVolumePolicySpec) { if policy.ReplicaSC == "" { policy.ReplicaSC = defaultPolicy.ReplicaSC } } -func defaultTargetRes(policy *api.JivaVolumePolicySpec, defaultPolicy api.JivaVolumePolicySpec) { +func defaultTargetRes(policy *jivaAPI.JivaVolumePolicySpec, defaultPolicy jivaAPI.JivaVolumePolicySpec) { if policy.Target.Resources == nil { policy.Target.Resources = defaultPolicy.Target.Resources } } -func defaultTargetAuxRes(policy *api.JivaVolumePolicySpec, defaultPolicy api.JivaVolumePolicySpec) { +func defaultTargetAuxRes(policy *jivaAPI.JivaVolumePolicySpec, defaultPolicy jivaAPI.JivaVolumePolicySpec) { if policy.Target.AuxResources == nil { policy.Target.AuxResources = defaultPolicy.Target.AuxResources } } -func defaultReplicaRes(policy *api.JivaVolumePolicySpec, defaultPolicy api.JivaVolumePolicySpec) { +func defaultReplicaRes(policy *jivaAPI.JivaVolumePolicySpec, defaultPolicy jivaAPI.JivaVolumePolicySpec) { if policy.Replica.Resources == nil { policy.Replica.Resources = defaultPolicy.Replica.Resources } } -func defaultTargetTolerations(policy *api.JivaVolumePolicySpec, defaultPolicy api.JivaVolumePolicySpec) { +func defaultTargetTolerations(policy *jivaAPI.JivaVolumePolicySpec, defaultPolicy jivaAPI.JivaVolumePolicySpec) { policy.Target.Tolerations = append(defaultPolicy.Target.Tolerations, policy.Target.Tolerations...) } -func defaultReplicaTolerations(policy *api.JivaVolumePolicySpec, defaultPolicy api.JivaVolumePolicySpec) { +func defaultReplicaTolerations(policy *jivaAPI.JivaVolumePolicySpec, defaultPolicy jivaAPI.JivaVolumePolicySpec) { policy.Replica.Tolerations = append(defaultPolicy.Replica.Tolerations, policy.Replica.Tolerations...) } // validatePolicySpec checks the policy provided by the user and sets the // defaults to the policy spec of jiva volume. -func validatePolicySpec(policy *api.JivaVolumePolicySpec) { +func validatePolicySpec(policy *jivaAPI.JivaVolumePolicySpec) { defaultPolicy := getDefaultPolicySpec() optFuncs := []policyOptFuncs{ defaultRF, defaultSC, defaultTargetRes, defaultReplicaRes, @@ -1163,13 +1163,13 @@ func validatePolicySpec(policy *api.JivaVolumePolicySpec) { } } -func populateJivaVolumePolicy(r *JivaVolumeReconciler, cr *api.JivaVolume) error { +func populateJivaVolumePolicy(r *JivaVolumeReconciler, cr *jivaAPI.JivaVolume) error { policyName := cr.Annotations["openebs.io/volume-policy"] policySpec := getDefaultPolicySpec() // if policy name is provided via annotation get and validate the // policy spec else set the default policy spec. if policyName != "" { - policy := api.JivaVolumePolicy{} + policy := jivaAPI.JivaVolumePolicy{} err := r.Get( context.TODO(), types.NamespacedName{Name: policyName, Namespace: cr.Namespace}, @@ -1186,7 +1186,7 @@ func populateJivaVolumePolicy(r *JivaVolumeReconciler, cr *api.JivaVolume) error return nil } -func createControllerService(r *JivaVolumeReconciler, cr *api.JivaVolume) error { +func createControllerService(r *JivaVolumeReconciler, cr *jivaAPI.JivaVolume) error { // By default type is clusterIP svcObj, err := svc.NewBuilder(). @@ -1229,7 +1229,7 @@ func createControllerService(r *JivaVolumeReconciler, cr *api.JivaVolume) error } -func (r *JivaVolumeReconciler) updateJivaVolume(cr *api.JivaVolume) error { +func (r *JivaVolumeReconciler) updateJivaVolume(cr *jivaAPI.JivaVolume) error { if err := r.Update(context.TODO(), cr); err != nil { return fmt.Errorf("failed to update JivaVolume, err: %v", err) } @@ -1240,8 +1240,8 @@ func (r *JivaVolumeReconciler) updateJivaVolume(cr *api.JivaVolume) error { return nil } -func (r *JivaVolumeReconciler) getJivaVolume(cr *api.JivaVolume) error { - instance := &api.JivaVolume{} +func (r *JivaVolumeReconciler) getJivaVolume(cr *jivaAPI.JivaVolume) error { + instance := &jivaAPI.JivaVolume{} if err := r.Get(context.TODO(), types.NamespacedName{ Name: cr.Name, @@ -1256,14 +1256,14 @@ func (r *JivaVolumeReconciler) getJivaVolume(cr *api.JivaVolume) error { } // setdefaults set the default value -func setdefaults(cr *api.JivaVolume) { - cr.Status = api.JivaVolumeStatus{ +func setdefaults(cr *jivaAPI.JivaVolume) { + cr.Status = jivaAPI.JivaVolumeStatus{ Status: "Unknown", - Phase: api.JivaVolumePhaseSyncing, + Phase: jivaAPI.JivaVolumePhaseSyncing, } } -func (r *JivaVolumeReconciler) updateStatus(err *error, cr *api.JivaVolume) { +func (r *JivaVolumeReconciler) updateStatus(err *error, cr *jivaAPI.JivaVolume) { if *err != nil { setdefaults(cr) } @@ -1275,7 +1275,7 @@ func (r *JivaVolumeReconciler) updateStatus(err *error, cr *api.JivaVolume) { } } -func (r *JivaVolumeReconciler) getAndUpdateVolumeStatus(cr *api.JivaVolume) error { +func (r *JivaVolumeReconciler) getAndUpdateVolumeStatus(cr *jivaAPI.JivaVolume) error { var ( cli *jiva.ControllerClient err error @@ -1312,7 +1312,7 @@ func (r *JivaVolumeReconciler) getAndUpdateVolumeStatus(cr *api.JivaVolume) erro cr.Status.Status = stats.TargetStatus cr.Status.ReplicaCount = len(stats.Replicas) - cr.Status.ReplicaStatuses = make([]api.ReplicaStatus, len(stats.Replicas)) + cr.Status.ReplicaStatuses = make([]jivaAPI.ReplicaStatus, len(stats.Replicas)) for i, rep := range stats.Replicas { cr.Status.ReplicaStatuses[i].Address = rep.Address @@ -1320,17 +1320,17 @@ func (r *JivaVolumeReconciler) getAndUpdateVolumeStatus(cr *api.JivaVolume) erro } if stats.TargetStatus == "RW" { - cr.Status.Phase = api.JivaVolumePhaseReady + cr.Status.Phase = jivaAPI.JivaVolumePhaseReady } else if stats.TargetStatus == "RO" { - cr.Status.Phase = api.JivaVolumePhaseSyncing + cr.Status.Phase = jivaAPI.JivaVolumePhaseSyncing } else { - cr.Status.Phase = api.JivaVolumePhaseUnkown + cr.Status.Phase = jivaAPI.JivaVolumePhaseUnkown } return nil } -func (r *JivaVolumeReconciler) reconcileVersion(cr *api.JivaVolume) error { +func (r *JivaVolumeReconciler) reconcileVersion(cr *jivaAPI.JivaVolume) error { var err error // the below code uses deep copy to have the state of object just before // any update call is done so that on failure the last state object can be returned @@ -1342,7 +1342,7 @@ func (r *JivaVolumeReconciler) reconcileVersion(cr *api.JivaVolume) error { return fmt.Errorf("invalid desired version %s", cr.VersionDetails.Desired) } jObj := cr.DeepCopy() - if cr.VersionDetails.Status.State != api.ReconcileInProgress { + if cr.VersionDetails.Status.State != jivaAPI.ReconcileInProgress { jObj.VersionDetails.Status.SetInProgressStatus() err = r.updateJivaVolume(jObj) if err != nil { diff --git a/pkg/driver/controller.go b/pkg/driver/controller.go index 7b831ad..02a408b 100644 --- a/pkg/driver/controller.go +++ b/pkg/driver/controller.go @@ -23,7 +23,7 @@ import ( "time" "github.com/container-storage-interface/spec/lib/go/csi" - jv "github.com/openebs/jiva-operator/pkg/apis/openebs/v1" + jivaAPI "github.com/openebs/jiva-operator/pkg/apis/openebs/v1" "github.com/openebs/jiva-operator/pkg/jiva" "github.com/openebs/jiva-operator/pkg/kubernetes/client" analytics "github.com/openebs/jiva-operator/pkg/usage" @@ -218,9 +218,9 @@ func (cs *controller) ControllerGetCapabilities( return resp, nil } -func (cs *controller) isVolumeReady(volumeID string) (*jv.JivaVolume, error) { +func (cs *controller) isVolumeReady(volumeID string) (*jivaAPI.JivaVolume, error) { var interval time.Duration = 0 - var instance *jv.JivaVolume + var instance *jivaAPI.JivaVolume var i int for i = 0; i <= MaxRetryCount; i++ { if i == MaxRetryCount { diff --git a/pkg/driver/mount.go b/pkg/driver/mount.go index c227a3d..2dd45d5 100644 --- a/pkg/driver/mount.go +++ b/pkg/driver/mount.go @@ -29,7 +29,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - jv "github.com/openebs/jiva-operator/pkg/apis/openebs/v1" + jivaAPI "github.com/openebs/jiva-operator/pkg/apis/openebs/v1" "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/api/errors" utilexec "k8s.io/utils/exec" @@ -84,7 +84,7 @@ func (m *NodeMounter) GetDeviceName(mountPath string) (string, int, error) { return mount.GetDeviceNameFromMount(m, mountPath) } -func doesVolumeExist(volID string, cli *client.Client) (*jv.JivaVolume, error) { +func doesVolumeExist(volID string, cli *client.Client) (*jivaAPI.JivaVolume, error) { volID = utils.StripName(volID) if err := cli.Set(); err != nil { return nil, status.Error(codes.Internal, err.Error()) @@ -105,7 +105,7 @@ func isVolumeReady(volID string, cli *client.Client) (bool, error) { return false, err } - if instance.Status.Phase == jv.JivaVolumePhaseReady && instance.Status.Status == "RW" { + if instance.Status.Phase == jivaAPI.JivaVolumePhaseReady && instance.Status.Status == "RW" { return true, nil } return false, nil @@ -123,7 +123,7 @@ func isVolumeReachable(targetPortal string) bool { return false } -func waitForVolumeToBeReady(volID string, cli *client.Client) (*jv.JivaVolume, error) { +func waitForVolumeToBeReady(volID string, cli *client.Client) (*jivaAPI.JivaVolume, error) { var retry int var sleepInterval time.Duration = 0 for { @@ -134,7 +134,7 @@ func waitForVolumeToBeReady(volID string, cli *client.Client) (*jv.JivaVolume, e } retry++ - if instance.Status.Phase == jv.JivaVolumePhaseReady && instance.Status.Status == "RW" { + if instance.Status.Phase == jivaAPI.JivaVolumePhaseReady && instance.Status.Status == "RW" { return instance, nil } else if retry <= MaxRetryCount { sleepInterval = 5 @@ -215,7 +215,7 @@ func (n *NodeMounter) MonitorMounts() { logrus.Infof("Starting MonitorMounts goroutine") var ( err error - csivolList *jv.JivaVolumeList + csivolList *jivaAPI.JivaVolumeList mountList []mount.MountPoint ) ticker := time.NewTicker(MonitorMountRetryTimeout * time.Second) @@ -291,7 +291,7 @@ func verifyMountOpts(opts []string, desiredOpt string) bool { return false } -func (n *NodeMounter) remount(vol jv.JivaVolume, stagingPathExists, targetPathExists bool) { +func (n *NodeMounter) remount(vol jivaAPI.JivaVolume, stagingPathExists, targetPathExists bool) { defer func() { request.TransitionVolListLock.Lock() delete(request.TransitionVolList, vol.Name) @@ -320,7 +320,7 @@ func (n *NodeMounter) remount(vol jv.JivaVolume, stagingPathExists, targetPathEx // the disk will be attached via iSCSI login and then it will be mounted func (n *NodeMounter) remountVolume( stagingPathExists bool, targetPathExists bool, - vol *jv.JivaVolume, + vol *jivaAPI.JivaVolume, ) (err error) { options := []string{"rw"} diff --git a/pkg/driver/node.go b/pkg/driver/node.go index a4fe5e2..4f0136d 100644 --- a/pkg/driver/node.go +++ b/pkg/driver/node.go @@ -25,7 +25,7 @@ import ( "github.com/container-storage-interface/spec/lib/go/csi" "github.com/kubernetes-csi/csi-lib-iscsi/iscsi" - jv "github.com/openebs/jiva-operator/pkg/apis/openebs/v1" + jivaAPI "github.com/openebs/jiva-operator/pkg/apis/openebs/v1" "github.com/openebs/jiva-operator/pkg/kubernetes/client" "github.com/openebs/jiva-operator/pkg/request" "github.com/openebs/jiva-operator/pkg/utils" @@ -97,7 +97,7 @@ func NewNode(d *CSIDriver, cli *client.Client) *node { } } -func (ns *node) attachDisk(instance *jv.JivaVolume) (string, error) { +func (ns *node) attachDisk(instance *jivaAPI.JivaVolume) (string, error) { connector := iscsi.Connector{ VolumeName: instance.Name, TargetIqn: instance.Spec.ISCSISpec.Iqn, @@ -279,7 +279,7 @@ update: return &csi.NodeStageVolumeResponse{}, nil } -func (ns *node) doesVolumeExist(volID string) (*jv.JivaVolume, error) { +func (ns *node) doesVolumeExist(volID string) (*jivaAPI.JivaVolume, error) { volID = utils.StripName(volID) if err := ns.client.Set(); err != nil { return nil, status.Error(codes.Internal, err.Error()) diff --git a/pkg/jivavolume/jivavolume.go b/pkg/jivavolume/jivavolume.go index 1e26b50..66aa301 100644 --- a/pkg/jivavolume/jivavolume.go +++ b/pkg/jivavolume/jivavolume.go @@ -20,25 +20,25 @@ import ( "errors" "github.com/container-storage-interface/spec/lib/go/csi" - jv "github.com/openebs/jiva-operator/pkg/apis/openebs/v1" + jivaAPI "github.com/openebs/jiva-operator/pkg/apis/openebs/v1" "github.com/openebs/jiva-operator/version" ) // Jiva wraps the JivaVolume structure type Jiva struct { - jvObj *jv.JivaVolume + jvObj *jivaAPI.JivaVolume Errs []error } // New returns new instance of Jiva which is wrapper over JivaVolume func New() *Jiva { return &Jiva{ - jvObj: &jv.JivaVolume{}, + jvObj: &jivaAPI.JivaVolume{}, } } // Instance returns the instance of JivaVolume -func (j *Jiva) Instance() *jv.JivaVolume { +func (j *Jiva) Instance() *jivaAPI.JivaVolume { return j.jvObj } diff --git a/pkg/kubernetes/client/client.go b/pkg/kubernetes/client/client.go index 5bd8fdd..4ed5b29 100644 --- a/pkg/kubernetes/client/client.go +++ b/pkg/kubernetes/client/client.go @@ -23,7 +23,7 @@ import ( "github.com/container-storage-interface/spec/lib/go/csi" "github.com/openebs/jiva-operator/pkg/apis" - jv "github.com/openebs/jiva-operator/pkg/apis/openebs/v1" + jivaAPI "github.com/openebs/jiva-operator/pkg/apis/openebs/v1" "github.com/openebs/jiva-operator/pkg/jivavolume" analytics "github.com/openebs/jiva-operator/pkg/usage" "github.com/openebs/jiva-operator/pkg/utils" @@ -103,7 +103,7 @@ func (cl *Client) RegisterAPI(opts manager.Options) error { } // GetJivaVolume get the instance of JivaVolume CR. -func (cl *Client) GetJivaVolume(name string) (*jv.JivaVolume, error) { +func (cl *Client) GetJivaVolume(name string) (*jivaAPI.JivaVolume, error) { instance, err := cl.ListJivaVolume(name) if err != nil { logrus.Errorf("Failed to get JivaVolume CR: %v, err: %v", name, err) @@ -118,7 +118,7 @@ func (cl *Client) GetJivaVolume(name string) (*jv.JivaVolume, error) { } // UpdateJivaVolume update the JivaVolume CR -func (cl *Client) UpdateJivaVolume(cr *jv.JivaVolume) (bool, error) { +func (cl *Client) UpdateJivaVolume(cr *jivaAPI.JivaVolume) (bool, error) { err := cl.client.Update(context.TODO(), cr) if err != nil { if k8serrors.IsConflict(err) { @@ -198,7 +198,7 @@ func (cl *Client) CreateJivaVolume(req *csi.CreateVolumeRequest) (string, error) } obj := jiva.Instance() - objExists := &jv.JivaVolume{} + objExists := &jivaAPI.JivaVolume{} err = cl.client.Get(context.TODO(), types.NamespacedName{Name: name, Namespace: ns}, objExists) if err != nil && k8serrors.IsNotFound(err) { logrus.Infof("Creating a new JivaVolume CR {name: %v, namespace: %v}", name, ns) @@ -220,9 +220,9 @@ func (cl *Client) CreateJivaVolume(req *csi.CreateVolumeRequest) (string, error) } // ListJivaVolume returns the list of JivaVolume resources -func (cl *Client) ListJivaVolume(volumeID string) (*jv.JivaVolumeList, error) { +func (cl *Client) ListJivaVolume(volumeID string) (*jivaAPI.JivaVolumeList, error) { volumeID = utils.StripName(volumeID) - obj := &jv.JivaVolumeList{} + obj := &jivaAPI.JivaVolumeList{} opts := []client.ListOption{ client.MatchingLabels(getDefaultLabels(volumeID, "")), } @@ -235,9 +235,9 @@ func (cl *Client) ListJivaVolume(volumeID string) (*jv.JivaVolumeList, error) { } // GetJivaVolume returns the list of JivaVolume resources -func (cl *Client) GetJivaVolumeResource(volumeID string) (*jv.JivaVolume, error) { +func (cl *Client) GetJivaVolumeResource(volumeID string) (*jivaAPI.JivaVolume, error) { volumeID = utils.StripName(volumeID) - obj := &jv.JivaVolume{} + obj := &jivaAPI.JivaVolume{} if err := cl.client.Get(context.TODO(), types.NamespacedName{Name: volumeID, Namespace: GetOpenEBSNamespace()}, obj); err != nil { return nil, err @@ -247,8 +247,8 @@ func (cl *Client) GetJivaVolumeResource(volumeID string) (*jv.JivaVolume, error) } // ListJivaVolumeWithOpts returns the list of JivaVolume resources -func (cl *Client) ListJivaVolumeWithOpts(opts map[string]string) (*jv.JivaVolumeList, error) { - obj := &jv.JivaVolumeList{} +func (cl *Client) ListJivaVolumeWithOpts(opts map[string]string) (*jivaAPI.JivaVolumeList, error) { + obj := &jivaAPI.JivaVolumeList{} options := []client.ListOption{ client.MatchingLabels(opts), }