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

Adding RCO PR 293 and 343 to 0.8.x for OLO v0.8.1 #329

Merged
merged 1 commit into from
Mar 17, 2022
Merged

Adding RCO PR 293 and 343 to 0.8.x for OLO v0.8.1 #329

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions controllers/openlibertyapplication_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,13 @@ func (r *ReconcileOpenLiberty) Reconcile(ctx context.Context, request ctrl.Reque
}
}

// Check if the ServiceAccount has a valid pull secret before creating the deployment/statefulset
// or setting up knative. Otherwise the pods can go into an ImagePullBackOff loop
saErr := oputils.ServiceAccountPullSecretExists(instance, r.GetClient())
if saErr != nil {
return r.ManageError(saErr, common.StatusConditionTypeReconciled, instance)
}

isKnativeSupported, err := r.IsGroupVersionSupported(servingv1.SchemeGroupVersion.String(), "Service")
if err != nil {
r.ManageError(err, common.StatusConditionTypeReconciled, instance)
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 @@ -3,7 +3,7 @@ module github.com/OpenLiberty/open-liberty-operator
go 1.16

require (
github.com/application-stacks/runtime-component-operator v0.8.0-20211124-0830
github.com/application-stacks/runtime-component-operator v0.8.2-0.20220316195517-28ed3d60f20c
github.com/coreos/prometheus-operator v0.41.1
github.com/go-logr/logr v0.3.0
github.com/openshift/api v0.0.0-20201019163320-c6a5ec25f267
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ github.com/aphistic/golf v0.0.0-20180712155816-02c07f170c5a/go.mod h1:3NqKYiepwy
github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3stzu0Xys=
github.com/application-stacks/runtime-component-operator v0.8.0-20211124-0830 h1:KtBbeDPeRkTZ1h+AQ5yM1hT9AKLgAA8y6eJRw6zieRg=
github.com/application-stacks/runtime-component-operator v0.8.0-20211124-0830/go.mod h1:h365eRTO2WuA+IYMxW/DrOZCqePnX7NyxN5MzqsV20k=
github.com/application-stacks/runtime-component-operator v0.8.2-0.20220316195517-28ed3d60f20c h1:u1Lw7sHZArsvATt+Aw6UqGZJemIxpwXEsaH1KxYzInA=
github.com/application-stacks/runtime-component-operator v0.8.2-0.20220316195517-28ed3d60f20c/go.mod h1:h365eRTO2WuA+IYMxW/DrOZCqePnX7NyxN5MzqsV20k=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
Expand Down
144 changes: 73 additions & 71 deletions ...b.com/application-stacks/runtime-component-operator/api/v1beta2/runtimecomponent_types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading