Skip to content

Handle unsupported platform errors gracefully #14

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 2 commits into from
Feb 21, 2019
Merged

Handle unsupported platform errors gracefully #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be48382
Handle unsupported platform errors gracefully
gnufied Feb 20, 2019
d94365d
Add reason to status condition when unsupported
gnufied Feb 20, 2019
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
45 changes: 27 additions & 18 deletions pkg/controller/clusterstorage/clusterstorage_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
)

var log = logf.Log.WithName("controller_clusterstorage")
var unsupportedPlatformError = errors.New("unsupported platform")

const (
// OwnerLabelNamespace is the label key for the owner namespace
Expand Down Expand Up @@ -191,34 +192,42 @@ func (r *ReconcileClusterStorage) syncStatus(clusterOperator *configv1.ClusterOp
Status: configv1.ConditionFalse,
}
v1helpers.SetStatusCondition(&clusterOperator.Status.Conditions, notProgressing)
var message string

// if error is anything other than unsupported platform, we are failing
if err != nil {
failing := configv1.ClusterOperatorStatusCondition{
Type: configv1.OperatorFailing,
Status: configv1.ConditionTrue,
Reason: "Error",
Message: err.Error(),
}
v1helpers.SetStatusCondition(&clusterOperator.Status.Conditions, failing)
if err != unsupportedPlatformError {
failing := configv1.ClusterOperatorStatusCondition{
Type: configv1.OperatorFailing,
Status: configv1.ConditionTrue,
Reason: "Error",
Message: err.Error(),
}
v1helpers.SetStatusCondition(&clusterOperator.Status.Conditions, failing)

unavailable := configv1.ClusterOperatorStatusCondition{
Type: configv1.OperatorAvailable,
Status: configv1.ConditionFalse,
}
v1helpers.SetStatusCondition(&clusterOperator.Status.Conditions, unavailable)
unavailable := configv1.ClusterOperatorStatusCondition{
Type: configv1.OperatorAvailable,
Status: configv1.ConditionFalse,
}
v1helpers.SetStatusCondition(&clusterOperator.Status.Conditions, unavailable)

updateErr := r.client.Status().Update(context.TODO(), clusterOperator)
if updateErr != nil {
log.Error(updateErr, "Failed to update ClusterOperator status")
return updateErr
updateErr := r.client.Status().Update(context.TODO(), clusterOperator)
if updateErr != nil {
log.Error(updateErr, "Failed to update ClusterOperator status")
return updateErr
}
return nil
}
return nil
message = "Unsupported platform for storageclass creation"
}

available := configv1.ClusterOperatorStatusCondition{
Type: configv1.OperatorAvailable,
Status: configv1.ConditionTrue,
}
if message != "" {
available.Message = message
}
v1helpers.SetStatusCondition(&clusterOperator.Status.Conditions, available)

notFailing := configv1.ClusterOperatorStatusCondition{
Expand Down Expand Up @@ -247,7 +256,7 @@ func newStorageClassForCluster(cm *corev1.ConfigMap) (*storagev1.StorageClass, e
return resourceread.ReadStorageClassV1OrDie(generated.MustAsset("assets/openstack.yaml")), nil
}

return nil, errors.New("unsupported platform")
return nil, unsupportedPlatformError
}

func getPlatform(cm *corev1.ConfigMap) (*installer.Platform, error) {
Expand Down