Skip to content
This repository was archived by the owner on Jun 24, 2020. It is now read-only.

Install from the manifest in a strict(er) order. #374

Merged
knative-prow-robot merged 3 commits into from
Mar 25, 2020
Merged

Install from the manifest in a strict(er) order. #374

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8225c47
Install from the manifest in a strict order.
Mar 25, 2020
61284fb
Fixing golint
Mar 25, 2020
f4fa5fe
Just update the manifest as a final step.
Mar 25, 2020
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
16 changes: 16 additions & 0 deletions pkg/reconciler/knativeserving/knativeserving_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ const (
deletionChange = "deletion"
)

var (
role mf.Predicate = mf.Any(mf.ByKind("ClusterRole"), mf.ByKind("Role"))
rolebinding mf.Predicate = mf.Any(mf.ByKind("ClusterRoleBinding"), mf.ByKind("RoleBinding"))
)

// Reconciler implements controller.Reconciler for Knativeserving resources.
type Reconciler struct {
*reconciler.Base
Expand Down Expand Up @@ -191,6 +196,17 @@ func (r *Reconciler) initStatus(_ *mf.Manifest, instance *servingv1alpha1.Knativ
// Apply the manifest resources
func (r *Reconciler) install(manifest *mf.Manifest, instance *servingv1alpha1.KnativeServing) error {
r.Logger.Debug("Installing manifest")
// The Operator needs a higher level of permissions if it 'bind's non-existent roles.
// To avoid this, we strictly order the manifest application as (Cluster)Roles, then
// (Cluster)RoleBindings, then the rest of the manifest.
if err := manifest.Filter(role).Apply(); err != nil {
instance.Status.MarkInstallFailed(err.Error())
return err
}
if err := manifest.Filter(rolebinding).Apply(); err != nil {
instance.Status.MarkInstallFailed(err.Error())
return err
}
if err := manifest.Apply(); err != nil {
instance.Status.MarkInstallFailed(err.Error())
return err
Expand Down