Skip to content

Refactoring elasticsearch operator to improve code readability #80

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
openshift-merge-robot merged 1 commit into from
Mar 20, 2019
Merged

Refactoring elasticsearch operator to improve code readability #80

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
6 changes: 3 additions & 3 deletions cmd/elasticsearch-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import (
"strings"
"time"

stub "github.com/openshift/elasticsearch-operator/pkg/stub"
"github.com/openshift/elasticsearch-operator/pkg/utils"
"github.com/sirupsen/logrus"

stub "github.com/openshift/elasticsearch-operator/pkg/stub"
sdk "github.com/operator-framework/operator-sdk/pkg/sdk"
k8sutil "github.com/operator-framework/operator-sdk/pkg/util/k8sutil"
sdkVersion "github.com/operator-framework/operator-sdk/version"

"github.com/sirupsen/logrus"
)

const (
Expand Down
5 changes: 5 additions & 0 deletions hack/test-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ if [ -n "${DEBUG:-}" ]; then
fi

IMAGE_ELASTICSEARCH_OPERATOR=${IMAGE_ELASTICSEARCH_OPERATOR:-quay.io/openshift/origin-elasticsearch-operator:latest}

if [ -n "${IMAGE_FORMAT:-}" ] ; then
IMAGE_ELASTICSEARCH_OPERATOR=$(sed -e "s,\${component},elasticsearch-operator," <(echo $IMAGE_FORMAT))
fi

KUBECONFIG=${KUBECONFIG:-$HOME/.kube/config}

repo_dir="$(dirname $0)/.."
Expand Down
30 changes: 9 additions & 21 deletions pkg/apis/elasticsearch/v1alpha1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ type ElasticsearchNode struct {
}

type ElasticsearchStorageSpec struct {
StorageClassName string `json:"storageClassName,omitempty"`
StorageClassName *string `json:"storageClassName,omitempty"`
Copy link
Contributor Author

@ewolinetz ewolinetz Mar 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is part of addressing https://bugzilla.redhat.com/show_bug.cgi?id=1689762
this may break CLO when we specify a storageClassName -- will create a follow up fix

Copy link
Contributor Author

@ewolinetz ewolinetz Mar 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will need to do a dep ensure -update for this

Size *resource.Quantity `json:"size,omitempty"`
}

Expand All @@ -80,8 +80,10 @@ type ElasticsearchNodeStatus struct {
}

type ElasticsearchNodeUpgradeStatus struct {
UnderUpgrade UpgradeStatus `json:"underUpgrade,omitempty"`
UpgradePhase ElasticsearchUpgradePhase `json:"upgradePhase,omitempty"`
ScheduledForUpgrade v1.ConditionStatus `json:"scheduledUpgrade,omitempty"`
ScheduledForRedeploy v1.ConditionStatus `json:"scheduledRedeploy,omitempty"`
UnderUpgrade v1.ConditionStatus `json:"underUpgrade,omitempty"`
UpgradePhase ElasticsearchUpgradePhase `json:"upgradePhase,omitempty"`
}

type ElasticsearchUpgradePhase string
Expand All @@ -98,13 +100,6 @@ type ElasticsearchNodeSpec struct {
Resources v1.ResourceRequirements `json:"resources"`
}

type UpgradeStatus string

const (
UnderUpgradeTrue UpgradeStatus = "True"
UnderUpgradeFalse UpgradeStatus = "False"
)

type ElasticsearchRequiredAction string

const (
Expand All @@ -127,8 +122,9 @@ const (
type ShardAllocationState string

const (
ShardAllocationTrue ShardAllocationState = "True"
ShardAllocationFalse ShardAllocationState = "False"
ShardAllocationAll ShardAllocationState = "all"
ShardAllocationNone ShardAllocationState = "none"
ShardAllocationUnknown ShardAllocationState = "shard allocation unknown"
)

// ElasticsearchStatus represents the status of Elasticsearch cluster
Expand Down Expand Up @@ -165,7 +161,7 @@ type ClusterCondition struct {
// Type is the type of the condition.
Type ClusterConditionType `json:"type"`
// Status is the status of the condition.
Status ConditionStatus `json:"status"`
Status v1.ConditionStatus `json:"status"`
// Last time the condition transitioned from one status to another.
LastTransitionTime metav1.Time `json:"lastTransitionTime"`
// Unique, one-word, CamelCase reason for the condition's last transition.
Expand All @@ -185,14 +181,6 @@ const (
Restarting ClusterConditionType = "Restarting"
)

type ConditionStatus string

const (
ConditionTrue ConditionStatus = "True"
ConditionFalse ConditionStatus = "False"
ConditionUnknown ConditionStatus = "Unknown"
)

type ClusterEvent string

const (
Expand Down
Loading