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

[Addon] GitOps addon #411

Draft
wants to merge 36 commits into
base: master
Choose a base branch
from
Draft

Conversation

MimicTester1307
Copy link

@MimicTester1307 MimicTester1307 commented Jul 15, 2022

Description of your changes

Fixes #3205

How has this code been tested?

Checklist

I have:

  • Title of the PR starts with type (e.g. [Addon] , [example] or [Doc]).
  • Updated/Added any relevant documentation and examples.
  • New addon should be put in experimental.
  • Update addon should modify the version in metadata.yaml to generate a new version.
  • Any changes about verified addons should be tested with CI script.

@MimicTester1307
Copy link
Author

@FogDong Draft PR like you suggested.

@FogDong
Copy link
Member

FogDong commented Jul 18, 2022

Every time you commit, please use -s the sign the DCO like git commit -s

@MimicTester1307
Copy link
Author

MimicTester1307 commented Jul 18, 2022

Every time you commit, please use -s the sign the DCO like git commit -s

Sure. I'm sorry about that. It skipped my mind.

@MimicTester1307 MimicTester1307 changed the title Feat: Implement GitOps addon [Addon] GitOps addon Jul 28, 2022
MimicTester1307 and others added 12 commits July 28, 2022 18:59
Signed-off-by: MimicTester1307 <excel.chukwu@ashesi.edu.gh>
Signed-off-by: MimicTester1307 <excel.chukwu@ashesi.edu.gh>
Signed-off-by: MimicTester1307 <excel.chukwu@ashesi.edu.gh>
Signed-off-by: MimicTester1307 <excel.chukwu@ashesi.edu.gh>
Signed-off-by: MimicTester1307 <excel.chukwu@ashesi.edu.gh>
Signed-off-by: MimicTester1307 <excel.chukwu@ashesi.edu.gh>
Signed-off-by: MimicTester1307 <excel.chukwu@ashesi.edu.gh>
* Feat: add grafana addon

Signed-off-by: Yin Da <yd219913@alibaba-inc.com>

* Fix: add dependency test for grafana

Signed-off-by: Yin Da <yd219913@alibaba-inc.com>
* wip add clickhouse addon

Signed-off-by: Jianbo Sun <jianbo.sjb@alibaba-inc.com>

* add clickhouse addon

Signed-off-by: Jianbo Sun <jianbo.sjb@alibaba-inc.com>

* use auto detect

Signed-off-by: Jianbo Sun <jianbo.sjb@alibaba-inc.com>

* Add clickhouse addon

Signed-off-by: Jianbo Sun <jianbo.sjb@alibaba-inc.com>

* update readme for clickhouse

Signed-off-by: Jianbo Sun <jianbo.sjb@alibaba-inc.com>
Signed-off-by: MimicTester1307 <excel.chukwu@ashesi.edu.gh>
@MimicTester1307
Copy link
Author

MimicTester1307 commented Jul 29, 2022

Hi @FogDong, I will attempt a rebase to update the commit messages I previously did not sign off.

}
path: parameter.paths.glob
suspend: parameter.suspend
prune: parameter.prune
Copy link
Member

Choose a reason for hiding this comment

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

Are these fields the same in the argocd and fluxcd?

Copy link
Author

Choose a reason for hiding this comment

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

Yes, most of them are. I modified the path though. Fluxcd has just parameter.paths, but I added parameter.paths.glob so that the user can specify a generic file or folder pattern for system to match. I can change it though.


template: {
output: {
if parameter.agent == "fluxcd" {
Copy link
Member

Choose a reason for hiding this comment

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

I suggest that you can separate the entire CR of fluxcd and argocd with if, not just the apiVersion.

Copy link
Author

Choose a reason for hiding this comment

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

Sure, I am working on that now.

MimicTester1307 and others added 4 commits August 9, 2022 12:21
# Conflicts:
#	addons/grafana/parameter.cue
#	addons/grafana/resources/grafana-dashboard-kubevela-system.cue
#	addons/grafana/resources/grafana-storage.cue
#	addons/grafana/template.cue
#	test/e2e-test/addon-test/main.go
Signed-off-by: MimicTester1307 <excel.chukwu@ashesi.edu.gh>
Signed-off-by: MimicTester1307 <excel.chukwu@ashesi.edu.gh>
MimicTester1307 and others added 13 commits August 10, 2022 14:19
Signed-off-by: MimicTester1307 <excel.chukwu@ashesi.edu.gh>
Signed-off-by: MimicTester1307 <excel.chukwu@ashesi.edu.gh>
Signed-off-by: MimicTester1307 <excel.chukwu@ashesi.edu.gh>
Signed-off-by: MimicTester1307 <excel.chukwu@ashesi.edu.gh>
Signed-off-by: MimicTester1307 <excel.chukwu@ashesi.edu.gh>
Signed-off-by: MimicTester1307 <excel.chukwu@ashesi.edu.gh>
Signed-off-by: MimicTester1307 <excel.chukwu@ashesi.edu.gh>
Signed-off-by: MimicTester1307 <excel.chukwu@ashesi.edu.gh>
repoURL: parameter.url
targetRevision: HEAD
path: ""
}
Copy link
Member

@FogDong FogDong Sep 13, 2022

Choose a reason for hiding this comment

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

Is the path from user?

Copy link
Author

Choose a reason for hiding this comment

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

It represents the cluster path. 🤔 Thinking about it now, it could or could not be supplied by the user. I can make it user-supplied for more flexibility?

Copy link
Member

@FogDong FogDong Sep 15, 2022

Choose a reason for hiding this comment

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

Vela also has the capability of multi-cluster, maybe we can combine them together.

}

outputs: { // for applications, multiple can be defined
// should I use what is in experimental argocd (application.cue)? It seems like there is a lot of repetition
Copy link
Member

Choose a reason for hiding this comment

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

This should be the ArgoCD gitops App..


syncPolicy: {
syncOptions: {
CreateNamespace=true
Copy link
Member

Choose a reason for hiding this comment

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

Is this a valid cue? I suppose the agent=argocd can not work right now.

Copy link
Author

Choose a reason for hiding this comment

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

Not yet...

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

4 participants