Skip to content
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
2 changes: 1 addition & 1 deletion pkg/schemes/assisted/api/v1beta1/agent_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ limitations under the License.
package v1beta1

import (
conditionsv1 "github.com/openshift/custom-resource-status/conditions/v1"
"github.com/rh-ecosystem-edge/eco-goinfra/pkg/schemes/assisted/api/common"
"github.com/rh-ecosystem-edge/eco-goinfra/pkg/schemes/assisted/models"
conditionsv1 "github.com/openshift/custom-resource-status/conditions/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/schemes/assisted/api/v1beta1/infraenv_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ type InfraEnvSpec struct {
// OSImageVersion is the version of OS image to use when generating the InfraEnv.
// The version should refer to an OSImage specified in the AgentServiceConfig
// (i.e. OSImageVersion should equal to an OpenshiftVersion in OSImages list).
// Note: OSImageVersion can't be specified along with ClusterRef.
// Note: OSImageVersion can't be specified along with ClusterRef.
// +optional
OSImageVersion string `json:"osImageVersion,omitempty"`
}
Expand Down

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

4 changes: 2 additions & 2 deletions pkg/schemes/nfd/v1/nodefeaturediscovery_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ type OperandSpec struct {

// MasterEnv defines environment variables to be added to the master deployment
MasterEnvs []corev1.EnvVar `json:"masterEnvs,omitempty"`

// WorkerNodeSelector describes on which nodes the worker pod should be deployed.
WorkerNodeSelector map[string]string `json:"workerNodeSelector,omitempty"`
WorkerNodeSelector map[string]string `json:"workerNodeSelector,omitempty"`
}

// ConfigMap describes configuration options for the NFD worker
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"os"
"strings"

promv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
kata_v1alpha1 "github.com/rh-ecosystem-edge/eco-goinfra/pkg/schemes/nvidiagpu/k8skatamanager/v1alpha1/config"
upgrade_v1alpha1 "github.com/rh-ecosystem-edge/eco-goinfra/pkg/schemes/nvidiagpu/k8skoperatorlibs/upgrade/v1alpha1"
promv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/ptr"
Expand Down

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

2 changes: 1 addition & 1 deletion pkg/schemes/ocs/objectbucket.io/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ limitations under the License.

package objectbucket_io

const GroupName = "objectbucket.io"
const GroupName = "objectbucket.io"
2 changes: 1 addition & 1 deletion pkg/schemes/ocs/objectbucket.io/v1alpha1/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ limitations under the License.
// Package v1alpha1 contains API Schema definitions for the objectbucket v1alpha1 API group
// +k8s:deepcopy-gen=package,register
// +groupName=objectbucket.io
package v1alpha1
package v1alpha1
2 changes: 1 addition & 1 deletion pkg/schemes/ocs/objectbucket.io/v1alpha1/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ func addKnownTypes(scheme *runtime.Scheme) error {
)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}
}

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

8 changes: 4 additions & 4 deletions pkg/schemes/ocs/operatorv1/ocsinitialization_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
)

// OCSInitializationSpec defines the desired state of OCSInitialization
type OCSInitializationSpec struct{}
type OCSInitializationSpec struct {}

// OCSInitializationStatus defines the observed state of OCSInitialization
type OCSInitializationStatus struct {
Expand All @@ -41,9 +41,9 @@ type OCSInitializationStatus struct {
// operator. Object references will be added to this list after they have
// been created AND found in the cluster.
// +optional
RelatedObjects []corev1.ObjectReference `json:"relatedObjects,omitempty"`
ErrorMessage string `json:"errorMessage,omitempty"`
SCCsCreated bool `json:"sCCsCreated,omitempty"`
RelatedObjects []corev1.ObjectReference `json:"relatedObjects,omitempty"`
ErrorMessage string `json:"errorMessage,omitempty"`
SCCsCreated bool `json:"sCCsCreated,omitempty"`
}

// +kubebuilder:object:root=true
Expand Down
12 changes: 6 additions & 6 deletions pkg/schemes/ocs/operatorv1/storagecluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"os"
"time"

nbv1 "github.com/rh-ecosystem-edge/eco-goinfra/pkg/schemes/ocs/noobaa"
quotav1 "github.com/openshift/api/quota/v1"
conditionsv1 "github.com/openshift/custom-resource-status/conditions/v1"
rookCephv1 "github.com/rh-ecosystem-edge/eco-goinfra/pkg/schemes/ocs/ceph.rook.io/v1"
nbv1 "github.com/rh-ecosystem-edge/eco-goinfra/pkg/schemes/ocs/noobaa"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
Expand Down Expand Up @@ -267,8 +267,8 @@ type ManageCephNonResilientPools struct {

// ManageCephFilesystems defines how to reconcile CephFilesystems
type ManageCephFilesystems struct {
ReconcileStrategy string `json:"reconcileStrategy,omitempty"`
ActiveMetadataServers int `json:"activeMetadataServers,omitempty"`
ReconcileStrategy string `json:"reconcileStrategy,omitempty"`
ActiveMetadataServers int `json:"activeMetadataServers,omitempty"`
// StorageClassName specifies the name of the storage class created for cephfs
// +kubebuilder:validation:MaxLength=253
// +kubebuilder:validation:Pattern=^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
Expand All @@ -284,9 +284,9 @@ type ManageCephFilesystems struct {
// ManageCephObjectStores defines how to reconcile CephObjectStores
type ManageCephObjectStores struct {
ReconcileStrategy string `json:"reconcileStrategy,omitempty"`
GatewayInstances int `json:"gatewayInstances,omitempty"`
DisableRoute bool `json:"disableRoute,omitempty"`
HostNetwork *bool `json:"hostNetwork,omitempty"`
GatewayInstances int `json:"gatewayInstances,omitempty"`
DisableRoute bool `json:"disableRoute,omitempty"`
HostNetwork *bool `json:"hostNetwork,omitempty"`
// StorageClassName specifies the name of the storage class created for ceph obc's
// +kubebuilder:validation:MaxLength=253
// +kubebuilder:validation:Pattern=^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
Expand Down
2 changes: 1 addition & 1 deletion pkg/schemes/ocs/operatorv1/zz_generated.deepcopy.go

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

2 changes: 1 addition & 1 deletion pkg/schemes/ocs/provisioner/domain.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ limitations under the License.

package provisioner

const Domain = "objectbucket.io"
const Domain = "objectbucket.io"
2 changes: 1 addition & 1 deletion pkg/schemes/ocs/provisioner/errors/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ func NewBucketExistsError(msg string) *BucketExistsErr {
func IsBucketExists(e error) (is bool) {
_, is = e.(BucketExistsErr)
return is
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package operators

import (
operatorv1alpha1 "github.com/rh-ecosystem-edge/eco-goinfra/pkg/schemes/olm/operators/v1alpha1"
"github.com/rh-ecosystem-edge/eco-goinfra/pkg/schemes/olm/version"
operatorv1alpha1 "github.com/rh-ecosystem-edge/eco-goinfra/pkg/schemes/olm/operators/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package v1

import (
operatorv1alpha1 "github.com/rh-ecosystem-edge/eco-goinfra/pkg/schemes/olm/operators/v1alpha1"
"github.com/rh-ecosystem-edge/eco-goinfra/pkg/schemes/olm/version"
operatorv1alpha1 "github.com/rh-ecosystem-edge/eco-goinfra/pkg/schemes/olm/operators/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down