Skip to content
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.

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

Fix makefile issues due to rebasing over PR #35 #37

Merged
merged 1 commit into from
Apr 3, 2020

Conversation

amisevsk
Copy link
Collaborator

@amisevsk amisevsk commented Apr 3, 2020

What does this PR do?

Fix the makefile after rebasing over #35, which moved some yamls around in the deploy folder -- I failed to check for this before merging.

It also adds support for setting default routing class when deploying.

Is it tested? How?

Tested on crc with options

export IMG=amisevsk/che-workspace-controller:dev
export OPERATOR_NAME=che-workspace-operator
export WEBHOOK_ENABLED=true
export DEFAULT_ROUTING=openshift-oauth

@amisevsk amisevsk changed the title Fix issues due to rebasing over 0937b33 (PR #35) Fix makefile issues due to rebasing over PR #35 Apr 3, 2020
The makefile was rebased over a commit which moves some deployment yamls
around, breaking many of the rules.

Signed-off-by: Angel Misevski <amisevsk@redhat.com>
Copy link
Member

@sleshchenko sleshchenko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested, the made changes work fine for me

# It's safer to delete all workspaces before deleting the controller; otherwise we could
# leave workspaces in a hanging state if we add finalizers.
# It's safer to delete all workspaces before deleting the controller; otherwise we could
# leave workspaces in a hanging state if we add finalizers.
ifneq ($(shell command -v kubectl),)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it does not work for me for some reasons I don't understand because of limited knowledge of makefiles
Screenshot_20200403_124352

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sleshchenko sleshchenko merged commit d897cd7 into devfile:master Apr 3, 2020
JPinkney pushed a commit to JPinkney/che-workspace-operator that referenced this pull request May 13, 2021
* Rather than break if kustomize is not installed, use the same logic in the DWO repo, and just install it on demand. Also add support for --default-image flag so we can pass in CRW version of DWCO image and regen yamls

Change-Id: I72ce08ac31ae280261e1685502c10b73d7a04d88
Signed-off-by: nickboldt <nboldt@redhat.com>

* fix fallback image values so even if we use default values, we can override with DEFAULT_IMAGE; add missing quotes

Change-Id: I287a811d3b05409cd71f3e0c2f898020a660f244
Signed-off-by: nickboldt <nboldt@redhat.com>
@amisevsk amisevsk deleted the fix-makefile branch February 8, 2023 15:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants