diff --git a/controllers/datasciencecluster/datasciencecluster_controller.go b/controllers/datasciencecluster/datasciencecluster_controller.go index dee03c1c41d..a185a735e6c 100644 --- a/controllers/datasciencecluster/datasciencecluster_controller.go +++ b/controllers/datasciencecluster/datasciencecluster_controller.go @@ -85,7 +85,7 @@ func (r *DataScienceClusterReconciler) Reconcile(ctx context.Context, req ctrl.R r.Log.Info("Reconciling DataScienceCluster resources", "Request.Name", req.Name) // Get information on version - currentOperatorReleaseVersion, err := cluster.GetReleaseFromCSV(ctx, r.Client) + currentOperatorReleaseVersion, err := cluster.GetRelease(ctx, r.Client) if err != nil { r.Log.Error(err, "failed to get operator release version") return ctrl.Result{}, err diff --git a/controllers/dscinitialization/dscinitialization_controller.go b/controllers/dscinitialization/dscinitialization_controller.go index 99ce0d624d8..962c4d8d9e2 100644 --- a/controllers/dscinitialization/dscinitialization_controller.go +++ b/controllers/dscinitialization/dscinitialization_controller.go @@ -78,7 +78,7 @@ type DSCInitializationReconciler struct { func (r *DSCInitializationReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { //nolint:funlen,gocyclo,maintidx r.Log.Info("Reconciling DSCInitialization.", "DSCInitialization Request.Name", req.Name) - currentOperatorReleaseVersion, err := cluster.GetReleaseFromCSV(ctx, r.Client) + currentOperatorReleaseVersion, err := cluster.GetRelease(ctx, r.Client) if err != nil { r.Log.Error(err, "failed to get operator release version") return ctrl.Result{}, err diff --git a/main.go b/main.go index 62401d984e6..d9c1c913261 100644 --- a/main.go +++ b/main.go @@ -224,7 +224,7 @@ func main() { os.Exit(1) } // get old release version before we create default DSCI CR - oldReleaseVersion, _ := upgrade.GetReleaseFromCR(ctx, setupClient) + oldReleaseVersion, _ := upgrade.GetDeployedRelease(ctx, setupClient) // Check if user opted for disabling DSC configuration disableDSCConfig, existDSCConfig := os.LookupEnv("DISABLE_DSC_CONFIG") diff --git a/pkg/cluster/cluster_config.go b/pkg/cluster/cluster_config.go index 6e2707dbfa6..a1c462aeeee 100644 --- a/pkg/cluster/cluster_config.go +++ b/pkg/cluster/cluster_config.go @@ -133,7 +133,7 @@ type Release struct { Version version.OperatorVersion `json:"version,omitempty"` } -func GetReleaseFromCSV(ctx context.Context, cli client.Client) (Release, error) { +func GetRelease(ctx context.Context, cli client.Client) (Release, error) { initRelease := Release{ // dummy version set to name "", version 0.0.0 Version: version.OperatorVersion{ diff --git a/pkg/upgrade/upgrade.go b/pkg/upgrade/upgrade.go index 93f94b9c071..449353fd6c2 100644 --- a/pkg/upgrade/upgrade.go +++ b/pkg/upgrade/upgrade.go @@ -513,7 +513,7 @@ func deleteDeprecatedNamespace(ctx context.Context, cli client.Client, namespace return nil } -func GetReleaseFromCR(ctx context.Context, cli client.Client) (cluster.Release, error) { +func GetDeployedRelease(ctx context.Context, cli client.Client) (cluster.Release, error) { dsciInstance := &dsciv1.DSCInitializationList{} if err := cli.List(ctx, dsciInstance); err != nil { return cluster.Release{}, err