Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update api version for internal apis to v1alpha1 #1416

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 48 additions & 48 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -32,99 +32,99 @@ resources:
validation: true
webhookVersion: v1
- api:
crdVersion: v1
crdVersion: v1alpha1
controller: true
domain: opendatahub.io
domain: platform.opendatahub.io
group: components
kind: Dashboard
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1
version: v1
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
crdVersion: v1alpha1
controller: true
domain: opendatahub.io
domain: platform.opendatahub.io
group: components
kind: Workbenches
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1
version: v1
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
crdVersion: v1alpha1
controller: true
domain: opendatahub.io
domain: platform.opendatahub.io
group: components
kind: ModelMeshServing
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1
version: v1
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
crdVersion: v1alpha1
controller: true
domain: opendatahub.io
domain: platform.opendatahub.io
group: components
kind: DataSciencePipelines
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1
version: v1
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
crdVersion: v1alpha1
controller: true
domain: opendatahub.io
domain: platform.opendatahub.io
group: components
kind: Kserve
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1
version: v1
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
crdVersion: v1alpha1
controller: true
domain: opendatahub.io
domain: platform.opendatahub.io
group: components
kind: Kueue
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1
version: v1
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
crdVersion: v1alpha1
controller: true
domain: opendatahub.io
domain: platform.opendatahub.io
group: components
kind: CodeFlare
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1
version: v1
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
crdVersion: v1alpha1
controller: true
domain: opendatahub.io
domain: platform.opendatahub.io
group: components
kind: Ray
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1
version: v1
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
crdVersion: v1alpha1
controller: true
domain: opendatahub.io
domain: platform.opendatahub.io
group: components
kind: TrustyAI
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1
version: v1
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
crdVersion: v1alpha1
controller: true
domain: opendatahub.io
domain: platform.opendatahub.io
group: components
kind: ModelRegistry
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1
version: v1
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
crdVersion: v1alpha1
controller: true
domain: opendatahub.io
domain: platform.opendatahub.io
group: components
kind: TrainingOperator
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1
version: v1
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
crdVersion: v1alpha1
controller: true
domain: opendatahub.io
domain: platform.opendatahub.io
group: services
kind: Monitoring
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/services/v1
version: v1
path: github.com/opendatahub-io/opendatahub-operator/v2/apis/services/v1alpha1
version: v1alpha1
version: "3"
2 changes: 1 addition & 1 deletion apis/common/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ type WithDevFlags interface {
GetDevFlags() *DevFlags
}

type BaseObject interface {
type PlatformObject interface {
client.Object
WithStatus
WithDevFlags
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
"github.com/opendatahub-io/opendatahub-operator/v2/apis/common"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
"github.com/opendatahub-io/opendatahub-operator/v2/apis/common"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
"github.com/opendatahub-io/opendatahub-operator/v2/apis/common"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ limitations under the License.

// Package v1 contains API Schema definitions for the components v1 API group
// +kubebuilder:object:generate=true
// +groupName=components.opendatahub.io
package v1
// +groupName=components.platform.opendatahub.io
package v1alpha1

import (
"k8s.io/apimachinery/pkg/runtime/schema"
Expand All @@ -26,7 +26,7 @@ import (

var (
// GroupVersion is group version used to register these objects
GroupVersion = schema.GroupVersion{Group: "components.opendatahub.io", Version: "v1"}
GroupVersion = schema.GroupVersion{Group: "components.platform.opendatahub.io", Version: "v1alpha1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
"github.com/opendatahub-io/opendatahub-operator/v2/apis/common"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
"github.com/opendatahub-io/opendatahub-operator/v2/apis/common"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
"github.com/opendatahub-io/opendatahub-operator/v2/apis/common"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
"github.com/opendatahub-io/opendatahub-operator/v2/apis/common"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
"github.com/opendatahub-io/opendatahub-operator/v2/apis/common"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
"github.com/opendatahub-io/opendatahub-operator/v2/apis/common"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
"github.com/opendatahub-io/opendatahub-operator/v2/apis/common"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
"github.com/opendatahub-io/opendatahub-operator/v2/apis/common"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions apis/datasciencecluster/v1/datasciencecluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

componentsv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1"
componentApi "github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1alpha1"
"github.com/opendatahub-io/opendatahub-operator/v2/components"
"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster"
)
Expand All @@ -38,47 +38,47 @@ type DataScienceClusterSpec struct {

type Components struct {
// Dashboard component configuration.
Dashboard componentsv1.DSCDashboard `json:"dashboard,omitempty"`
Dashboard componentApi.DSCDashboard `json:"dashboard,omitempty"`

// Workbenches component configuration.
Workbenches componentsv1.DSCWorkbenches `json:"workbenches,omitempty"`
Workbenches componentApi.DSCWorkbenches `json:"workbenches,omitempty"`

// ModelMeshServing component configuration.
ModelMeshServing componentsv1.DSCModelMeshServing `json:"modelmeshserving,omitempty"`
ModelMeshServing componentApi.DSCModelMeshServing `json:"modelmeshserving,omitempty"`

// DataServicePipeline component configuration.
// Require OpenShift Pipelines Operator to be installed before enable component
DataSciencePipelines componentsv1.DSCDataSciencePipelines `json:"datasciencepipelines,omitempty"`
DataSciencePipelines componentApi.DSCDataSciencePipelines `json:"datasciencepipelines,omitempty"`

// Kserve component configuration.
// Require OpenShift Serverless and OpenShift Service Mesh Operators to be installed before enable component
// Does not support enabled ModelMeshServing at the same time
Kserve componentsv1.DSCKserve `json:"kserve,omitempty"`
Kserve componentApi.DSCKserve `json:"kserve,omitempty"`

// Kueue component configuration.
Kueue componentsv1.DSCKueue `json:"kueue,omitempty"`
Kueue componentApi.DSCKueue `json:"kueue,omitempty"`

// CodeFlare component configuration.
// If CodeFlare Operator has been installed in the cluster, it should be uninstalled first before enabled component.
CodeFlare componentsv1.DSCCodeFlare `json:"codeflare,omitempty"`
CodeFlare componentApi.DSCCodeFlare `json:"codeflare,omitempty"`

// Ray component configuration.
Ray componentsv1.DSCRay `json:"ray,omitempty"`
Ray componentApi.DSCRay `json:"ray,omitempty"`

// TrustyAI component configuration.
TrustyAI componentsv1.DSCTrustyAI `json:"trustyai,omitempty"`
TrustyAI componentApi.DSCTrustyAI `json:"trustyai,omitempty"`

// ModelRegistry component configuration.
ModelRegistry componentsv1.DSCModelRegistry `json:"modelregistry,omitempty"`
ModelRegistry componentApi.DSCModelRegistry `json:"modelregistry,omitempty"`

// Training Operator component configuration.
TrainingOperator componentsv1.DSCTrainingOperator `json:"trainingoperator,omitempty"`
TrainingOperator componentApi.DSCTrainingOperator `json:"trainingoperator,omitempty"`
}

// ComponentsStatus defines the custom status of DataScienceCluster components.
type ComponentsStatus struct {
// ModelRegistry component status
ModelRegistry *componentsv1.DSCModelRegistryStatus `json:"modelregistry,omitempty"`
ModelRegistry *componentApi.DSCModelRegistryStatus `json:"modelregistry,omitempty"`
}

// DataScienceClusterStatus defines the observed state of DataScienceCluster.
Expand Down
4 changes: 2 additions & 2 deletions apis/datasciencecluster/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions apis/dscinitialization/v1/dscinitialization_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package v1

import (
servicesv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/services/v1"
serviceApi "github.com/opendatahub-io/opendatahub-operator/v2/apis/services/v1alpha1"
operatorv1 "github.com/openshift/api/operator/v1"
conditionsv1 "github.com/openshift/custom-resource-status/conditions/v1"
corev1 "k8s.io/api/core/v1"
Expand All @@ -41,7 +41,7 @@ type DSCInitializationSpec struct {
// Enable monitoring on specified namespace
// +operator-sdk:csv:customresourcedefinitions:type=spec,order=2
// +optional
Monitoring servicesv1.DSCMonitoring `json:"monitoring,omitempty"`
Monitoring serviceApi.DSCMonitoring `json:"monitoring,omitempty"`
// Configures Service Mesh as networking layer for Data Science Clusters components.
// The Service Mesh is a mandatory prerequisite for single model serving (KServe) and
// you should review this configuration if you are planning to use KServe.
Expand Down
Loading
Loading