Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion apis/installer/v1alpha1/ace_options_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
configapi "go.bytebuilders.dev/resource-model/apis/config/v1alpha1"
wizardsapi "go.bytebuilders.dev/ui-wizards/apis/wizards/v1alpha1"

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

type AceOptionsMonitoring struct {
Agent string `json:"agent"`
ServiceMonitor GlobalServiceMonitor `json:"serviceMonitor"`
Exporter GlobalPrometheusExporter `json:"exporter"`
//+optional
AlertManager openviz_installer.Alertmanager `json:"alertManager"`
}
type AceOptionsPlatformInfra struct {
StorageClass LocalObjectReference `json:"storageClass,omitempty"`
KubeStash KubeStashOptions `json:"kubestash"`
Expand Down
18 changes: 18 additions & 0 deletions apis/installer/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
go.bytebuilders.dev/catalog v0.0.21-0.20260310064619-b60c91703ff4
go.bytebuilders.dev/resource-model v0.4.0
go.bytebuilders.dev/ui-wizards v0.31.0
go.openviz.dev/installer v0.0.0-20260104052502-5deb6915c7d6
go.openviz.dev/installer v0.0.0-20260408131258-3023af9e16ae
gomodules.xyz/go-sh v0.2.0
k8s.io/api v0.34.3
k8s.io/apimachinery v0.34.3
Expand All @@ -16,7 +16,7 @@ require (
kmodules.xyz/objectstore-api v0.34.0
kmodules.xyz/resource-metadata v0.43.0
kmodules.xyz/schema-checker v0.4.3
kubeops.dev/external-dns-operator v0.3.0
kubeops.dev/external-dns-operator v0.3.1-0.20260409053434-d3838ac10fdf
kubeops.dev/installer v0.0.0-20260313185651-062077f97cb4
sigs.k8s.io/gateway-api v1.4.1
sigs.k8s.io/kustomize/kyaml v0.20.1
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@ go.bytebuilders.dev/resource-model v0.4.0 h1:wDXg4SGYn3zNRuOj17gGo0qeSE//ytdzGPS
go.bytebuilders.dev/resource-model v0.4.0/go.mod h1:wGndjj3y+Yjh7+e8Wjc6joqzZCC16WZfKNx9adAFVkw=
go.bytebuilders.dev/ui-wizards v0.31.0 h1:jLKOZEdUQbyA6r0iFe9khwB5U46Ad2HfgBlqmysc73o=
go.bytebuilders.dev/ui-wizards v0.31.0/go.mod h1:od0U+2LentkkvTNxRPtVnx4bDWehdzIsMFbmC5FIQ8A=
go.openviz.dev/installer v0.0.0-20260104052502-5deb6915c7d6 h1:71aGKgbPoKqJWD4tTOVbe8p+hkhvsELsGPwuOCon3Wg=
go.openviz.dev/installer v0.0.0-20260104052502-5deb6915c7d6/go.mod h1:a+eNwY1tC1B2eAD/K/8sAv7EJhs+KigwQHBz2fgG+1w=
go.openviz.dev/installer v0.0.0-20260408131258-3023af9e16ae h1:L9zvhgJJVWqFYrgd5s9BzQ8SHCo897/+Xmt72pHvd6o=
go.openviz.dev/installer v0.0.0-20260408131258-3023af9e16ae/go.mod h1:lGQ+iSgf2XHY2lTpPsuyIEp9Dfp6cLpjqzTgvy+XDmo=
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
Expand Down Expand Up @@ -351,8 +351,8 @@ kmodules.xyz/resource-metadata v0.43.0 h1:MSUeMku47f1NhpTptkbWZbyGqp1oASTh/I2sBJ
kmodules.xyz/resource-metadata v0.43.0/go.mod h1:bqm4/ZqHxA04H1/Mz79YhHgrePSKJfUVL7cpG8teKsA=
kmodules.xyz/schema-checker v0.4.3 h1:LKXKNWwJ0bFOqCMbyfZk38uVJIejXsANdp7l+fkIiJQ=
kmodules.xyz/schema-checker v0.4.3/go.mod h1:JjUB6Ih4gnrBwzJNO91Dz9xa8J92UHyvPSyfX++sksM=
kubeops.dev/external-dns-operator v0.3.0 h1:KIWX0C+5en8levhkdlM9htZ+EsowIWm9mgLTdsJYUzo=
kubeops.dev/external-dns-operator v0.3.0/go.mod h1:hJgsshVGN68A4eXPjGYCuKaWLgYbaYFCD9E+vydYJoE=
kubeops.dev/external-dns-operator v0.3.1-0.20260409053434-d3838ac10fdf h1:mx8EWPxhDZkNM+knVHjEVxxUYDOwOCR18Rf85vHCA78=
kubeops.dev/external-dns-operator v0.3.1-0.20260409053434-d3838ac10fdf/go.mod h1:hJgsshVGN68A4eXPjGYCuKaWLgYbaYFCD9E+vydYJoE=
kubeops.dev/installer v0.0.0-20260313185651-062077f97cb4 h1:65oo3cimnAHgmP2PFnYU+NKsVYj5vJ8KAeoIi438H88=
kubeops.dev/installer v0.0.0-20260313185651-062077f97cb4/go.mod h1:8X06Mr3+df3YsE1PMRSDBPaplOOS4js7tBBFK3Sx1Ug=
kubeops.dev/scanner v0.0.19 h1:J8C94k4j3NY3Y8UGHcG4nCZtmpSqPneCmkuvGNUOv4s=
Expand Down
47 changes: 47 additions & 0 deletions schema/ace-options/values.openapiv3_schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1413,6 +1413,53 @@ properties:
properties:
agent:
type: string
alertManager:
properties:
email:
properties:
authUsername:
type: string
enabled:
type: boolean
from:
type: string
password:
type: string
requireTLS:
type: boolean
sendResolved:
type: boolean
smarthost:
type: string
to:
type: string
required:
- authUsername
- enabled
- from
- password
- requireTLS
- sendResolved
- smarthost
- to
type: object
webhook:
properties:
enabled:
type: boolean
sendResolved:
type: boolean
url:
type: string
required:
- enabled
- sendResolved
- url
type: object
required:
- email
- webhook
type: object
exporter:
properties:
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ type MonitoringOperatorSpec struct {
ServiceAccount ServiceAccountSpec `json:"serviceAccount"`
Apiserver EASSpec `json:"apiserver"`
Monitoring EASMonitoring `json:"monitoring"`
Alertmanager Alertmanager `json:"alertmanager"`
Platform PlatformSpec `json:"platform"`
HubUID string `json:"hubUID"`
Rancher PlatformSpec `json:"rancher"`
Expand Down
22 changes: 22 additions & 0 deletions vendor/go.openviz.dev/installer/apis/installer/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,28 @@ type ServiceMonitorLabels struct {
Labels map[string]string `json:"labels"`
}

type Alertmanager struct {
Email AlertmanagerEmailSpec `json:"email"`
Webhook AlertmanagerWebhookSpec `json:"webhook"`
}

type AlertmanagerEmailSpec struct {
Enabled bool `json:"enabled"`
To string `json:"to"`
From string `json:"from"`
Smarthost string `json:"smarthost"`
AuthUsername string `json:"authUsername"`
Password string `json:"password"`
RequireTLS bool `json:"requireTLS"`
SendResolved bool `json:"sendResolved"`
}

type AlertmanagerWebhookSpec struct {
Enabled bool `json:"enabled"`
URL string `json:"url"`
SendResolved bool `json:"sendResolved"`
}

type EASSpec struct {
GroupPriorityMinimum int32 `json:"groupPriorityMinimum"`
VersionPriority int32 `json:"versionPriority"`
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@ go.bytebuilders.dev/resource-model/crds
## explicit; go 1.25
go.bytebuilders.dev/ui-wizards/apis/wizards
go.bytebuilders.dev/ui-wizards/apis/wizards/v1alpha1
# go.openviz.dev/installer v0.0.0-20260104052502-5deb6915c7d6
## explicit; go 1.24.0
# go.openviz.dev/installer v0.0.0-20260408131258-3023af9e16ae
## explicit; go 1.25
go.openviz.dev/installer/apis/installer
go.openviz.dev/installer/apis/installer/v1alpha1
# go.yaml.in/yaml/v2 v2.4.3
Expand Down Expand Up @@ -951,7 +951,7 @@ kmodules.xyz/resource-metadata/crds
# kmodules.xyz/schema-checker v0.4.3
## explicit; go 1.22.0
kmodules.xyz/schema-checker
# kubeops.dev/external-dns-operator v0.3.0
# kubeops.dev/external-dns-operator v0.3.1-0.20260409053434-d3838ac10fdf
## explicit; go 1.25
kubeops.dev/external-dns-operator/apis/external
kubeops.dev/external-dns-operator/apis/external/v1alpha1
Expand Down
Loading