Skip to content

Namespace fixes for microshift #1030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Namespace fixes for microshift #1030

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,10 +634,11 @@ operator_namespace: ## creates the namespace specified via OPERATOR_NAMESPACE en
$(eval $(call vars,$@))
bash scripts/gen-namespace.sh
oc apply -f ${OUT}/${OPERATOR_NAMESPACE}/namespace.yaml
timeout $(TIMEOUT) bash -c "while ! (oc get project.v1.project.openshift.io ${OPERATOR_NAMESPACE}); do sleep 1; done"
ifeq ($(MICROSHIFT) ,0)
timeout $(TIMEOUT) bash -c "while ! (oc get project.v1.project.openshift.io ${OPERATOR_NAMESPACE}); do sleep 1; done"
oc project ${OPERATOR_NAMESPACE}
else
timeout $(TIMEOUT) bash -c "while ! (oc get namespace ${OPERATOR_NAMESPACE}); do sleep 1; done"
oc config set-context --current --namespace=${OPERATOR_NAMESPACE}
oc adm policy add-scc-to-user privileged -z default --namespace ${OPERATOR_NAMESPACE}
endif
Expand All @@ -648,10 +649,11 @@ namespace: ## creates the namespace specified via NAMESPACE env var (defaults to
$(eval $(call vars,$@))
bash scripts/gen-namespace.sh
oc apply -f ${OUT}/${NAMESPACE}/namespace.yaml
timeout $(TIMEOUT) bash -c "while ! (oc get project.v1.project.openshift.io ${NAMESPACE}); do sleep 1; done"
ifeq ($(MICROSHIFT) ,0)
timeout $(TIMEOUT) bash -c "while ! (oc get project.v1.project.openshift.io ${NAMESPACE}); do sleep 1; done"
oc project ${NAMESPACE}
else
timeout $(TIMEOUT) bash -c "while ! (oc get namespace ${NAMESPACE}); do sleep 1; done"
oc config set-context --current --namespace=${NAMESPACE}
oc adm policy add-scc-to-user privileged -z default --namespace ${NAMESPACE}
endif
Expand All @@ -661,7 +663,11 @@ namespace_cleanup: ## deletes the namespace specified via NAMESPACE env var, als
$(eval $(call vars,$@))
make keystone_cleanup
make mariadb_cleanup
ifeq ($(MICROSHIFT) ,0)
oc delete project ${NAMESPACE}
else
oc delete namespace ${NAMESPACE}
endif
${CLEANUP_DIR_CMD} ${OUT}/${NAMESPACE}

##@ SERVICE INPUT
Expand Down