Merge pull request #549 from dprince/designate_envs

Add designate to csv-merger and custom-bundle

cmd/csv-merger/csv-merger.go

@@ -94,6 +94,7 @@ var (
 	horizonCsv     = flag.String("horizon-csv", "", "Horizon CSV filename")
 	swiftCsv       = flag.String("swift-csv", "", "Swift CSV filename")
 	octaviaCsv     = flag.String("octavia-csv", "", "Octavia CSV filename")
+	designateCsv     = flag.String("designate-csv", "", "Designate CSV filename")
 	csvOverrides   = flag.String("csv-overrides", "", "CSV like string with punctual changes that will be recursively applied (if possible)")
 	importEnvFiles = flag.String("import-env-files", "", "Comma separated list of file names to read default operator ENVs from. Used for inter-bundle ENV merging.")
 	exportEnvFile  = flag.String("export-env-file", "", "Name the external file to write operator ENVs to. Used for inter-bundle ENV merging.")
@@ -140,6 +141,7 @@ func main() {
 		*heatCsv,
 		*swiftCsv,
 		*octaviaCsv,
+		*designateCsv,
 	}
 
 	csvVersion := os.Getenv("CSV_VERSION")

custom-bundle.Dockerfile

@@ -18,6 +18,7 @@ ARG CINDER_BUNDLE=quay.io/openstack-k8s-operators/cinder-operator-bundle:latest
 ARG MANILA_BUNDLE=quay.io/openstack-k8s-operators/manila-operator-bundle:latest
 ARG SWIFT_BUNDLE=quay.io/openstack-k8s-operators/swift-operator-bundle:latest
 ARG OCTAVIA_BUNDLE=quay.io/openstack-k8s-operators/octavia-operator-bundle:latest
+ARG DESIGNATE_BUNDLE=quay.io/openstack-k8s-operators/designate-operator-bundle:latest
 
 # Build the manager binary
 FROM $GOLANG_CTX as builder
@@ -59,6 +60,7 @@ FROM $CINDER_BUNDLE as cinder-bundle
 FROM $MANILA_BUNDLE as manila-bundle
 FROM $SWIFT_BUNDLE as swift-bundle
 FROM $OCTAVIA_BUNDLE as octavia-bundle
+FROM $DESIGNATE_BUNDLE as designate-bundle
 
 FROM $GOLANG_CTX as merger
 WORKDIR /workspace
@@ -87,6 +89,7 @@ COPY --from=cinder-bundle /manifests/* /manifests/
 COPY --from=manila-bundle /manifests/* /manifests/
 COPY --from=swift-bundle /manifests/* /manifests/
 COPY --from=octavia-bundle /manifests/* /manifests/
+COPY --from=designate-bundle /manifests/* /manifests/
 
 # extract all the env vars (NOTE/FIXME: base-csv is unused below to be refactored)
 RUN /workspace/csv-merger \
@@ -109,6 +112,7 @@ RUN /workspace/csv-merger \
   --manila-csv=/manifests/manila-operator.clusterserviceversion.yaml \
   --swift-csv=/manifests/swift-operator.clusterserviceversion.yaml \
   --octavia-csv=/manifests/octavia-operator.clusterserviceversion.yaml \
+  --designate-csv=/manifests/designate-operator.clusterserviceversion.yaml \
   --base-csv=/manifests/openstack-operator.clusterserviceversion.yaml | tee /fixme-required-for-now-but-will-can-made-optional.yaml
 
 # apply all the ENV vars to the actual base-csv