@@ -22,20 +22,17 @@ import (
2222 "strings"
2323
2424 mf "github.com/manifestival/manifestival"
25- "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
26- "k8s.io/apimachinery/pkg/runtime/schema"
25+ "knative.dev/pkg/logging"
2726
2827 "knative.dev/operator/pkg/apis/operator/base"
2928 "knative.dev/operator/pkg/apis/operator/v1beta1"
30- "knative.dev/pkg/logging"
3129)
3230
3331var (
34- role mf.Predicate = mf .Any (mf .ByKind ("ClusterRole" ), mf .ByKind ("Role" ))
35- rolebinding mf.Predicate = mf .Any (mf .ByKind ("ClusterRoleBinding" ), mf .ByKind ("RoleBinding" ))
36- webhook mf.Predicate = mf .Any (mf .ByKind ("MutatingWebhookConfiguration" ), mf .ByKind ("ValidatingWebhookConfiguration" ))
37- webhookDependentResources mf.Predicate = byGV (schema.GroupKind {Group : "networking.internal.knative.dev" , Kind : "Certificate" })
38- gatewayNotMatch = "no matches for kind \" Gateway\" "
32+ role mf.Predicate = mf .Any (mf .ByKind ("ClusterRole" ), mf .ByKind ("Role" ))
33+ rolebinding mf.Predicate = mf .Any (mf .ByKind ("ClusterRoleBinding" ), mf .ByKind ("RoleBinding" ))
34+ webhook mf.Predicate = mf .Any (mf .ByKind ("MutatingWebhookConfiguration" ), mf .ByKind ("ValidatingWebhookConfiguration" ))
35+ gatewayNotMatch = "no matches for kind \" Gateway\" "
3936)
4037
4138// Install applies the manifest resources for the given version and updates the given
@@ -55,7 +52,7 @@ func Install(ctx context.Context, manifest *mf.Manifest, instance base.KComponen
5552 status .MarkInstallFailed (err .Error ())
5653 return fmt .Errorf ("failed to apply (cluster)rolebindings: %w" , err )
5754 }
58- if err := manifest .Filter (mf .Not (mf .Any (role , rolebinding , webhook , webhookDependentResources ))).Apply (); err != nil {
55+ if err := manifest .Filter (mf .Not (mf .Any (role , rolebinding , webhook ))).Apply (); err != nil {
5956 status .MarkInstallFailed (err .Error ())
6057 if ks , ok := instance .(* v1beta1.KnativeServing ); ok && strings .Contains (err .Error (), gatewayNotMatch ) &&
6158 (ks .Spec .Ingress == nil || ks .Spec .Ingress .Istio .Enabled ) {
@@ -66,32 +63,10 @@ func Install(ctx context.Context, manifest *mf.Manifest, instance base.KComponen
6663
6764 return fmt .Errorf ("failed to apply non rbac manifest: %w" , err )
6865 }
69- return nil
70- }
71-
72- // InstallWebhookConfigs applies the Webhook manifest resources and updates the given status accordingly.
73- func InstallWebhookConfigs (ctx context.Context , manifest * mf.Manifest , instance base.KComponent ) error {
74- status := instance .GetStatus ()
7566 if err := manifest .Filter (webhook ).Apply (); err != nil {
7667 status .MarkInstallFailed (err .Error ())
7768 return fmt .Errorf ("failed to apply webhooks: %w" , err )
7869 }
79- return nil
80- }
81-
82- // InstallWebhookDependentResources applies the Webhook dependent resources updates the given status accordingly.
83- func InstallWebhookDependentResources (ctx context.Context , manifest * mf.Manifest , instance base.KComponent ) error {
84- status := instance .GetStatus ()
85- if err := manifest .Filter (webhookDependentResources ).Apply (); err != nil {
86- status .MarkInstallFailed (err .Error ())
87- return fmt .Errorf ("failed to apply webhooks: %w" , err )
88- }
89- return nil
90- }
91-
92- // MarkStatusSuccess updates the component status to success.
93- func MarkStatusSuccess (ctx context.Context , manifest * mf.Manifest , instance base.KComponent ) error {
94- status := instance .GetStatus ()
9570 status .MarkInstallSucceeded ()
9671 status .SetVersion (TargetVersion (instance ))
9772 return nil
@@ -108,9 +83,3 @@ func Uninstall(manifest *mf.Manifest) error {
10883 }
10984 return nil
11085}
111-
112- func byGV (gk schema.GroupKind ) mf.Predicate {
113- return func (u * unstructured.Unstructured ) bool {
114- return u .GroupVersionKind ().GroupKind () == gk
115- }
116- }
0 commit comments