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

OpenLiberty · Mar 17, 2022 · 1a9a231 · 1a9a231
1 parent 5ccb060
commit 1a9a231
Show file tree

Hide file tree

Showing 7 changed files with 176 additions and 124 deletions.
diff --git a/controllers/openlibertyapplication_controller.go b/controllers/openlibertyapplication_controller.go
@@ -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)

diff --git a/go.mod b/go.mod
@@ -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

diff --git a/go.sum b/go.sum
@@ -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=

diff --git a/...b.com/application-stacks/runtime-component-operator/api/v1beta2/runtimecomponent_types.go b/...b.com/application-stacks/runtime-component-operator/api/v1beta2/runtimecomponent_types.go