Skip to content

Commit 0a3f98b

Browse files
ArnobKumarSahaArnobKumarSaha
committed
Add alertManager in ace-options
Signed-off-by: Arnob Kumar Saha <arnob@appscode.com> Signed-off-by: Arnob kumar saha <arnob@appscode.com>
1 parent 359e7af commit 0a3f98b

9 files changed

Lines changed: 154 additions & 10 deletions

File tree

‎apis/installer/v1alpha1/ace_options_types.go‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
configapi "go.bytebuilders.dev/resource-model/apis/config/v1alpha1"
2626
wizardsapi "go.bytebuilders.dev/ui-wizards/apis/wizards/v1alpha1"
2727

28+
openviz_installer "go.openviz.dev/installer/apis/installer/v1alpha1"
2829
core "k8s.io/api/core/v1"
2930
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3031
store "kmodules.xyz/objectstore-api/api/v1"
@@ -57,7 +58,7 @@ type AceOptionsSpec struct {
5758
Context AceDeploymentContext `json:"context"`
5859
Release ObjectReference `json:"release"`
5960
Registry RegistrySpec `json:"registry"`
60-
Monitoring GlobalMonitoring `json:"monitoring"`
61+
Monitoring AceOptionsMonitoring `json:"monitoring"`
6162
Infra AceOptionsPlatformInfra `json:"infra"`
6263
Settings AceOptionsSettings `json:"settings"`
6364
PlatformUi AceOptionsComponentSpec `json:"platform-ui"`
@@ -220,6 +221,13 @@ type AceOptionsNatsSettings struct {
220221
NodeSelector map[string]string `json:"nodeSelector"`
221222
}
222223

224+
type AceOptionsMonitoring struct {
225+
Agent string `json:"agent"`
226+
ServiceMonitor GlobalServiceMonitor `json:"serviceMonitor"`
227+
Exporter GlobalPrometheusExporter `json:"exporter"`
228+
//+optional
229+
AlertManager openviz_installer.Alertmanager `json:"alertManager"`
230+
}
223231
type AceOptionsPlatformInfra struct {
224232
StorageClass LocalObjectReference `json:"storageClass,omitempty"`
225233
KubeStash KubeStashOptions `json:"kubestash"`

‎apis/installer/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
go.bytebuilders.dev/catalog v0.0.21-0.20260310064619-b60c91703ff4
77
go.bytebuilders.dev/resource-model v0.4.0
88
go.bytebuilders.dev/ui-wizards v0.31.0
9-
go.openviz.dev/installer v0.0.0-20260104052502-5deb6915c7d6
9+
go.openviz.dev/installer v0.0.0-20260408131258-3023af9e16ae
1010
gomodules.xyz/go-sh v0.2.0
1111
k8s.io/api v0.34.3
1212
k8s.io/apimachinery v0.34.3
@@ -16,7 +16,7 @@ require (
1616
kmodules.xyz/objectstore-api v0.34.0
1717
kmodules.xyz/resource-metadata v0.43.0
1818
kmodules.xyz/schema-checker v0.4.3
19-
kubeops.dev/external-dns-operator v0.3.0
19+
kubeops.dev/external-dns-operator v0.3.1-0.20260409053434-d3838ac10fdf
2020
kubeops.dev/installer v0.0.0-20260313185651-062077f97cb4
2121
sigs.k8s.io/gateway-api v1.4.1
2222
sigs.k8s.io/kustomize/kyaml v0.20.1

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@ go.bytebuilders.dev/resource-model v0.4.0 h1:wDXg4SGYn3zNRuOj17gGo0qeSE//ytdzGPS
217217
go.bytebuilders.dev/resource-model v0.4.0/go.mod h1:wGndjj3y+Yjh7+e8Wjc6joqzZCC16WZfKNx9adAFVkw=
218218
go.bytebuilders.dev/ui-wizards v0.31.0 h1:jLKOZEdUQbyA6r0iFe9khwB5U46Ad2HfgBlqmysc73o=
219219
go.bytebuilders.dev/ui-wizards v0.31.0/go.mod h1:od0U+2LentkkvTNxRPtVnx4bDWehdzIsMFbmC5FIQ8A=
220-
go.openviz.dev/installer v0.0.0-20260104052502-5deb6915c7d6 h1:71aGKgbPoKqJWD4tTOVbe8p+hkhvsELsGPwuOCon3Wg=
221-
go.openviz.dev/installer v0.0.0-20260104052502-5deb6915c7d6/go.mod h1:a+eNwY1tC1B2eAD/K/8sAv7EJhs+KigwQHBz2fgG+1w=
220+
go.openviz.dev/installer v0.0.0-20260408131258-3023af9e16ae h1:L9zvhgJJVWqFYrgd5s9BzQ8SHCo897/+Xmt72pHvd6o=
221+
go.openviz.dev/installer v0.0.0-20260408131258-3023af9e16ae/go.mod h1:lGQ+iSgf2XHY2lTpPsuyIEp9Dfp6cLpjqzTgvy+XDmo=
222222
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
223223
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
224224
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
@@ -351,8 +351,8 @@ kmodules.xyz/resource-metadata v0.43.0 h1:MSUeMku47f1NhpTptkbWZbyGqp1oASTh/I2sBJ
351351
kmodules.xyz/resource-metadata v0.43.0/go.mod h1:bqm4/ZqHxA04H1/Mz79YhHgrePSKJfUVL7cpG8teKsA=
352352
kmodules.xyz/schema-checker v0.4.3 h1:LKXKNWwJ0bFOqCMbyfZk38uVJIejXsANdp7l+fkIiJQ=
353353
kmodules.xyz/schema-checker v0.4.3/go.mod h1:JjUB6Ih4gnrBwzJNO91Dz9xa8J92UHyvPSyfX++sksM=
354-
kubeops.dev/external-dns-operator v0.3.0 h1:KIWX0C+5en8levhkdlM9htZ+EsowIWm9mgLTdsJYUzo=
355-
kubeops.dev/external-dns-operator v0.3.0/go.mod h1:hJgsshVGN68A4eXPjGYCuKaWLgYbaYFCD9E+vydYJoE=
354+
kubeops.dev/external-dns-operator v0.3.1-0.20260409053434-d3838ac10fdf h1:mx8EWPxhDZkNM+knVHjEVxxUYDOwOCR18Rf85vHCA78=
355+
kubeops.dev/external-dns-operator v0.3.1-0.20260409053434-d3838ac10fdf/go.mod h1:hJgsshVGN68A4eXPjGYCuKaWLgYbaYFCD9E+vydYJoE=
356356
kubeops.dev/installer v0.0.0-20260313185651-062077f97cb4 h1:65oo3cimnAHgmP2PFnYU+NKsVYj5vJ8KAeoIi438H88=
357357
kubeops.dev/installer v0.0.0-20260313185651-062077f97cb4/go.mod h1:8X06Mr3+df3YsE1PMRSDBPaplOOS4js7tBBFK3Sx1Ug=
358358
kubeops.dev/scanner v0.0.19 h1:J8C94k4j3NY3Y8UGHcG4nCZtmpSqPneCmkuvGNUOv4s=

‎schema/ace-options/values.openapiv3_schema.yaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1413,6 +1413,53 @@ properties:
14131413
properties:
14141414
agent:
14151415
type: string
1416+
alertManager:
1417+
properties:
1418+
email:
1419+
properties:
1420+
authUsername:
1421+
type: string
1422+
enabled:
1423+
type: boolean
1424+
from:
1425+
type: string
1426+
password:
1427+
type: string
1428+
requireTLS:
1429+
type: boolean
1430+
sendResolved:
1431+
type: boolean
1432+
smarthost:
1433+
type: string
1434+
to:
1435+
type: string
1436+
required:
1437+
- authUsername
1438+
- enabled
1439+
- from
1440+
- password
1441+
- requireTLS
1442+
- sendResolved
1443+
- smarthost
1444+
- to
1445+
type: object
1446+
webhook:
1447+
properties:
1448+
enabled:
1449+
type: boolean
1450+
sendResolved:
1451+
type: boolean
1452+
url:
1453+
type: string
1454+
required:
1455+
- enabled
1456+
- sendResolved
1457+
- url
1458+
type: object
1459+
required:
1460+
- email
1461+
- webhook
1462+
type: object
14161463
exporter:
14171464
properties:
14181465
resources:

‎vendor/go.openviz.dev/installer/apis/installer/v1alpha1/monitoring_operator_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ type MonitoringOperatorSpec struct {
7878
ServiceAccount ServiceAccountSpec `json:"serviceAccount"`
7979
Apiserver EASSpec `json:"apiserver"`
8080
Monitoring EASMonitoring `json:"monitoring"`
81+
Alertmanager Alertmanager `json:"alertmanager"`
8182
Platform PlatformSpec `json:"platform"`
8283
HubUID string `json:"hubUID"`
8384
Rancher PlatformSpec `json:"rancher"`

‎vendor/go.openviz.dev/installer/apis/installer/v1alpha1/types.go‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,28 @@ type ServiceMonitorLabels struct {
7979
Labels map[string]string `json:"labels"`
8080
}
8181

82+
type Alertmanager struct {
83+
Email AlertmanagerEmailSpec `json:"email"`
84+
Webhook AlertmanagerWebhookSpec `json:"webhook"`
85+
}
86+
87+
type AlertmanagerEmailSpec struct {
88+
Enabled bool `json:"enabled"`
89+
To string `json:"to"`
90+
From string `json:"from"`
91+
Smarthost string `json:"smarthost"`
92+
AuthUsername string `json:"authUsername"`
93+
Password string `json:"password"`
94+
RequireTLS bool `json:"requireTLS"`
95+
SendResolved bool `json:"sendResolved"`
96+
}
97+
98+
type AlertmanagerWebhookSpec struct {
99+
Enabled bool `json:"enabled"`
100+
URL string `json:"url"`
101+
SendResolved bool `json:"sendResolved"`
102+
}
103+
82104
type EASSpec struct {
83105
GroupPriorityMinimum int32 `json:"groupPriorityMinimum"`
84106
VersionPriority int32 `json:"versionPriority"`

‎vendor/go.openviz.dev/installer/apis/installer/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 48 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,8 @@ go.bytebuilders.dev/resource-model/crds
330330
## explicit; go 1.25
331331
go.bytebuilders.dev/ui-wizards/apis/wizards
332332
go.bytebuilders.dev/ui-wizards/apis/wizards/v1alpha1
333-
# go.openviz.dev/installer v0.0.0-20260104052502-5deb6915c7d6
334-
## explicit; go 1.24.0
333+
# go.openviz.dev/installer v0.0.0-20260408131258-3023af9e16ae
334+
## explicit; go 1.25
335335
go.openviz.dev/installer/apis/installer
336336
go.openviz.dev/installer/apis/installer/v1alpha1
337337
# go.yaml.in/yaml/v2 v2.4.3
@@ -951,7 +951,7 @@ kmodules.xyz/resource-metadata/crds
951951
# kmodules.xyz/schema-checker v0.4.3
952952
## explicit; go 1.22.0
953953
kmodules.xyz/schema-checker
954-
# kubeops.dev/external-dns-operator v0.3.0
954+
# kubeops.dev/external-dns-operator v0.3.1-0.20260409053434-d3838ac10fdf
955955
## explicit; go 1.25
956956
kubeops.dev/external-dns-operator/apis/external
957957
kubeops.dev/external-dns-operator/apis/external/v1alpha1

0 commit comments

Comments
 (0)