Skip to content
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

✨ WIP Improved error handling around installedBundle and reconcile modularization #1030

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

✨ WIP Improved error handling around installedBundle and reconcile modularization #1030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6867932
Replace ReasonCreateDynamicWatchFailed w/ ReasonInstallationFailed
bentito Jul 2, 2024
3b2b39d
Remove unused ReasonInstallationSucceeded
bentito Jul 2, 2024
9d24bcc
Merge remote-tracking branch 'upstream/main'
bentito Jul 8, 2024
9482c21
Merge remote-tracking branch 'upstream/main'
bentito Jul 10, 2024
39b7933
Drop usage of ConditionUnknown on Pending Install
bentito Jul 2, 2024
f139524
Remove ReasonUnpackPending/InstallationsStatusUnk
bentito Jul 2, 2024
9cadd96
Update related TODO in ClusterExtension controller
bentito Jul 3, 2024
6bfa6c9
Rm InstalledStatus->nil on upack & add comment
bentito Jul 3, 2024
7567a42
Align CRD for added Go doc on InstalledBundle
bentito Jul 3, 2024
bd5c8af
Move comment on InstalledBundle field
bentito Jul 8, 2024
8f6ddb7
Commit manifest changes for godoc change
bentito Jul 8, 2024
e558a63
Decouple bundle unpacking and installed statuses
bentito Jul 8, 2024
e6d0ea9
Remove unneeded unpack stage helper method
bentito Jul 9, 2024
630d8c2
Reorganize reconciler()
bentito Jul 10, 2024
0469c53
Fixup spurious comment punctuation
bentito Jul 10, 2024
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
19 changes: 9 additions & 10 deletions api/v1alpha1/clusterextension_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,25 +124,23 @@ const (
TypeChannelDeprecated = "ChannelDeprecated"
TypeBundleDeprecated = "BundleDeprecated"
TypeUnpacked = "Unpacked"
TypeProgressing = "Progressing"

ReasonErrorGettingClient = "ErrorGettingClient"
ReasonBundleLoadFailed = "BundleLoadFailed"

ReasonInstallationFailed = "InstallationFailed"
ReasonInstallationStatusUnknown = "InstallationStatusUnknown"
ReasonInstallationSucceeded = "InstallationSucceeded"
ReasonResolutionFailed = "ResolutionFailed"
ReasonInstallationFailed = "InstallationFailed"
ReasonInstallationInProgress = "InstallationInProgress"
ReasonResolutionFailed = "ResolutionFailed"

ReasonSuccess = "Success"
ReasonDeprecated = "Deprecated"
ReasonUpgradeFailed = "UpgradeFailed"

ReasonUnpackPending = "UnpackPending"
ReasonUnpackSuccess = "UnpackSuccess"
ReasonUnpackFailed = "UnpackFailed"

ReasonErrorGettingReleaseState = "ErrorGettingReleaseState"
ReasonCreateDynamicWatchFailed = "CreateDynamicWatchFailed"
)

func init() {
Expand All @@ -155,23 +153,21 @@ func init() {
TypeChannelDeprecated,
TypeBundleDeprecated,
TypeUnpacked,
TypeProgressing,
)
// TODO(user): add Reasons from above
conditionsets.ConditionReasons = append(conditionsets.ConditionReasons,
ReasonInstallationSucceeded,
ReasonResolutionFailed,
ReasonInstallationFailed,
ReasonSuccess,
ReasonDeprecated,
ReasonUpgradeFailed,
ReasonBundleLoadFailed,
ReasonErrorGettingClient,
ReasonInstallationStatusUnknown,
ReasonUnpackPending,
ReasonUnpackSuccess,
ReasonUnpackFailed,
ReasonErrorGettingReleaseState,
ReasonCreateDynamicWatchFailed,
ReasonInstallationInProgress,
)
}

Expand All @@ -182,6 +178,9 @@ type BundleMetadata struct {

// ClusterExtensionStatus defines the observed state of ClusterExtension
type ClusterExtensionStatus struct {
// InstalledBundle should only be modified when a new bundle is successfully installed. This ensures that if there
// is a previously successfully installed a bundle, and an upgrade fails, it is still communicated that there is
// still a bundle that is currently installed and owned by the ClusterExtension.
// +optional
InstalledBundle *BundleMetadata `json:"installedBundle,omitempty"`
// +optional
Expand Down
4 changes: 4 additions & 0 deletions config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ spec:
- type
x-kubernetes-list-type: map
installedBundle:
description: |-
InstalledBundle should only be modified when a new bundle is successfully installed. This ensures that if there
is a previously successfully installed a bundle, and an upgrade fails, it is still communicated that there is
still a bundle that is currently installed and owned by the ClusterExtension.
properties:
name:
type: string
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ toolchain go1.22.2
require (
github.com/Masterminds/semver/v3 v3.2.1
github.com/blang/semver/v4 v4.0.0
github.com/go-git/go-billy/v5 v5.5.0
github.com/go-logr/logr v1.4.2
github.com/google/go-cmp v0.6.0
github.com/operator-framework/api v0.26.0
Expand Down Expand Up @@ -112,7 +113,6 @@ require (
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-git/go-git/v5 v5.12.0 // indirect
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
Expand Down
Loading
Loading