diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8571b1..01c4052 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: # # Note: By default, the `.golangci.yml` file should be at the root of the repository. # The location of the configuration file can be changed by using `--config=` - # args: --timeout=30m --config=/my/path/.golangci.yml --issues-exit-code=0 + args: --timeout=30m # Optional: show only new issues if it's a pull request. The default value is `false`. # only-new-issues: true diff --git a/pkg/operators/v1alphav1/provider.go b/pkg/operators/v1alphav1/provider.go index c23ed48..3c9ccaf 100644 --- a/pkg/operators/v1alphav1/provider.go +++ b/pkg/operators/v1alphav1/provider.go @@ -2,9 +2,12 @@ package v1alphav1 // DatabaseProvider defines all types database provider of DatabaseConnection type DatabaseProvider struct { - MysqlProvider *MysqlProvider `json:"mysql,omitempty"` + // +kubebuilder:validation:Optional + MysqlProvider *MysqlProvider `json:"mysql,omitempty"` + // +kubebuilder:validation:Optional PostgresProvider *PostgresProvider `json:"postgres,omitempty"` - RedisProvider *RedisProvider `json:"redis,omitempty"` + // +kubebuilder:validation:Optional + RedisProvider *RedisProvider `json:"redis,omitempty"` } // MysqlProvider defines the desired connection info of Mysql diff --git a/pkg/status/conditions.go b/pkg/status/conditions.go index 3cfd391..d492c15 100644 --- a/pkg/status/conditions.go +++ b/pkg/status/conditions.go @@ -2,18 +2,23 @@ package status // ConditionType is the type of condition const ( - ConditionTypeProgressing string = "Progressing" - ConditionTypeReconcile string = "Reconcile" - ConditionTypeAvailable string = "Available" + ConditionTypeProgressing string = "Progressing" + ConditionTypeReconcile string = "Reconcile" + ConditionTypeAvailable string = "Available" + ConditionTypeReconcilePVC string = "ReconcilePVC" + ConditionTypeReconcileService string = "ReconcileService" + ConditionTypeReconcileIngress string = "ReconcileIngress" + ConditionTypeReconcileDeployment string = "ReconcileDeployment" + ConditionTypeReconcileSecret string = "ReconcileSecret" + ConditionTypeReconcileDaemonSet string = "ReconcileDaemonSet" + ConditionTypeReconcileConfigMap string = "ReconcileConfigMap" ) // ConditionReason is the reason for the condition const ( - ConditionReasonPreparing string = "Preparing" - ConditionReasonRunning string = "Running" - ConditionReasonConfig string = "Config" - ConditionReasonReconcilePVC string = "ReconcilePVC" - ConditionReasonReconcileService string = "ReconcileService" - ConditionReasonReconcileIngress string = "ReconcileIngress" - ConditionReasonReconcileDeployment string = "ReconcileDeployment" + ConditionReasonPreparing string = "Preparing" + ConditionReasonRunning string = "Running" + ConditionReasonConfig string = "Config" + ConditionReasonReady string = "Ready" + ConditionReasonFail string = "Fail" )