UPSTREAM: <carry>: Move operator-controller openshift files to its own dir

Author: camilamacedo86

openshift/Makefile

@@ -15,7 +15,7 @@ verify: ## Run downstream-specific verify
 
 .PHONY: manifests
 manifests: $(KUSTOMIZE) $(YQ)
-	$(DIR)/generate-manifests.sh
+	$(DIR)/operator-controller/generate-manifests.sh
 
 .PHONY: verify-manifests
 verify-manifests: manifests
@@ -32,6 +32,6 @@ export CATALOG_IMG := $(LOCAL_REGISTRY_HOST)/$(E2E_TEST_CATALOG_V1)
 export DOWNSTREAM_E2E_FLAGS := -count=1 -v -skip 'TestClusterExtensionInstallReResolvesWhenNewCatalog|TestClusterExtensionInstallRegistry/package_requires_mirror_registry_configuration_in_/etc/containers/registries.conf'
 .PHONY: test-e2e
 test-e2e: ## Run the e2e tests.
-	$(DIR)/build-test-registry.sh $(E2E_REGISTRY_NAMESPACE) $(E2E_REGISTRY_NAME) $(E2E_REGISTRY_IMAGE)
+	$(DIR)/operator-controller/build-test-registry.sh $(E2E_REGISTRY_NAMESPACE) $(E2E_REGISTRY_NAME) $(E2E_REGISTRY_IMAGE)
 	cd $(DIR)/../; \
 	go test $(DOWNSTREAM_E2E_FLAGS) ./test/e2e/...;

openshift/operator-controller.Dockerfile

@@ -6,7 +6,7 @@ RUN make go-build-local
 FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
 USER 1001
 COPY --from=builder /build/bin/operator-controller /operator-controller
-COPY openshift/manifests /openshift/manifests
+COPY openshift/operator-controller/manifests /openshift/manifests
 
 LABEL io.k8s.display-name="OpenShift Operator Lifecycle Manager Operator Controller" \
   io.k8s.description="This is a component of OpenShift Container Platform that allows operator installation."

openshift/.gitignore renamed to openshift/operator-controller/.gitignore

@@ -1,6 +1,6 @@
 //go:build tools
 // +build tools
 
-package openshift
+package operator_controller
 
 import _ "github.com/openshift/build-machinery-go"

openshift/build-test-registry.sh renamed to openshift/operator-controller/build-test-registry.sh

@@ -38,7 +38,7 @@ FLAG_MAPPINGS[global-pull-secret]="openshift-config/pull-secret"
 ##################################################
 
 # Know where the repo root is so we can reference things relative to it
-REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
 
 # Source bingo so we can use kustomize and yq
 . "${REPO_ROOT}/openshift/.bingo/variables.env"
@@ -50,8 +50,8 @@ trap 'rm -rf $TMP_ROOT' EXIT
 
 # Copy all kustomize files into a temp dir
 cp -a "${REPO_ROOT}/config" "${TMP_ROOT}/config"
-mkdir -p "${TMP_ROOT}/openshift"
-cp -a "${REPO_ROOT}/openshift/kustomize" "${TMP_ROOT}/openshift/kustomize"
+mkdir -p "${TMP_ROOT}/openshift/operator-controller/"
+cp -a "${REPO_ROOT}/openshift/operator-controller/kustomize" "${TMP_ROOT}/openshift/operator-controller/kustomize"
 
 # Override OPENSHIFT-NAMESPACE to ${NAMESPACE}
 find "${TMP_ROOT}" -name "*.yaml" -exec sed -i'.bak' "s/OPENSHIFT-NAMESPACE/${NAMESPACE}/g" {} \;
@@ -63,7 +63,7 @@ mkdir -p "$TMP_MANIFEST_DIR"
 
 # Run kustomize, which emits a single yaml file
 TMP_KUSTOMIZE_OUTPUT="${TMP_MANIFEST_DIR}/temp.yaml"
-$KUSTOMIZE build "${TMP_ROOT}/openshift/kustomize/overlays/openshift" -o "$TMP_KUSTOMIZE_OUTPUT"
+$KUSTOMIZE build "${TMP_ROOT}/openshift/operator-controller/kustomize/overlays/openshift" -o "$TMP_KUSTOMIZE_OUTPUT"
 
 for container_name in "${!IMAGE_MAPPINGS[@]}"; do
   placeholder="${IMAGE_MAPPINGS[$container_name]}"
@@ -98,7 +98,7 @@ done
 rm "$TMP_KUSTOMIZE_OUTPUT"
 
 # Delete and recreate the actual manifests directory
-MANIFEST_DIR="${REPO_ROOT}/openshift/manifests"
+MANIFEST_DIR="${REPO_ROOT}/openshift/operator-controller/manifests"
 rm -rf "${MANIFEST_DIR}"
 mkdir -p "${MANIFEST_DIR}"
 

openshift/dependencies.go renamed to openshift/operator-controller/dependencies.go

@@ -2,9 +2,9 @@
 namespace: OPENSHIFT-NAMESPACE
 
 resources:
-  - ../../../../../config/base/crd
-  - ../../../../../config/base/rbac
-  - ../../../../../config/base/manager
+  - ../../../../../../config/base/crd
+  - ../../../../../../config/base/rbac
+  - ../../../../../../config/base/manager
   - trusted-ca/operator_controller_trusted_ca_configmap.yaml
 
 patches:

openshift/generate-manifests.sh renamed to openshift/operator-controller/generate-manifests.sh

@@ -10,7 +10,7 @@ FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
 USER 1001
 COPY --from=builder /build/registry /registry
 COPY --from=builder /build/push /push
-COPY openshift/manifests /openshift/manifests
+COPY openshift/operator-controller/manifests /openshift/manifests
 COPY testdata/images /images
 
 LABEL io.k8s.display-name="OpenShift Operator Lifecycle Manager Operator Controller E2E Registry" \