Skip to content

Get csv even the installPlan requires Approval #723

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
merged 1 commit into from
Jul 27, 2021
Merged

Get csv even the installPlan requires Approval #723

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: 4 additions & 2 deletions controllers/operator/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,12 +330,12 @@ func (m *ODLMOperator) GetSubscription(ctx context.Context, name, namespace, pac
// GetClusterServiceVersion gets the ClusterServiceVersion from the subscription
func (m *ODLMOperator) GetClusterServiceVersion(ctx context.Context, sub *olmv1alpha1.Subscription) (*olmv1alpha1.ClusterServiceVersion, error) {
// Check the ClusterServiceVersion status in the subscription
if sub.Status.CurrentCSV == "" {
if sub.Status.InstalledCSV == "" {
klog.Warningf("The ClusterServiceVersion for Subscription %s is not ready. Will check it again", sub.Name)
return nil, nil
}

csvName := sub.Status.CurrentCSV
csvName := sub.Status.InstalledCSV
csvNamespace := sub.Namespace

if sub.Status.Install == nil || sub.Status.InstallPlanRef.Name == "" {
Expand All @@ -359,6 +359,8 @@ func (m *ODLMOperator) GetClusterServiceVersion(ctx context.Context, sub *olmv1a
} else {
if ip.Status.Phase == olmv1alpha1.InstallPlanPhaseFailed {
klog.Errorf("installplan %s/%s is failed", ipNamespace, ipName)
} else if ip.Status.Phase == olmv1alpha1.InstallPlanPhaseRequiresApproval {
klog.V(2).Infof("Installplan %s/%s is waiting for approval", ipNamespace, ipName)
} else if ip.Status.Phase != olmv1alpha1.InstallPlanPhaseComplete {
klog.Warningf("Installplan %s/%s is not ready", ipNamespace, ipName)
return nil, nil
Expand Down