Skip to content

Commit db952f2

Browse files
bump github.com/operator-framework/api from 0.5.3 to 0.8.0 (#4750)
Signed-off-by: Camila Macedo <[email protected]>
1 parent 45273ba commit db952f2

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/markbates/inflect v1.0.4
1212
github.com/onsi/ginkgo v1.15.0
1313
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
1515
github.com/operator-framework/operator-lib v0.4.0
1616
github.com/operator-framework/operator-registry v1.15.3
1717
github.com/prometheus/client_golang v1.7.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -802,8 +802,8 @@ github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
802802
github.com/operator-framework/api v0.3.22/go.mod h1:GVNiB6AQucwdZz3ZFXNv9HtcLOzcFnr6O/QldzKG93g=
803803
github.com/operator-framework/api v0.5.2 h1:NLgOoi70+iyz4vVJeeJUKaFT8wZaCbCHzS1eExCqX7A=
804804
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=
807807
github.com/operator-framework/operator-lib v0.4.0 h1:g7tGRo+FikHgFZDmRdHkOxyTv3sViI+Ujiqbfd9Tfsk=
808808
github.com/operator-framework/operator-lib v0.4.0/go.mod h1:kOjV7h01DCSw3RZAqYdHyHyVwuJL8hvG53tSZoDZfsQ=
809809
github.com/operator-framework/operator-registry v1.15.3 h1:C+u+zjDh6yQAKN+DbUvPeLjojZtJftvp/J28rRqiWWU=

internal/cmd/operator-sdk/generate/kustomize/manifests.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package kustomize
1616

1717
import (
18+
"bytes"
1819
"fmt"
1920
"io/ioutil"
2021
"os"
@@ -210,6 +211,11 @@ func (c manifestsCmd) run(cfg config.Config) error {
210211
if err != nil {
211212
return fmt.Errorf("error marshaling CSV base: %v", err)
212213
}
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+
213219
if err = os.MkdirAll(filepath.Join(c.outputDir, "bases"), 0755); err != nil {
214220
return err
215221
}

internal/generate/internal/genutil.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package genutil
1616

1717
import (
18+
"bytes"
1819
"errors"
1920
"fmt"
2021
"io"
@@ -61,6 +62,11 @@ func WriteObject(w io.Writer, obj interface{}) error {
6162
if err != nil {
6263
return err
6364
}
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+
6470
return write(w, b)
6571
}
6672

0 commit comments

Comments
 (0)