File tree Expand file tree Collapse file tree 1 file changed +4
-3
lines changed
internal/operator-controller/controllers Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -127,8 +127,9 @@ func ApplyBundleWithBoxcutter(a Applier) ReconcileStepFunc {
127127 // Mirror Available/Progressing conditions from the installed revision
128128 if i := revisionStates .Installed ; i != nil {
129129 for _ , cndType := range []string {ocv1 .ClusterExtensionRevisionTypeAvailable , ocv1 .ClusterExtensionRevisionTypeProgressing } {
130- cnd := * apimeta .FindStatusCondition (i .Conditions , cndType )
131- apimeta .SetStatusCondition (& ext .Status .Conditions , cnd )
130+ if cnd := apimeta .FindStatusCondition (i .Conditions , cndType ); cnd != nil {
131+ apimeta .SetStatusCondition (& ext .Status .Conditions , * cnd )
132+ }
132133 }
133134 ext .Status .Install = & ocv1.ClusterExtensionInstallStatus {
134135 Bundle : i .BundleMetadata ,
@@ -143,7 +144,7 @@ func ApplyBundleWithBoxcutter(a Applier) ReconcileStepFunc {
143144 if pcnd != nil {
144145 apimeta .SetStatusCondition (& ext .Status .Conditions , * pcnd )
145146 }
146- if acnd := apimeta .FindStatusCondition (r .Conditions , ocv1 .ClusterExtensionRevisionTypeAvailable ); pcnd . Status == metav1 . ConditionFalse && acnd != nil && acnd .Status != metav1 .ConditionTrue {
147+ if acnd := apimeta .FindStatusCondition (r .Conditions , ocv1 .ClusterExtensionRevisionTypeAvailable ); acnd != nil && pcnd != nil && pcnd . Status == metav1 . ConditionFalse && acnd .Status != metav1 .ConditionTrue {
147148 apimeta .SetStatusCondition (& rs .Conditions , * acnd )
148149 }
149150 }
You can’t perform that action at this time.
0 commit comments