88 "errors"
99 "fmt"
1010 "io"
11- "strings"
1211 "text/template"
1312 "time"
1413
@@ -17,7 +16,6 @@ import (
1716 "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
1817 "k8s.io/apimachinery/pkg/types"
1918 apimachineryerrors "k8s.io/apimachinery/pkg/util/errors"
20- "k8s.io/apimachinery/pkg/util/sets"
2119 "k8s.io/apimachinery/pkg/util/wait"
2220 kubeyaml "k8s.io/apimachinery/pkg/util/yaml"
2321 "sigs.k8s.io/controller-runtime/pkg/client"
@@ -27,10 +25,10 @@ import (
2725// Bootstrap creates resources in a package's fs by
2826// continuously retrying the list. This is blocking, i.e. it only returns (with error)
2927// when the context is closed or with nil when the bootstrapping is successfully completed.
30- func Bootstrap (ctx context.Context , client client.Client , fs embed.FS , batteriesIncluded sets. Set [ string ] ) error {
28+ func Bootstrap (ctx context.Context , client client.Client , fs embed.FS ) error {
3129 // bootstrap non-crd resources
3230 return wait .PollUntilContextCancel (ctx , time .Second , true , func (ctx context.Context ) (bool , error ) {
33- if err := CreateResourcesFromFS (ctx , client , fs , batteriesIncluded ); err != nil {
31+ if err := CreateResourcesFromFS (ctx , client , fs ); err != nil {
3432 log .FromContext (ctx ).WithValues ("err" , err ).Info ("failed to bootstrap resources, retrying" )
3533 return false , nil
3634 }
@@ -39,7 +37,7 @@ func Bootstrap(ctx context.Context, client client.Client, fs embed.FS, batteries
3937}
4038
4139// CreateResourcesFromFS creates all resources from a filesystem.
42- func CreateResourcesFromFS (ctx context.Context , client client.Client , fs embed.FS , batteriesIncluded sets. Set [ string ] ) error {
40+ func CreateResourcesFromFS (ctx context.Context , client client.Client , fs embed.FS ) error {
4341 files , err := fs .ReadDir ("." )
4442 if err != nil {
4543 return err
@@ -50,15 +48,15 @@ func CreateResourcesFromFS(ctx context.Context, client client.Client, fs embed.F
5048 if f .IsDir () {
5149 continue
5250 }
53- if err := CreateResourceFromFS (ctx , client , f .Name (), fs , batteriesIncluded ); err != nil {
51+ if err := CreateResourceFromFS (ctx , client , f .Name (), fs ); err != nil {
5452 errs = append (errs , err )
5553 }
5654 }
5755 return apimachineryerrors .NewAggregate (errs )
5856}
5957
6058// CreateResourceFromFS creates given resource file.
61- func CreateResourceFromFS (ctx context.Context , client client.Client , filename string , fs embed.FS , batteriesIncluded sets. Set [ string ] ) error {
59+ func CreateResourceFromFS (ctx context.Context , client client.Client , filename string , fs embed.FS ) error {
6260 raw , err := fs .ReadFile (filename )
6361 if err != nil {
6462 return fmt .Errorf ("could not read %s: %w" , filename , err )
@@ -81,17 +79,14 @@ func CreateResourceFromFS(ctx context.Context, client client.Client, filename st
8179 continue
8280 }
8381
84- if err := createResourceFromFS (ctx , client , doc , batteriesIncluded ); err != nil {
82+ if err := createResourceFromFS (ctx , client , doc ); err != nil {
8583 errs = append (errs , fmt .Errorf ("failed to create resource %s doc %d: %w" , filename , i , err ))
8684 }
8785 }
8886 return apimachineryerrors .NewAggregate (errs )
8987}
9088
91- const annotationCreateOnlyKey = "bootstrap.kcp.io/create-only"
92- const annotationBattery = "bootstrap.kcp.io/battery"
93-
94- func createResourceFromFS (ctx context.Context , client client.Client , raw []byte , batteriesIncluded sets.Set [string ]) error {
89+ func createResourceFromFS (ctx context.Context , client client.Client , raw []byte ) error {
9590 log := log .FromContext (ctx )
9691
9792 type Input struct {
@@ -100,9 +95,6 @@ func createResourceFromFS(ctx context.Context, client client.Client, raw []byte,
10095 input := Input {
10196 Batteries : map [string ]bool {},
10297 }
103- for _ , b := range sets.List [string ](batteriesIncluded ) {
104- input .Batteries [b ] = true
105- }
10698 tmpl , err := template .New ("manifest" ).Parse (string (raw ))
10799 if err != nil {
108100 return fmt .Errorf ("failed to parse manifest: %w" , err )
@@ -121,21 +113,6 @@ func createResourceFromFS(ctx context.Context, client client.Client, raw []byte,
121113 return fmt .Errorf ("decoded into incorrect type, got %T, wanted %T" , obj , & unstructured.Unstructured {})
122114 }
123115
124- if v , found := u .GetAnnotations ()[annotationBattery ]; found {
125- partOf := strings .Split (v , "," )
126- included := false
127- for _ , p := range partOf {
128- if batteriesIncluded .Has (strings .TrimSpace (p )) {
129- included = true
130- break
131- }
132- }
133- if ! included {
134- log .V (4 ).WithValues ("resource" , u .GetName (), "batteriesRequired" , v , "batteriesIncluded" , batteriesIncluded ).Info ("skipping resource because required batteries are not among included batteries" )
135- return nil
136- }
137- }
138-
139116 key := types.NamespacedName {
140117 Namespace : u .GetNamespace (),
141118 Name : u .GetName (),
@@ -148,12 +125,6 @@ func createResourceFromFS(ctx context.Context, client client.Client, raw []byte,
148125 return err
149126 }
150127
151- if _ , exists := u .GetAnnotations ()[annotationCreateOnlyKey ]; exists {
152- log .Info ("skipping update of object because it has the create-only annotation" )
153-
154- return nil
155- }
156-
157128 u .SetResourceVersion (u .GetResourceVersion ())
158129 err = client .Update (ctx , u )
159130 if err != nil {
0 commit comments