File tree Expand file tree Collapse file tree 4 files changed +15
-3
lines changed
cmd/operator-sdk/generate/kustomize Expand file tree Collapse file tree 4 files changed +15
-3
lines changed Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ require (
11
11
github.com/markbates/inflect v1.0.4
12
12
github.com/onsi/ginkgo v1.15.0
13
13
github.com/onsi/gomega v1.10.5
14
- github.com/operator-framework/api v0.5.3
14
+ github.com/operator-framework/api v0.8.0
15
15
github.com/operator-framework/operator-lib v0.4.0
16
16
github.com/operator-framework/operator-registry v1.15.3
17
17
github.com/prometheus/client_golang v1.7.1
Original file line number Diff line number Diff line change @@ -802,8 +802,8 @@ github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
802
802
github.com/operator-framework/api v0.3.22 /go.mod h1:GVNiB6AQucwdZz3ZFXNv9HtcLOzcFnr6O/QldzKG93g =
803
803
github.com/operator-framework/api v0.5.2 h1:NLgOoi70+iyz4vVJeeJUKaFT8wZaCbCHzS1eExCqX7A =
804
804
github.com/operator-framework/api v0.5.2 /go.mod h1:L7IvLd/ckxJEJg/t4oTTlnHKAJIP/p51AvEslW3wYdY =
805
- github.com/operator-framework/api v0.5.3 h1:1RDw2FbuEDtSC7ONKLKgAxtq+iRsV7rRTumD4RLQfSI =
806
- github.com/operator-framework/api v0.5.3 /go.mod h1:L7IvLd/ckxJEJg/t4oTTlnHKAJIP/p51AvEslW3wYdY =
805
+ github.com/operator-framework/api v0.8.0 h1:S1R5BaPKeZoACbu0913mPnG33s7GOA2VrT9gvOeBjbU =
806
+ github.com/operator-framework/api v0.8.0 /go.mod h1:L7IvLd/ckxJEJg/t4oTTlnHKAJIP/p51AvEslW3wYdY =
807
807
github.com/operator-framework/operator-lib v0.4.0 h1:g7tGRo+FikHgFZDmRdHkOxyTv3sViI+Ujiqbfd9Tfsk =
808
808
github.com/operator-framework/operator-lib v0.4.0 /go.mod h1:kOjV7h01DCSw3RZAqYdHyHyVwuJL8hvG53tSZoDZfsQ =
809
809
github.com/operator-framework/operator-registry v1.15.3 h1:C+u+zjDh6yQAKN+DbUvPeLjojZtJftvp/J28rRqiWWU =
Original file line number Diff line number Diff line change 15
15
package kustomize
16
16
17
17
import (
18
+ "bytes"
18
19
"fmt"
19
20
"io/ioutil"
20
21
"os"
@@ -210,6 +211,11 @@ func (c manifestsCmd) run(cfg config.Config) error {
210
211
if err != nil {
211
212
return fmt .Errorf ("error marshaling CSV base: %v" , err )
212
213
}
214
+
215
+ // todo: remove it when the OLM starts to support https://github.com/operator-framework/api/pull/100
216
+ const cleanup = "cleanup:\n enabled: false\n "
217
+ csvBytes = bytes .ReplaceAll (csvBytes , []byte (cleanup ), []byte ("" ))
218
+
213
219
if err = os .MkdirAll (filepath .Join (c .outputDir , "bases" ), 0755 ); err != nil {
214
220
return err
215
221
}
Original file line number Diff line number Diff line change 15
15
package genutil
16
16
17
17
import (
18
+ "bytes"
18
19
"errors"
19
20
"fmt"
20
21
"io"
@@ -61,6 +62,11 @@ func WriteObject(w io.Writer, obj interface{}) error {
61
62
if err != nil {
62
63
return err
63
64
}
65
+
66
+ // todo: remove it when the OLM starts to support https://github.com/operator-framework/api/pull/100
67
+ const cleanup = "cleanup:\n enabled: false\n "
68
+ b = bytes .ReplaceAll (b , []byte (cleanup ), []byte ("" ))
69
+
64
70
return write (w , b )
65
71
}
66
72
You can’t perform that action at this time.
0 commit comments