*: integrate the copy-content binary

Signed-off-by: Steve Kuznetsov <[email protected]>

Author: stevekuznetsov

Makefile

@@ -55,7 +55,7 @@ ifeq (, $(wildcard $(KUBEBUILDER_ASSETS)/kube-apiserver))
 	$(error kube-apiserver $(KUBEBUILDER_ASSETS_ERR))
 endif
 
-build: $(REGISTRY_CMDS) $(OLM_CMDS) $(OPM) ## build opm and olm binaries
+build: $(REGISTRY_CMDS) $(OLM_CMDS) $(OPM) bin/copy-content ## build opm and olm binaries
 
 build/opm:
 	$(MAKE) $(OPM)
@@ -64,7 +64,7 @@ build/registry:
 	$(MAKE) $(REGISTRY_CMDS) $(OPM)
 
 build/olm:
-	$(MAKE) $(PSM_CMD) $(OLM_CMDS) $(COLLECT_PROFILES_CMD)
+	$(MAKE) $(PSM_CMD) $(OLM_CMDS) $(COLLECT_PROFILES_CMD) bin/copy-content
 
 $(OPM): version_flags=-ldflags "-X '$(REGISTRY_PKG)/cmd/opm/version.gitCommit=$(GIT_COMMIT)' -X '$(REGISTRY_PKG)/cmd/opm/version.opmVersion=$(OPM_VERSION)' -X '$(REGISTRY_PKG)/cmd/opm/version.buildDate=$(BUILD_DATE)'"
 $(OPM):
@@ -104,6 +104,9 @@ bin/kubebuilder:
 bin/cpb: FORCE
 	CGO_ENABLED=0 go build $(GO_BUILD_OPTS) -ldflags '-extldflags "-static"' -o $@ github.com/operator-framework/operator-lifecycle-manager/util/cpb
 
+bin/copy-content: FORCE
+	CGO_ENABLED=0 go build $(GO_BUILD_OPTS) -ldflags '-extldflags "-static"' -o $@ github.com/operator-framework/operator-lifecycle-manager/cmd/copy-content
+
 unit/olm: bin/kubebuilder
 	@echo "Running the OLM unit tests"
 	$(MAKE) unit WHAT=operator-lifecycle-manager

cmds.go

@@ -2,6 +2,7 @@ package cmds
 
 import (
 	_ "github.com/operator-framework/operator-lifecycle-manager/cmd/catalog"
+	_ "github.com/operator-framework/operator-lifecycle-manager/cmd/copy-content"
 	_ "github.com/operator-framework/operator-lifecycle-manager/cmd/olm"
 	_ "github.com/operator-framework/operator-lifecycle-manager/cmd/package-server"
 	_ "github.com/operator-framework/operator-lifecycle-manager/util/cpb"

operator-lifecycle-manager.Dockerfile

@@ -4,9 +4,9 @@ ENV GO111MODULE auto
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
 
-# Permit the cpb binary to be compiled statically. The Red Hat compiler
+# Permit the cpb and copy-content binaries to be compiled statically. The Red Hat compiler
 # provided by ART will otherwise force FIPS compliant dynamic compilation.
-ENV GO_COMPLIANCE_EXCLUDE="build.*operator-lifecycle-manager/util/cpb"
+ENV GO_COMPLIANCE_EXCLUDE="build.*operator-lifecycle-manager/(util/cpb|cmd/copy-content)"
 
 WORKDIR /build
 
@@ -30,6 +30,7 @@ COPY --from=builder /build/bin/collect-profiles /bin/collect-profiles
 COPY --from=builder /build/bin/package-server /bin/package-server
 COPY --from=builder /build/bin/cpb /bin/cpb
 COPY --from=builder /build/bin/psm /bin/psm
+COPY --from=builder /build/bin/copy-content /bin/copy-content
 
 # This image doesn't need to run as root user.
 USER 1001

vendor/github.com/operator-framework/operator-lifecycle-manager/cmd/copy-content/main.go

@@ -663,6 +663,7 @@ github.com/operator-framework/api/pkg/validation/internal
 # github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000 => ./staging/operator-lifecycle-manager
 ## explicit; go 1.20
 github.com/operator-framework/operator-lifecycle-manager/cmd/catalog
+github.com/operator-framework/operator-lifecycle-manager/cmd/copy-content
 github.com/operator-framework/operator-lifecycle-manager/cmd/olm
 github.com/operator-framework/operator-lifecycle-manager/cmd/package-server
 github.com/operator-framework/operator-lifecycle-manager/pkg/api/client