Skip to content

gitops write child resources #860

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 12 commits into
base: main
Choose a base branch
from
Open

gitops write child resources #860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f7e02c4
add write child resources to crd
petar-cvit Jun 27, 2025
1a8d0d2
add toggle for pushing child resources to git
petar-cvit Jun 27, 2025
4a28229
pass git write client to reconciler
petar-cvit Jun 30, 2025
d016838
push resources to separate folder
petar-cvit Jul 1, 2025
4c575a2
update CRD install
petar-cvit Jul 1, 2025
26a2b58
⚙️ update cyclops to v0.22.0-rc.2
github-actions[bot] Jul 1, 2025
3926135
bump to v0.21.1
petar-cvit Jul 7, 2025
4e92dce
create module in local cluster
petar-cvit Jul 7, 2025
47bbc91
Merge pull request #862 from cyclops-ui/create-gitops-module-in-cluster
petar-cvit Jul 16, 2025
a4d5d81
remove unused write method
petar-cvit Jul 22, 2025
26d45c7
remove yaml separator
petar-cvit Jul 22, 2025
7c26a6e
optional write child resouces flag
petar-cvit Jul 28, 2025
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Cyclops can either be installed manually by applying the latest manifest, by usi
To install Cyclops using `kubectl` into your cluster, run the commands below:

```bash
kubectl apply -f https://raw.githubusercontent.com/cyclops-ui/cyclops/v0.21.0/install/cyclops-install.yaml && kubectl apply -f https://raw.githubusercontent.com/cyclops-ui/cyclops/v0.21.0/install/demo-templates.yaml
kubectl apply -f https://raw.githubusercontent.com/cyclops-ui/cyclops/v0.21.1/install/cyclops-install.yaml && kubectl apply -f https://raw.githubusercontent.com/cyclops-ui/cyclops/v0.21.1/install/demo-templates.yaml
```

It will create a new namespace called `cyclops` and deploy everything you need for your Cyclops instance to run.
Expand Down
10 changes: 7 additions & 3 deletions cyclops-ctrl/api/v1alpha1/module_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ const (
TemplateSourceTypeHelm TemplateSourceType = "helm"
TemplateSourceTypeOCI TemplateSourceType = "oci"

GitOpsWriteRepoAnnotation = "cyclops-ui.com/write-repo"
GitOpsWritePathAnnotation = "cyclops-ui.com/write-path"
GitOpsWriteRevisionAnnotation = "cyclops-ui.com/write-revision"
GitOpsWriteRepoAnnotation = "cyclops-ui.com/write-repo"
GitOpsWritePathAnnotation = "cyclops-ui.com/write-path"
GitOpsWriteRevisionAnnotation = "cyclops-ui.com/write-revision"
GitOpsWriteResourcesAnnotation = "cyclops-ui.com/write-child-resources"

ModuleManagerLabel = "cyclops-ui.com/module-manager"

Expand All @@ -60,6 +61,9 @@ type GitOpsWriteDestination struct {
Repo string `json:"repo"`
Path string `json:"path"`
Version string `json:"version"`

// +kubebuilder:validation:Optional
WriteResources bool `json:"writeResources"`
}

type TemplateRef struct {
Expand Down
1 change: 1 addition & 0 deletions cyclops-ctrl/cmd/main/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ func main() {
mgr.GetScheme(),
templatesRepo,
k8sClient,
gitWriteClient,
renderer,
getMaxConcurrentReconciles(),
telemetryClient,
Expand Down
2 changes: 2 additions & 0 deletions cyclops-ctrl/config/crd/bases/cyclops-ui.com_modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ spec:
type: string
version:
type: string
writeResources:
type: boolean
required:
- path
- repo
Expand Down
2 changes: 2 additions & 0 deletions cyclops-ctrl/config/crd/bases/cyclops-ui.com_templatestores.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ spec:
type: string
version:
type: string
writeResources:
type: boolean
required:
- path
- repo
Expand Down
5 changes: 2 additions & 3 deletions cyclops-ctrl/internal/controller/modules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,12 +314,11 @@ func (m *Modules) CreateModule(ctx *gin.Context) {
m.telemetryClient.ModuleCreation()

if module.GetAnnotations() != nil && len(module.GetAnnotations()[v1alpha1.GitOpsWriteRepoAnnotation]) != 0 {
err := m.gitWriteClient.Write(module)
err := m.gitWriteClient.WriteModule(module)
if err != nil {
fmt.Println(err)
ctx.JSON(http.StatusInternalServerError, dto.NewError("Error pushing to git", err.Error()))
}
return
}

err = m.kubernetesClient.CreateModule(module)
Expand Down Expand Up @@ -400,7 +399,7 @@ func (m *Modules) UpdateModule(ctx *gin.Context) {
module.SetAnnotations(annotations)

if len(module.GetAnnotations()[v1alpha1.GitOpsWriteRepoAnnotation]) != 0 {
err := m.gitWriteClient.Write(module)
err := m.gitWriteClient.WriteModule(module)
if err != nil {
fmt.Println(err)
ctx.JSON(http.StatusInternalServerError, dto.NewError("Error pushing to git", err.Error()))
Expand Down
Loading