Skip to content

sync: update ocs config to fix CI #981

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 25, 2025
Merged

sync: update ocs config to fix CI #981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions internal/sync/configs/ocs-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@
local_api_directory: schemes/ocs/noobaa
excludes:
- "*test.go"
# We do not currently use these types so they can safely be removed to
# avoid importing cloudnative-pg.
- cnpg_types.go
replace_imports:
- old: '"github.com/kube-object-storage/lib-bucket-provisioner/pkg/apis/objectbucket.io/v1alpha1"'
new: '"github.com/openshift-kni/eco-goinfra/pkg/schemes/ocs/objectbucket.io/v1alpha1"'
Expand Down
37 changes: 0 additions & 37 deletions pkg/schemes/ocs/noobaa/cnpg_types.go
View file
Open in desktop

This file was deleted.

22 changes: 16 additions & 6 deletions pkg/schemes/ocs/noobaa/noobaa_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,13 +465,23 @@ type NooBaaDBStatus struct {
type DBClusterStatus string

const (
// DBClusterStatusNone means the DB is not created
DBClusterStatusNone DBClusterStatus = "None"
DBClusterStatusCreating DBClusterStatus = "Creating"
DBClusterStatusUpdating DBClusterStatus = "Updating"
// DBClusterStatusNone means there is no DB cluster configured
DBClusterStatusNone DBClusterStatus = "None"

// DBClusterStatusCreating means a new DB cluster is being created
DBClusterStatusCreating DBClusterStatus = "Creating"

// DBClusterStatusUpdating means the DB cluster is being updated
DBClusterStatusUpdating DBClusterStatus = "Updating"

// DBClusterStatusImporting means a new DB cluster is being created and data is being imported from the previous DB
DBClusterStatusImporting DBClusterStatus = "Importing"
DBClusterStatusReady DBClusterStatus = "Ready"
DBClusterStatusFailed DBClusterStatus = "Failed"

// DBClusterStatusReady means the DB cluster is ready
DBClusterStatusReady DBClusterStatus = "Ready"

// DBClusterStatusFailed means the DB cluster reconciliation encountered an error
DBClusterStatusFailed DBClusterStatus = "Failed"
)

// These are the valid conditions types and statuses:
Expand Down
3 changes: 2 additions & 1 deletion pkg/schemes/ocs/operatorv1/storagecluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ type StorageClusterSpec struct {
AllowRemoteStorageConsumers bool `json:"allowRemoteStorageConsumers,omitempty"`

// ProviderAPIServerServiceType Indicates the ServiceType for OCS Provider API Server Service.
// The supported values are NodePort or LoadBalancer. The default ServiceType is NodePort if the value is empty.
// The default ServiceType is derived from hostNetwork field.
// +kubebuilder:validation:Enum=ClusterIP;NodePort;LoadBalancer
ProviderAPIServerServiceType corev1.ServiceType `json:"providerAPIServerServiceType,omitempty"`

// EnableCephTools toggles on whether or not the ceph tools pod
Expand Down