Skip to content

Batch module reconciliation #840

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

Batch module reconciliation #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6022fb
batch reconcile endpoing
petar-cvit May 23, 2025
7a0d9f4
batch reconcile button
petar-cvit May 23, 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
49 changes: 39 additions & 10 deletions cyclops-ctrl/internal/controller/modules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,18 +604,54 @@ func (m *Modules) RollbackModule(ctx *gin.Context) {
ctx.Status(http.StatusOK)
}

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

type ReconcileModulesReq struct {
Modules []string `json:"modules"`
}

var request struct {
Modules []string `json:"modules"`
}
if err := ctx.BindJSON(&request); err != nil {
fmt.Println(err)
ctx.JSON(http.StatusBadRequest, dto.NewError("Error mapping modules reconcile request", err.Error()))
return
}

for _, moduleName := range request.Modules {
if err := m.reconcileModule(moduleName); err != nil {
fmt.Println(err)
ctx.JSON(http.StatusInternalServerError, dto.NewError(fmt.Sprintf("Error reconciling module %v", moduleName), err.Error()))
return
}
}

ctx.Status(http.StatusAccepted)
}

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

moduleName := ctx.Param("name")

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

ctx.Status(http.StatusAccepted)
}

func (m *Modules) reconcileModule(moduleName string) error {
module, err := m.kubernetesClient.GetModule(moduleName)
if err != nil {
return err
}

annotations := module.GetAnnotations()
if annotations == nil {
annotations = make(map[string]string)
Expand All @@ -627,14 +663,7 @@ func (m *Modules) ReconcileModule(ctx *gin.Context) {
module.Kind = "Module"
module.APIVersion = "cyclops-ui.com/v1alpha1"

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.StatusAccepted)
return m.kubernetesClient.UpdateModule(module)
}

func (m *Modules) ResourcesForModule(ctx *gin.Context) {
Expand Down
1 change: 1 addition & 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 @@ -95,6 +95,7 @@ func (h *Handler) Start() error {
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.POST("/modules/reconcile", modulesController.BatchReconcileModules)
h.router.GET("/modules/:name/history", modulesController.GetModuleHistory)
h.router.POST("/modules/:name/manifest", modulesController.Manifest)
h.router.GET("/modules/:name/currentManifest", modulesController.CurrentManifest)
Expand Down
141 changes: 115 additions & 26 deletions cyclops-ui/src/components/pages/Modules/Modules.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
Checkbox,
theme,
ConfigProvider,
notification,
} from "antd";

import axios from "axios";
Expand Down Expand Up @@ -46,6 +47,34 @@ const Modules = () => {
const resourceFilter = ["Healthy", "Unhealthy", "Progressing", "Unknown"];
const [namespaceFilterData, setNamespaceFilterData] = useState<string[]>([]);

const [checkedModules, setCheckedModules] = useState<Set<string>>(new Set());
const [selectAllChecked, setSelectAllChecked] = useState(false);

const handleModuleSelect = (moduleName: string, checked: boolean) => {
setCheckedModules((prev) => {
const updatedSet = new Set(prev);
if (checked) {
updatedSet.add(moduleName);
} else {
updatedSet.delete(moduleName);
}
if (!checked) {
setSelectAllChecked(false);
}
return updatedSet;
});
};

const handleSelectAllModules = (checked: boolean) => {
setSelectAllChecked(checked);
if (!checked) {
setCheckedModules(new Set());
return;
}

setCheckedModules(new Set(filteredData.map((module: any) => module.name)));
};

const [error, setError] = useState({
message: "",
description: "",
Expand Down Expand Up @@ -114,6 +143,25 @@ const Modules = () => {
setModuleNamespaceFilter(selectedItems);
};

const handleBatchReconcile = () => {
axios
.post(`/api/modules/reconcile`, {
modules: Array.from(checkedModules),
})
.then(() => {
notification.success({
message: "Reconciliation triggered",
description: `Modules have been queued for reconciliation.`,
duration: 10,
});
setCheckedModules(new Set());
setSelectAllChecked(false);
})
.catch((error) => {
setError(mapResponseError(error));
});
};

const resourceFilterPopover = () => {
return (
<>
Expand Down Expand Up @@ -237,18 +285,40 @@ const Modules = () => {
<Col key={index} xs={24} sm={12} md={8} lg={8} xl={6}>
<a href={"/modules/" + module.name}>
<Card
styles={{
header: {
borderRadius: "4px 7px 0 0",
backgroundColor: checkedModules.has(module.name)
? mode === "light"
? "#fcd8ae"
: "#5e3301"
: "",
},
}}
title={
<div>
{module.iconURL ? (
<img
alt=""
style={{ height: "2em", marginRight: "8px" }}
src={module.iconURL}
/>
) : (
<></>
)}
{module.name}
<div
style={{
display: "flex",
alignItems: "center",
justifyContent: "space-between",
}}
>
<div style={{ display: "flex", alignItems: "center" }}>
{module.iconURL && (
<img
alt=""
style={{ height: "2em", marginRight: "8px" }}
src={module.iconURL}
/>
)}
{module.name}
</div>
<Checkbox
checked={checkedModules.has(module.name)}
onChange={(e) =>
handleModuleSelect(module.name, e.target.checked)
}
/>
</div>
}
style={{
Expand Down Expand Up @@ -386,22 +456,41 @@ const Modules = () => {
/>
)}

<Row gutter={[16, 0]}>
<Col span={18}>
<Title level={2}>Deployed modules</Title>
<Row gutter={[20, 0]} align="middle" justify="space-between">
<Col>
<Title level={3}>Deployed modules</Title>
</Col>
<Col span={6}>
<Button
type={"primary"}
onClick={handleClick}
block
style={{
fontWeight: "600",
}}
>
<PlusCircleOutlined />
Add module
</Button>
<Col>
<Row gutter={[10, 0]} align="middle">
<Col>
<Checkbox
checked={selectAllChecked}
onChange={(e) => handleSelectAllModules(e.target.checked)}
>
Select all modules
</Checkbox>
</Col>
<Col>
<Button
onClick={handleBatchReconcile}
disabled={checkedModules.size === 0}
style={{ fontWeight: "600" }}
block
>
<PlusCircleOutlined /> Reconcile
</Button>
</Col>
<Col>
<Button
type="primary"
onClick={handleClick}
style={{ fontWeight: "600", width: "240px" }}
block
>
<PlusCircleOutlined /> Add module
</Button>
</Col>
</Row>
</Col>
</Row>

Expand Down