Skip to content

Commit

Permalink
Merge pull request #2 from wastill/main
Browse files Browse the repository at this point in the history
fix: repaire ci
  • Loading branch information
whg517 authored Dec 25, 2023
2 parents 114414d + d03da21 commit 0f88208
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions pkg/operators/v1alphav1/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 15 additions & 10 deletions pkg/status/conditions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

0 comments on commit 0f88208

Please sign in to comment.