Skip to content

Commit 2fad20a

Browse files
Fix linter (#826)
Signed-off-by: Varsha Prasad Narsing <[email protected]>
1 parent d43e92d commit 2fad20a

File tree

4 files changed

+2
-22
lines changed

4 files changed

+2
-22
lines changed

api/v1alpha1/clusterextension_types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ type ClusterExtensionStatus struct {
145145
InstalledBundle *BundleMetadata `json:"installedBundle,omitempty"`
146146
// +optional
147147
ResolvedBundle *BundleMetadata `json:"resolvedBundle,omitempty"`
148-
149148
// +patchMergeKey=type
150149
// +patchStrategy=merge
151150
// +listType=map

internal/controllers/clusterextension_controller.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,7 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
201201
if err := r.Storage.Store(ctx, ext, unpackResult.Bundle); err != nil {
202202
return ctrl.Result{}, updateStatusUnpackFailing(&ext.Status, err)
203203
}
204-
contentURL, err := r.Storage.URLFor(ctx, ext)
205-
if err != nil {
206-
return ctrl.Result{}, updateStatusUnpackFailing(&ext.Status, err)
207-
}
208-
updateStatusUnpacked(&ext.Status, unpackResult, contentURL)
204+
updateStatusUnpacked(&ext.Status, unpackResult)
209205
default:
210206
return ctrl.Result{}, updateStatusUnpackFailing(&ext.Status, err)
211207
}

internal/controllers/clusterextension_status.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,7 @@ func updateStatusUnpacking(status *ocv1alpha1.ClusterExtensionStatus, result *so
6262
})
6363
}
6464

65-
func updateStatusUnpacked(status *ocv1alpha1.ClusterExtensionStatus, result *source.Result, contentURL string) {
66-
// TODO: Expose content URL through CE status.
67-
status.ResolvedBundle = &ocv1alpha1.BundleMetadata{
68-
Name: result.ResolvedSource.Image.Ref,
69-
}
65+
func updateStatusUnpacked(status *ocv1alpha1.ClusterExtensionStatus, result *source.Result) {
7066
meta.SetStatusCondition(&status.Conditions, metav1.Condition{
7167
Type: rukpakv1alpha2.TypeUnpacked,
7268
Status: metav1.ConditionTrue,

internal/controllers/common_controller.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,6 @@ func setResolvedStatusConditionSuccess(conditions *[]metav1.Condition, message s
4343
})
4444
}
4545

46-
// setInstalledStatusConditionUnknown sets the installed status condition to unknown.
47-
func setInstalledStatusConditionUnknown(conditions *[]metav1.Condition, message string, generation int64) {
48-
apimeta.SetStatusCondition(conditions, metav1.Condition{
49-
Type: ocv1alpha1.TypeInstalled,
50-
Status: metav1.ConditionUnknown,
51-
Reason: ocv1alpha1.ReasonInstallationStatusUnknown,
52-
Message: message,
53-
ObservedGeneration: generation,
54-
})
55-
}
56-
5746
// setResolvedStatusConditionFailed sets the resolved status condition to failed.
5847
func setResolvedStatusConditionFailed(conditions *[]metav1.Condition, message string, generation int64) {
5948
apimeta.SetStatusCondition(conditions, metav1.Condition{

0 commit comments

Comments
 (0)