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

Bump openpolicyagent/kube-mgmt and redis images for Authorization #663

Merged
merged 6 commits into from
Aug 16, 2024
Merged

Bump openpolicyagent/kube-mgmt and redis images for Authorization #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
adb681e
keep n-2
shaynafinocchiaro Aug 15, 2024
22a7bef
add new versions and update redis and opa kube mgmt image tags
shaynafinocchiaro Aug 15, 2024
85f618c
update test files
shaynafinocchiaro Aug 15, 2024
e1c3b12
fix versions
shaynafinocchiaro Aug 15, 2024
3cb080e
fix upgrade for alpha
shaynafinocchiaro Aug 15, 2024
f932af6
update unit tests
shaynafinocchiaro Aug 15, 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
6 changes: 5 additions & 1 deletion controllers/csm_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,8 @@ func (r *ContainerStorageModuleReconciler) PreChecks(ctx context.Context, cr *cs
if err != nil {
return fmt.Errorf("failed upgrade check: %v", err)
} else if !upgradeValid {
return fmt.Errorf("failed upgrade check because upgrade is not valid")
log.Infof("upgrade is not valid")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no linting error here? PowerScale driver this was throwing error. anything with ending "f" need format.

Copy link
Contributor Author

@shaynafinocchiaro shaynafinocchiaro Aug 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No this wasn't flagged as a linting error.

return nil
}

// check for owner reference
Expand Down Expand Up @@ -1429,6 +1430,9 @@ func (r *ContainerStorageModuleReconciler) checkUpgrade(ctx context.Context, cr
if configVersionExists {
if cr.HasModule(csmv1.AuthorizationServer) {
newVersion := cr.GetModule(csmv1.AuthorizationServer).ConfigVersion
if newVersion == "v2.0.0-alpha" {
return false, nil
}
return utils.IsValidUpgrade(ctx, oldVersion, newVersion, csmv1.Authorization, operatorConfig)
}
if cr.HasModule(csmv1.ApplicationMobility) {
Expand Down
2 changes: 1 addition & 1 deletion controllers/csm_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ func (suite *CSMControllerTestSuite) TestAuthorizationServerReconcileOCP() {

func (suite *CSMControllerTestSuite) TestAuthorizationServerPreCheck() {
suite.makeFakeAuthServerCSMWithoutPreRequisite(csmName, suite.namespace)
suite.runFakeAuthCSMManager("failed authorization proxy server validation", false, false)
suite.runFakeAuthCSMManager("timed out waiting for the condition", false, false)
suite.deleteCSM(csmName)
suite.runFakeAuthCSMManager("", true, false)
}
Expand Down
Loading
Loading