@@ -70,17 +70,17 @@ generate_bundle() {
70
70
71
71
# Generate the new package bundle
72
72
kustomize build config/manifests | operator-sdk generate bundle -q \
73
- --version " ${version} " \
74
- ${opts} \
75
- --output-dir " ${dir} "
73
+ --version " ${version} " \
74
+ ${opts} \
75
+ --output-dir " ${dir} "
76
76
77
77
# Ensure package name is correct for the specific bundle and that the CSV name matches the package name. Also removing
78
78
# the testing annotations since these are handled automatically upstream.
79
79
sed \
80
- -e " s/package.v1: cockroach-operator/package.v1: ${pkg} /g" \
81
- -e " /\s*# Annotations for testing/d" \
82
- -e " /\s*operators.operatorframework.io.test/d" \
83
- " ${dir} /metadata/annotations.yaml" > " ${dir} /metadata/annotations.yaml.new"
80
+ -e " s/package.v1: cockroach-operator/package.v1: ${pkg} /g" \
81
+ -e " /\s*# Annotations for testing/d" \
82
+ -e " /\s*operators.operatorframework.io.test/d" \
83
+ " ${dir} /metadata/annotations.yaml" > " ${dir} /metadata/annotations.yaml.new"
84
84
85
85
mv " ${dir} /metadata/annotations.yaml.new" " ${dir} /metadata/annotations.yaml"
86
86
@@ -89,9 +89,9 @@ generate_bundle() {
89
89
90
90
# move the dockerfile into the bundle directory and make it valid
91
91
sed \
92
- -e " /\s*tests\/scorecard/d" \
93
- -e " s+${dir} /++g" \
94
- bundle.Dockerfile > " ${dir} /Dockerfile"
92
+ -e " /\s*tests\/scorecard/d" \
93
+ -e " s+${dir} /++g" \
94
+ bundle.Dockerfile > " ${dir} /Dockerfile"
95
95
96
96
rm bundle.Dockerfile
97
97
rm " ${dir} /manifests/cockroach-operator-webhook-service_v1_service.yaml"
@@ -108,9 +108,9 @@ adapt_csv() {
108
108
109
109
# replace RH_COCKROACH_OP_IMAGE_PLACEHOLDER with the proper image and CREATED_AT_PLACEHOLDER with the current time
110
110
sed \
111
- -e " s+RH_COCKROACH_OP_IMAGE_PLACEHOLDER+${img} +g" \
112
- -e " s+CREATED_AT_PLACEHOLDER+" $( date +" %FT%H:%M:%SZ" ) " +g" \
113
- " ${csv} " > " ${csv} .new"
111
+ -e " s+RH_COCKROACH_OP_IMAGE_PLACEHOLDER+${img} +g" \
112
+ -e " s+CREATED_AT_PLACEHOLDER+" $( date +" %FT%H:%M:%SZ" ) " +g" \
113
+ " ${csv} " > " ${csv} .new"
114
114
115
115
mv " ${csv} .new" " ${csv} "
116
116
}
@@ -122,7 +122,7 @@ patch_marketplace_csv() {
122
122
123
123
local csv=" ${1} /cockroachdb-certified-rhmp/manifests/${2} .clusterserviceversion.yaml"
124
124
sed " s+ annotations:+ annotations:\n${rhmp_annotations} +" \
125
- " ${csv} " > " ${csv} .new"
125
+ " ${csv} " > " ${csv} .new"
126
126
mv " ${csv} .new" " ${csv} "
127
127
}
128
128
0 commit comments