Fix UI merge conflict that blocks the UI image build. #346
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This change is |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Tomcli The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/lgtm |
jizg
added a commit
to jizg/kfp-tekton
that referenced
this pull request
Nov 3, 2020
…sanitizing-k8s-objects * commit '3d3ecfb05fc13f400d4aec5ee5a0ca9b13b1566f': feat(sdk): added sanitizing k8s object process and test. Fixes: kubeflow#332 (kubeflow#345) add a warning label to kustomize page (kubeflow#350) make user guide prominent (kubeflow#349) feat(backend): ARTIFACT_COPY_STEP_TEMPLATE - custom template for copy step (kubeflow#336) Add KFP Tekton release deployment yaml (kubeflow#347) Fix UI merge conflict that blocks the UI image build. (kubeflow#346) KFP 1.0.4 Rebase (kubeflow#337) fix(sdk): Quick fix for sanitizing conditional variables (kubeflow#344) fix(backend): cover nil status race condition from Tekton (kubeflow#329) updated titanic-ml generated with kale 0.5.1 (kubeflow#330) Add s3 endpoint instructions for admin use case (kubeflow#323) Add best practice for tekton and other argo executors (kubeflow#338)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue is resolved by this Pull Request:
Resolves #
Description of your changes:
There's a small UI merge conflict that breaks one of the image builds. This PR fixes this bug to make the build passes.
Environment tested:
python --version):tkn version):kubectl version):/etc/os-release):Checklist:
The title for your pull request (PR) should follow our title convention. Learn more about the pull request title convention used in this repository.
PR titles examples:
fix(frontend): fixes empty page. Fixes #1234Use
fixto indicate that this PR fixes a bug.feat(backend): configurable service account. Fixes #1234, fixes #1235Use
featto indicate that this PR adds a new feature.chore: set up changelog generation toolsUse
choreto indicate that this PR makes some changes that users don't need to know.test: fix CI failure. Part of #1234Use
part ofto indicate that a PR is working on an issue, but shouldn't close the issue when merged.Do you want this pull request (PR) cherry-picked into the current release branch?
If yes, use one of the following options:
cherrypick-approvedlabel to this PR. The release manager adds this PR to the release branch in a batch update.