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

Timing #320

Merged
merged 2 commits into from
Mar 21, 2022
Merged

Timing #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fda9f6d
Update to latest version of RCO to pick up fixes
idlewis Mar 17, 2022
6f81701
Don't create deployment without a pull secret
idlewis Feb 16, 2022
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
9 changes: 8 additions & 1 deletion controllers/openlibertyapplication_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"
"os"
"strings"
"strings"

networkingv1 "k8s.io/api/networking/v1"

Expand Down 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.1-0.20220124145716-73885bed49ff
github.com/application-stacks/runtime-component-operator v0.8.1-0.20220316182851-e552c3020aea
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 @@ -215,6 +215,8 @@ github.com/application-stacks/runtime-component-operator v0.8.0-20211124-0830 h1
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.1-0.20220124145716-73885bed49ff h1:jqBAquxD6LIP2VtcBeroTGiCZlYdx3Dvt4P0f/9o5xI=
github.com/application-stacks/runtime-component-operator v0.8.1-0.20220124145716-73885bed49ff/go.mod h1:h365eRTO2WuA+IYMxW/DrOZCqePnX7NyxN5MzqsV20k=
github.com/application-stacks/runtime-component-operator v0.8.1-0.20220316182851-e552c3020aea h1:2XwAPGovqD72DfzO3KIbFjTdWTTA/uST+qeduJQwKIM=
github.com/application-stacks/runtime-component-operator v0.8.1-0.20220316182851-e552c3020aea/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
39 changes: 39 additions & 0 deletions vendor/github.com/application-stacks/runtime-component-operator/utils/utils.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# cloud.google.com/go v0.65.0
cloud.google.com/go/compute/metadata
# github.com/application-stacks/runtime-component-operator v0.8.1-0.20220124145716-73885bed49ff
# github.com/application-stacks/runtime-component-operator v0.8.1-0.20220316182851-e552c3020aea
## explicit
github.com/application-stacks/runtime-component-operator/api/v1beta2
github.com/application-stacks/runtime-component-operator/common
Expand Down