[Addon] Update to Flux2 #722
Merged
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
Signed-off-by: Kim Christensen <kimworking@gmail.com>
kichristensen
requested review from
wangyikewxgm,
FogDong and
charlie0129
as code owners
Signed-off-by: Kim Christensen <kimworking@gmail.com>
kichristensen
force-pushed
the
updateFlux
branch
from
08148ce
to
0ba733b
Compare
Signed-off-by: Kim Christensen <kimworking@gmail.com>
kichristensen
force-pushed
the
updateFlux
branch
from
d644500
to
c9b40e7
Compare
|
Anything remaining to do to get this merged? |
FogDong
reviewed
Nov 21, 2023
| metadata: { | ||
| name: context.name | ||
| } | ||
| if parameter.repoType == "git" { | ||
| kind: "GitRepository" | ||
| apiVersion: "source.toolkit.fluxcd.io/v1" | ||
| kind: "GitRepository" | ||
| spec: { | ||
| url: parameter.url | ||
| if parameter.git.branch != _|_ { |
There was a problem hiding this comment.
Suggested change
| if parameter.git.branch != _|_ { | |
| if parameter.git != _|_ { | |
| ref: parameter.git | |
| } |
|
Please resolve the conflicts. |
|
@kichristensen Has progress on this stalled? |
|
@FogDong can you check the MR I opened with the conflicts resolved? #756 |
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.
Description of your changes
Updates the FluxCD addon to Flux2.
Fixes #705
How has this code been tested?
The addon has been tested in my local Kubevela instance.
Checklist
I have:
[Addon],[example]or[Doc]).versioninmetadata.yamlto generate a new version.