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

implement rollback endpoint #773

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

implement rollback endpoint #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dc057b1
implement rollback endpoint
petar-cvit Mar 7, 2025
d9e491b
map target ns on rendering generation manifest
petar-cvit Mar 10, 2025
b151036
update module crd
petar-cvit Mar 14, 2025
4a268e8
indent module crd
petar-cvit Mar 14, 2025
0704cec
call rollback endpoint
petar-cvit Mar 14, 2025
9a8b557
update module crd
petar-cvit Mar 14, 2025
229d533
optional status fields
petar-cvit Mar 16, 2025
a53bbe1
Merge branch 'main' into map-target-namespace-on-rollback
petar-cvit Mar 16, 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
9 changes: 6 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 @@ -111,9 +111,12 @@ type HistoryTemplateRef struct {
}

type HistoryEntry struct {
Generation int64 `json:"generation"`
TemplateRef HistoryTemplateRef `json:"template"`
Values apiextensionsv1.JSON `json:"values"`
Generation int64 `json:"generation"`

// +kubebuilder:validation:Optional
TargetNamespace string `json:"targetNamespace"`
TemplateRef HistoryTemplateRef `json:"template"`
Values apiextensionsv1.JSON `json:"values"`
}

//+kubebuilder:object:root=true
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 @@ -32,6 +32,8 @@ spec:
generation:
format: int64
type: integer
targetNamespace:
type: string
template:
properties:
path:
Expand Down
157 changes: 156 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 @@ -409,7 +409,8 @@ func (m *Modules) UpdateModule(ctx *gin.Context) {
}

module.History = append([]v1alpha1.HistoryEntry{{
Generation: curr.Generation,
Generation: curr.Generation,
TargetNamespace: curr.Spec.TargetNamespace,
TemplateRef: v1alpha1.HistoryTemplateRef{
URL: curr.Spec.TemplateRef.URL,
Path: curr.Spec.TemplateRef.Path,
Expand Down Expand Up @@ -443,6 +444,160 @@ func (m *Modules) UpdateModule(ctx *gin.Context) {
ctx.Status(http.StatusOK)
}

func (m *Modules) HistoryEntryManifest(ctx *gin.Context) {
ctx.Header("Access-Control-Allow-Origin", "*")

var request dto.RollbackRequest
if err := ctx.BindJSON(&request); err != nil {
fmt.Println(err)
ctx.JSON(http.StatusBadRequest, dto.NewError("Error mapping module request", err.Error()))
return
}

curr, err := m.kubernetesClient.GetModule(request.ModuleName)
if err != nil {
fmt.Println(err)
ctx.JSON(http.StatusInternalServerError, dto.NewError("Error fetching module", err.Error()))
return
}

var targetGeneration *v1alpha1.HistoryEntry
for _, entry := range curr.History {
if entry.Generation == request.Generation {
targetGeneration = &entry
break
}
}

if targetGeneration == nil {
ctx.JSON(http.StatusInternalServerError, dto.NewError("Invalid rollback generation provided", fmt.Sprintf("Generation %d does not exist", request.Generation)))
return
}

targetTemplate, err := m.templatesRepo.GetTemplate(
targetGeneration.TemplateRef.URL,
targetGeneration.TemplateRef.Path,
targetGeneration.TemplateRef.Version,
"",
targetGeneration.TemplateRef.SourceType,
)
if err != nil {
fmt.Println(err)
ctx.Status(http.StatusInternalServerError)
return
}

manifest, err := m.renderer.HelmTemplate(v1alpha1.Module{
ObjectMeta: metav1.ObjectMeta{
Name: request.ModuleName,
},
Spec: v1alpha1.ModuleSpec{
TargetNamespace: targetGeneration.TargetNamespace,
TemplateRef: v1alpha1.TemplateRef{
URL: targetGeneration.TemplateRef.URL,
Path: targetGeneration.TemplateRef.Path,
Version: targetGeneration.TemplateRef.Version,
SourceType: targetGeneration.TemplateRef.SourceType,
},
Values: targetGeneration.Values,
},
}, targetTemplate)
if err != nil {
fmt.Println(err)
ctx.Status(http.StatusInternalServerError)
return
}

manifest = strings.TrimPrefix(manifest, "\n---")
manifest = strings.TrimSuffix(manifest, "---\n")

ctx.String(http.StatusOK, manifest)
}

func (m *Modules) RollbackModule(ctx *gin.Context) {
ctx.Header("Access-Control-Allow-Origin", "*")

var request dto.RollbackRequest
if err := ctx.BindJSON(&request); err != nil {
fmt.Println(err)
ctx.JSON(http.StatusBadRequest, dto.NewError("Error mapping module request", err.Error()))
return
}

curr, err := m.kubernetesClient.GetModule(request.ModuleName)
if err != nil {
fmt.Println(err)
ctx.JSON(http.StatusInternalServerError, dto.NewError("Error fetching module", err.Error()))
return
}

var targetGeneration *v1alpha1.HistoryEntry
for _, entry := range curr.History {
if entry.Generation == request.Generation {
targetGeneration = &entry
break
}
}

if targetGeneration == nil {
ctx.JSON(http.StatusInternalServerError, dto.NewError("Invalid rollback generation provided", fmt.Sprintf("Generation %d does not exist", request.Generation)))
return
}

module := curr.DeepCopy()

module.Kind = "Module"
module.APIVersion = "cyclops-ui.com/v1alpha1"

history := module.History
if module.History == nil {
history = make([]v1alpha1.HistoryEntry, 0)
}

module.History = append([]v1alpha1.HistoryEntry{{
Generation: curr.Generation,
TemplateRef: v1alpha1.HistoryTemplateRef{
URL: curr.Spec.TemplateRef.URL,
Path: curr.Spec.TemplateRef.Path,
Version: curr.Status.TemplateResolvedVersion,
SourceType: curr.Spec.TemplateRef.SourceType,
},
Values: curr.Spec.Values,
}}, history...)

if len(module.History) > 10 {
module.History = module.History[:len(module.History)-1]
}

module.Spec.Values = targetGeneration.Values
module.Spec.TemplateRef = v1alpha1.TemplateRef{
URL: targetGeneration.TemplateRef.URL,
Path: targetGeneration.TemplateRef.Path,
Version: targetGeneration.TemplateRef.Version,
SourceType: targetGeneration.TemplateRef.SourceType,
}
module.Spec.TargetNamespace = targetGeneration.TargetNamespace

module.SetResourceVersion(curr.GetResourceVersion())

result, err := m.kubernetesClient.UpdateModuleStatus(module)
if err != nil {
fmt.Println(err)
ctx.JSON(http.StatusInternalServerError, dto.NewError("Error updating module status", err.Error()))
return
}

module.ResourceVersion = result.ResourceVersion
err = m.kubernetesClient.UpdateModule(module)
if err != nil {
fmt.Println(err)
ctx.JSON(http.StatusInternalServerError, dto.NewError("Error updating module", err.Error()))
return
}

ctx.Status(http.StatusOK)
}

func (m *Modules) ReconcileModule(ctx *gin.Context) {
ctx.Header("Access-Control-Allow-Origin", "*")

Expand Down
2 changes: 2 additions & 0 deletions cyclops-ctrl/internal/handler/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ func (h *Handler) Start() error {
h.router.DELETE("/modules/:name", modulesController.DeleteModule)
h.router.POST("/modules/new", modulesController.CreateModule)
h.router.POST("/modules/update", modulesController.UpdateModule)
h.router.POST("/modules/rollback/manifest", modulesController.HistoryEntryManifest)
h.router.POST("/modules/rollback", modulesController.RollbackModule)
h.router.GET("/modules/:name/raw", modulesController.GetRawModuleManifest)
h.router.POST("/modules/:name/reconcile", modulesController.ReconcileModule)
h.router.GET("/modules/:name/history", modulesController.GetModuleHistory)
Expand Down
5 changes: 5 additions & 0 deletions cyclops-ctrl/internal/models/dto/modules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ type TemplatesResponse struct {
New string `json:"new"`
}

type RollbackRequest struct {
ModuleName string `json:"moduleName"`
Generation int64 `json:"generation"`
}

type DeleteResource struct {
Group string `json:"group"`
Version string `json:"version"`
Expand Down
53 changes: 27 additions & 26 deletions cyclops-ui/src/components/pages/History.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from "react";
import { Button, Col, Modal, Row, Table, Typography } from "antd";
import { Button, Col, Modal, Row, Spin, Table, Typography } from "antd";
import axios from "axios";
import { useParams } from "react-router-dom";
import ReactDiffViewer from "react-diff-viewer";
Expand All @@ -22,6 +22,7 @@ const ModuleHistory = () => {
description: "",
});

const [loadingDiff, setLoadingDiff] = useState(false);
const [diff, setDiff] = useState({
curr: "",
previous: "",
Expand Down Expand Up @@ -69,18 +70,10 @@ const ModuleHistory = () => {
generation: 0,
});

let target: any = {};
historyEntries.forEach((h: any) => {
if (h.generation === diffModal.generation) {
target = h;
}
});

axios
.post(`/api/modules/update`, {
values: target.values,
name: moduleName,
template: target.template,
.post(`/api/modules/rollback`, {
moduleName: moduleName,
generation: diffModal.generation,
})
.then((res) => {
window.location.href = "/modules/" + moduleName;
Expand Down Expand Up @@ -112,10 +105,11 @@ const ModuleHistory = () => {
}
});

setLoadingDiff(true);
axios
.post("/api/modules/" + moduleName + "/manifest", {
template: target.template,
values: target.values,
.post("/api/modules/rollback/manifest", {
moduleName: moduleName,
generation: target.generation,
})
.then(function (res) {
setDiff({
Expand All @@ -125,6 +119,9 @@ const ModuleHistory = () => {
})
.catch(function (error) {
setError(mapResponseError(error));
})
.finally(() => {
setLoadingDiff(false);
});

setDiffModal({
Expand All @@ -142,9 +139,9 @@ const ModuleHistory = () => {
});

axios
.post("/api/modules/" + moduleName + "/manifest", {
template: target.template,
values: target.values,
.post("/api/modules/rollback/manifest", {
moduleName: moduleName,
generation: target.generation,
})
.then(function (res) {
setManifest(res.data);
Expand Down Expand Up @@ -255,14 +252,18 @@ const ModuleHistory = () => {
onCancel={handleCancelDiff}
width={"60%"}
>
<ReactDiffViewer
oldValue={diff.curr}
newValue={diff.previous}
splitView={true}
leftTitle={"current"}
rightTitle={"previous"}
useDarkTheme={mode === "dark"}
/>
{loadingDiff ? (
<Spin />
) : (
<ReactDiffViewer
oldValue={diff.curr}
newValue={diff.previous}
splitView={true}
leftTitle={"current"}
rightTitle={"previous"}
useDarkTheme={mode === "dark"}
/>
)}
</Modal>
<Button
style={{ float: "right" }}
Expand Down
2 changes: 2 additions & 0 deletions install/cyclops-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ spec:
generation:
format: int64
type: integer
targetNamespace:
type: string
template:
properties:
path:
Expand Down