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.

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

Fix empty module annotations #715

Merged
merged 9 commits into from
Dec 23, 2024
Merged

Fix empty module annotations #715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e8a56d7
empty module annotations
petar-cvit Dec 17, 2024
12ce0e6
module status struct
petar-cvit Dec 17, 2024
6946c5f
⚙️ update cyclops to v0.16.0-rc.2
github-actions[bot] Dec 17, 2024
f181ea1
v0.1.16
petar-cvit Dec 18, 2024
6be5308
v0.1.17
petar-cvit Dec 18, 2024
7611f53
cyclops ui 0.1.7
petar-cvit Dec 23, 2024
876a9f2
empty module annotations
petar-cvit Dec 17, 2024
7fbd452
module status struct
petar-cvit Dec 17, 2024
3f73bd0
Merge branch 'gitops-checkbox' into empty-module-annotations
petar-cvit Dec 23, 2024
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
7 changes: 6 additions & 1 deletion cyclops-ctrl/internal/controller/modules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ func (m *Modules) CreateModule(ctx *gin.Context) {

m.telemetryClient.ModuleCreation()

if len(module.GetAnnotations()[v1alpha1.GitOpsWriteRepoAnnotation]) != 0 {
if module.GetAnnotations() != nil && len(module.GetAnnotations()[v1alpha1.GitOpsWriteRepoAnnotation]) != 0 {
err := m.gitWriteClient.Write(module)
if err != nil {
fmt.Println(err)
Expand Down Expand Up @@ -340,6 +340,11 @@ func (m *Modules) UpdateModule(ctx *gin.Context) {

annotations := curr.GetAnnotations()
moduleAnnotations := module.GetAnnotations()

if annotations == nil {
annotations = make(map[string]string)
}

if moduleAnnotations != nil {
if _, ok := moduleAnnotations["cyclops-ui.com/write-repo"]; ok {
annotations["cyclops-ui.com/write-repo"] = moduleAnnotations["cyclops-ui.com/write-repo"]
Expand Down
4 changes: 2 additions & 2 deletions install/cyclops-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ spec:
spec:
containers:
- name: cyclops-ui
image: cyclopsui/cyclops-ui:v0.16.0-rc.1
image: cyclopsui/cyclops-ui:v0.16.0-rc.2
ports:
- containerPort: 80
env:
Expand Down Expand Up @@ -448,7 +448,7 @@ spec:
serviceAccountName: cyclops-ctrl
containers:
- name: cyclops-ctrl
image: cyclopsui/cyclops-ctrl:v0.16.0-rc.1
image: cyclopsui/cyclops-ctrl:v0.16.0-rc.2
ports:
- containerPort: 8080
env:
Expand Down
Loading