update dspa cr apiversion to v1

Signed-off-by: Humair Khan <[email protected]>

.github/resources/dspa-lite/dspa.yaml

@@ -1,4 +1,4 @@
-apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
+apiVersion: datasciencepipelinesapplications.opendatahub.io/v1
 kind: DataSciencePipelinesApplication
 metadata:
   name: test-dspa

README.md

@@ -281,7 +281,7 @@ To understand how these components interact with each other please refer to the
 To deploy a standalone MariaDB metadata database (rather than providing your own database connection details), simply add a `mariaDB` item under the `spec.database` in your DSPA definition with an `deploy` key set to `true`.  All other fields are defaultable/optional, see [All Fields DSPA Example](config/samples/v2/dspa-all-fields/dspa_all_fields.yaml) for full details.  Note that this component is mutually exclusive with externally-provided databases (defined by `spec.database.externalDB`).
 
 ```yaml
-apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
+apiVersion: datasciencepipelinesapplications.opendatahub.io/v1
 kind: DataSciencePipelinesApplication
 metadata:
   name: sample
@@ -298,7 +298,7 @@ spec:
 To deploy a Minio Object Storage component (rather than providing your own object storage connection details), simply add a `minio` item under the `spec.objectStorage` in your DSPA definition with an `image` key set to a valid minio component container image.  All other fields are defaultable/optional, see [All Fields DSPA Example](config/samples/v2/dspa-all-fields/dspa_all_fields.yaml) for full details.  Note that this component is mutually exclusive with externally-provided object stores (defined by `spec.objectStorage.externalStorage`).
 
 ```yaml
-apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
+apiVersion: datasciencepipelinesapplications.opendatahub.io/v1
 kind: DataSciencePipelinesApplication
 metadata:
   name: sample
@@ -316,7 +316,7 @@ spec:
 To deploy the standalone DS Pipelines UI component, simply add a `spec.mlpipelineUI` item to your DSPA with an `image` key set to a valid ui component container image.  All other fields are defaultable/optional, see [All Fields DSPA Example](config/samples/v2/dspa-all-fields/dspa_all_fields.yaml) for full details.
 
 ```yaml
-apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
+apiVersion: datasciencepipelinesapplications.opendatahub.io/v1
 kind: DataSciencePipelinesApplication
 metadata:
   name: sample
@@ -333,7 +333,7 @@ spec:
 To deploy the ML Metadata artifact linage/metadata component, simply add a `spec.mlmd` item to your DSPA with `deploy` set to `true`.  All other fields are defaultable/optional, see [All Fields DSPA Example](config/samples/v2/dspa-all-fields/dspa_all_fields.yaml) for full details.
 
 ```yaml
-apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
+apiVersion: datasciencepipelinesapplications.opendatahub.io/v1
 kind: DataSciencePipelinesApplication
 metadata:
   name: sample

api/v1alpha1/dspipeline_types.go → api/v1/dspipeline_types.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1
 
 import (
 	"k8s.io/apimachinery/pkg/api/resource"

api/v1alpha1/groupversion_info.go → api/v1/groupversion_info.go

@@ -17,7 +17,7 @@ limitations under the License.
 // Package v1alpha1 contains API Schema definitions for the datasciencepipelinesapplications v1alpha1 API group
 // +kubebuilder:object:generate=true
 // +groupName=datasciencepipelinesapplications.opendatahub.io
-package v1alpha1
+package v1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "datasciencepipelinesapplications.opendatahub.io", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "datasciencepipelinesapplications.opendatahub.io", Version: "v1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

config/crd/bases/datasciencepipelinesapplications.opendatahub.io_datasciencepipelinesapplications.yaml

@@ -17,7 +17,7 @@ spec:
     singular: datasciencepipelinesapplication
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - name: v1
     schema:
       openAPIV3Schema:
         properties:

config/overlays/make-deploy/kustomization.yaml

@@ -8,5 +8,5 @@ patchesStrategicMerge:
 - img_patch.yaml
 images:
 - name: controller
-  newName: quay.io/opendatahub/data-science-pipelines-operator
-  newTag: main
+  newName: quay.io/hukhan/data-science-pipelines-operator
+  newTag: remove-v1-4

config/samples/custom-configs/dspa.yaml

@@ -1,4 +1,4 @@
-apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
+apiVersion: datasciencepipelinesapplications.opendatahub.io/v1
 kind: DataSciencePipelinesApplication
 metadata:
   name: sample

config/samples/custom-workflow-controller-config/dspa.yaml

@@ -1,4 +1,4 @@
-apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
+apiVersion: datasciencepipelinesapplications.opendatahub.io/v1
 kind: DataSciencePipelinesApplication
 metadata:
   name: sample

config/samples/dspa-all-fields/dspa_all_fields.yaml

@@ -3,7 +3,7 @@
 # Note that you cannot specify all fields, some are mutually exclusive
 # For example, you can only specify either a miniodb deployment or
 # externalstorage connection, but not both
-apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
+apiVersion: datasciencepipelinesapplications.opendatahub.io/v1
 kind: DataSciencePipelinesApplication
 metadata:
   name: sample

config/samples/dspa-simple/dspa_simple.yaml

@@ -1,4 +1,4 @@
-apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
+apiVersion: datasciencepipelinesapplications.opendatahub.io/v1
 kind: DataSciencePipelinesApplication
 metadata:
   name: sample

config/samples/dspa_healthcheck.yaml

@@ -1,4 +1,4 @@
-apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
+apiVersion: datasciencepipelinesapplications.opendatahub.io/v1
 kind: DataSciencePipelinesApplication
 metadata:
   name: sample

config/samples/external-object-storage/dspa.yaml

@@ -1,4 +1,4 @@
-apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
+apiVersion: datasciencepipelinesapplications.opendatahub.io/v1
 kind: DataSciencePipelinesApplication
 metadata:
   name: sample

config/samples/local-dev/dspa.yaml

@@ -4,7 +4,7 @@
 # a locally-run DSPO that manages an external cluster (common development practice)
 # would not be able to run the pre-deploy health checks on these prerequisite components
 # and therefore the DSPA will never fully deploy without disabling them, as this DSPA sample does
-apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
+apiVersion: datasciencepipelinesapplications.opendatahub.io/v1
 kind: DataSciencePipelinesApplication
 metadata:
   name: sample

controllers/apiserver.go

@@ -18,7 +18,7 @@ package controllers
 import (
 	"context"
 
-	dspav1alpha1 "github.com/opendatahub-io/data-science-pipelines-operator/api/v1alpha1"
+	dspav1 "github.com/opendatahub-io/data-science-pipelines-operator/api/v1"
 	v1 "github.com/openshift/api/route/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -39,7 +39,7 @@ var samplePipelineTemplates = map[string]string{
 	"sample-config":   "apiserver/sample-pipeline/sample-config.yaml.tmpl",
 }
 
-func (r *DSPAReconciler) ReconcileAPIServer(ctx context.Context, dsp *dspav1alpha1.DataSciencePipelinesApplication, params *DSPAParams) error {
+func (r *DSPAReconciler) ReconcileAPIServer(ctx context.Context, dsp *dspav1.DataSciencePipelinesApplication, params *DSPAParams) error {
 	log := r.Log.WithValues("namespace", dsp.Namespace).WithValues("dspa_name", dsp.Name)
 
 	if !dsp.Spec.APIServer.Deploy {

controllers/apiserver_test.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/opendatahub-io/data-science-pipelines-operator/controllers/config"
 
-	dspav1alpha1 "github.com/opendatahub-io/data-science-pipelines-operator/api/v1alpha1"
+	dspav1 "github.com/opendatahub-io/data-science-pipelines-operator/api/v1"
 	"github.com/stretchr/testify/assert"
 	appsv1 "k8s.io/api/apps/v1"
 )
@@ -33,24 +33,24 @@ func TestDeployAPIServer(t *testing.T) {
 	expectedAPIServerName := apiServerDefaultResourceNamePrefix + testDSPAName
 
 	// Construct DSPASpec with deployed APIServer
-	dspa := &dspav1alpha1.DataSciencePipelinesApplication{
-		Spec: dspav1alpha1.DSPASpec{
+	dspa := &dspav1.DataSciencePipelinesApplication{
+		Spec: dspav1.DSPASpec{
 			PodToPodTLS: boolPtr(false),
-			APIServer: &dspav1alpha1.APIServer{
+			APIServer: &dspav1.APIServer{
 				Deploy: true,
 			},
-			MLMD: &dspav1alpha1.MLMD{
+			MLMD: &dspav1.MLMD{
 				Deploy: true,
 			},
-			Database: &dspav1alpha1.Database{
+			Database: &dspav1.Database{
 				DisableHealthCheck: false,
-				MariaDB: &dspav1alpha1.MariaDB{
+				MariaDB: &dspav1.MariaDB{
 					Deploy: true,
 				},
 			},
-			ObjectStorage: &dspav1alpha1.ObjectStorage{
+			ObjectStorage: &dspav1.ObjectStorage{
 				DisableHealthCheck: false,
-				Minio: &dspav1alpha1.Minio{
+				Minio: &dspav1.Minio{
 					Deploy: false,
 					Image:  "someimage",
 				},
@@ -95,9 +95,9 @@ func TestDontDeployAPIServer(t *testing.T) {
 	expectedAPIServerName := apiServerDefaultResourceNamePrefix + testDSPAName
 
 	// Construct DSPASpec with non-deployed APIServer
-	dspa := &dspav1alpha1.DataSciencePipelinesApplication{
-		Spec: dspav1alpha1.DSPASpec{
-			APIServer: &dspav1alpha1.APIServer{
+	dspa := &dspav1.DataSciencePipelinesApplication{
+		Spec: dspav1.DSPASpec{
+			APIServer: &dspav1.APIServer{
 				Deploy: false,
 			},
 		},
@@ -131,24 +131,24 @@ func TestApiServerEndpoints(t *testing.T) {
 	expectedAPIServerName := apiServerDefaultResourceNamePrefix + testDSPAName
 
 	// Construct DSPASpec with deployed APIServer
-	dspa := &dspav1alpha1.DataSciencePipelinesApplication{
-		Spec: dspav1alpha1.DSPASpec{
+	dspa := &dspav1.DataSciencePipelinesApplication{
+		Spec: dspav1.DSPASpec{
 			PodToPodTLS: boolPtr(false),
-			APIServer: &dspav1alpha1.APIServer{
+			APIServer: &dspav1.APIServer{
 				Deploy: true,
 			},
-			MLMD: &dspav1alpha1.MLMD{
+			MLMD: &dspav1.MLMD{
 				Deploy: true,
 			},
-			Database: &dspav1alpha1.Database{
+			Database: &dspav1.Database{
 				DisableHealthCheck: false,
-				MariaDB: &dspav1alpha1.MariaDB{
+				MariaDB: &dspav1.MariaDB{
 					Deploy: true,
 				},
 			},
-			ObjectStorage: &dspav1alpha1.ObjectStorage{
+			ObjectStorage: &dspav1.ObjectStorage{
 				DisableHealthCheck: false,
-				Minio: &dspav1alpha1.Minio{
+				Minio: &dspav1.Minio{
 					Deploy: false,
 					Image:  "someimage",
 				},
@@ -175,7 +175,7 @@ func TestApiServerEndpoints(t *testing.T) {
 	err = reconciler.ReconcileAPIServer(ctx, dspa, params)
 	assert.Nil(t, err)
 
-	dspa_created := &dspav1alpha1.DataSciencePipelinesApplication{}
+	dspa_created := &dspav1.DataSciencePipelinesApplication{}
 	created, err = reconciler.IsResourceCreated(ctx, dspa, testDSPAName, testNamespace)
 	assert.NotNil(t, dspa_created.Status.Components.APIServer.Url)
 	assert.NotNil(t, dspa_created.Status.Components.APIServer.ExternalUrl)

controllers/common.go

@@ -16,14 +16,14 @@ limitations under the License.
 package controllers
 
 import (
-	dspav1alpha1 "github.com/opendatahub-io/data-science-pipelines-operator/api/v1alpha1"
+	dspav1 "github.com/opendatahub-io/data-science-pipelines-operator/api/v1"
 )
 
 var commonTemplatesDir = "common/default"
 
 const commonCusterRolebindingTemplate = "common/no-owner/clusterrolebinding.yaml.tmpl"
 
-func (r *DSPAReconciler) ReconcileCommon(dsp *dspav1alpha1.DataSciencePipelinesApplication, params *DSPAParams) error {
+func (r *DSPAReconciler) ReconcileCommon(dsp *dspav1.DataSciencePipelinesApplication, params *DSPAParams) error {
 	log := r.Log.WithValues("namespace", dsp.Namespace).WithValues("dspa_name", dsp.Name)
 
 	log.Info("Applying Common Resources")

controllers/common_test.go

@@ -20,7 +20,7 @@ package controllers
 import (
 	"testing"
 
-	dspav1alpha1 "github.com/opendatahub-io/data-science-pipelines-operator/api/v1alpha1"
+	dspav1 "github.com/opendatahub-io/data-science-pipelines-operator/api/v1"
 	"github.com/stretchr/testify/assert"
 	networkingv1 "k8s.io/api/networking/v1"
 )
@@ -32,17 +32,17 @@ func TestDeployCommonPolicies(t *testing.T) {
 	expectedEnvoyNetworkPolicyName := "ds-pipelines-envoy-testdspa"
 
 	// Construct Basic DSPA Spec
-	dspa := &dspav1alpha1.DataSciencePipelinesApplication{
-		Spec: dspav1alpha1.DSPASpec{
-			Database: &dspav1alpha1.Database{
+	dspa := &dspav1.DataSciencePipelinesApplication{
+		Spec: dspav1.DSPASpec{
+			Database: &dspav1.Database{
 				DisableHealthCheck: false,
-				MariaDB: &dspav1alpha1.MariaDB{
+				MariaDB: &dspav1.MariaDB{
 					Deploy: true,
 				},
 			},
-			ObjectStorage: &dspav1alpha1.ObjectStorage{
+			ObjectStorage: &dspav1.ObjectStorage{
 				DisableHealthCheck: false,
-				Minio: &dspav1alpha1.Minio{
+				Minio: &dspav1.Minio{
 					Deploy: false,
 					Image:  "someimage",
 				},

controllers/config/defaults.go

@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	dspav1alpha1 "github.com/opendatahub-io/data-science-pipelines-operator/api/v1alpha1"
+	dspav1 "github.com/opendatahub-io/data-science-pipelines-operator/api/v1"
 	"github.com/spf13/viper"
 	"k8s.io/apimachinery/pkg/api/resource"
 )
@@ -171,13 +171,13 @@ var (
 
 type DBExtraParams map[string]string
 
-func createResourceRequirement(RequestsCPU resource.Quantity, RequestsMemory resource.Quantity, LimitsCPU resource.Quantity, LimitsMemory resource.Quantity) dspav1alpha1.ResourceRequirements {
-	return dspav1alpha1.ResourceRequirements{
-		Requests: &dspav1alpha1.Resources{
+func createResourceRequirement(RequestsCPU resource.Quantity, RequestsMemory resource.Quantity, LimitsCPU resource.Quantity, LimitsMemory resource.Quantity) dspav1.ResourceRequirements {
+	return dspav1.ResourceRequirements{
+		Requests: &dspav1.Resources{
 			CPU:    RequestsCPU,
 			Memory: RequestsMemory,
 		},
-		Limits: &dspav1alpha1.Resources{
+		Limits: &dspav1.Resources{
 			CPU:    LimitsCPU,
 			Memory: LimitsMemory,
 		},

controllers/database.go

@@ -30,7 +30,7 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/go-sql-driver/mysql"
 	_ "github.com/go-sql-driver/mysql"
-	dspav1alpha1 "github.com/opendatahub-io/data-science-pipelines-operator/api/v1alpha1"
+	dspav1 "github.com/opendatahub-io/data-science-pipelines-operator/api/v1"
 	"github.com/opendatahub-io/data-science-pipelines-operator/controllers/config"
 	"k8s.io/apimachinery/pkg/util/json"
 	"os"
@@ -161,7 +161,7 @@ var ConnectAndQueryDatabase = func(
 	return true, nil
 }
 
-func (r *DSPAReconciler) isDatabaseAccessible(dsp *dspav1alpha1.DataSciencePipelinesApplication,
+func (r *DSPAReconciler) isDatabaseAccessible(dsp *dspav1.DataSciencePipelinesApplication,
 	params *DSPAParams) (bool, error) {
 	log := r.Log.WithValues("namespace", dsp.Namespace).WithValues("dspa_name", dsp.Name)
 
@@ -233,7 +233,7 @@ func (r *DSPAReconciler) isDatabaseAccessible(dsp *dspav1alpha1.DataSciencePipel
 	return dbHealthCheckPassed, err
 }
 
-func (r *DSPAReconciler) ReconcileDatabase(ctx context.Context, dsp *dspav1alpha1.DataSciencePipelinesApplication,
+func (r *DSPAReconciler) ReconcileDatabase(ctx context.Context, dsp *dspav1.DataSciencePipelinesApplication,
 	params *DSPAParams) error {
 
 	log := r.Log.WithValues("namespace", dsp.Namespace).WithValues("dspa_name", dsp.Name)
@@ -273,7 +273,7 @@ func (r *DSPAReconciler) ReconcileDatabase(ctx context.Context, dsp *dspav1alpha
 		// Update the CR with the state of mariaDB to accurately portray
 		// desired state.
 		if !databaseSpecified {
-			dsp.Spec.Database = &dspav1alpha1.Database{}
+			dsp.Spec.Database = &dspav1.Database{}
 		}
 		if !databaseSpecified || defaultDBRequired {
 			dsp.Spec.Database.MariaDB = params.MariaDB.DeepCopy()