diff --git a/apis/installer/v1alpha1/ace_options_types.go b/apis/installer/v1alpha1/ace_options_types.go index 05b80e9ed..be4a14973 100644 --- a/apis/installer/v1alpha1/ace_options_types.go +++ b/apis/installer/v1alpha1/ace_options_types.go @@ -435,8 +435,19 @@ func (a AceOptionsSpec) DevDeployment() bool { strings.HasSuffix(a.InitialSetup.Admin.Email, "@appscode.com") } +// +kubebuilder:validation:Enum=Create;Reconfigure;Upgrade;PromoteToProd +type ActionType string + +const ( + ActionTypeCreate ActionType = "Create" + ActionTypeReconfigure ActionType = "Reconfigure" + ActionTypeUpgrade ActionType = "Upgrade" + ActionTypePromoteToProd ActionType = "PromoteToProd" +) + type AceDeploymentContext struct { DeploymentType DeploymentType `json:"deploymentType"` + ActionType ActionType `json:"actionType"` InstallerName string `json:"installerName"` UploadID string `json:"uploadID"` Version string `json:"version"` diff --git a/charts/ace-installer/README.md b/charts/ace-installer/README.md index 966e57a51..23633511c 100644 --- a/charts/ace-installer/README.md +++ b/charts/ace-installer/README.md @@ -86,6 +86,8 @@ The following table lists the configurable parameters of the `ace-installer` cha | helm.releases.flux2.version | | "2.17.0" | | helm.releases.gateway-api.enabled | | true | | helm.releases.gateway-api.version | | "v2025.3.14" | +| helm.releases.gateway-api-crds.enabled | | true | +| helm.releases.gateway-api-crds.version | | v1.4.1 | | helm.releases.kubedb.enabled | | true | | helm.releases.kubedb.version | | "v2026.2.26" | | helm.releases.kubedb.values | | {"kubedb-autoscaler":{"enabled":true},"kubedb-catalog":{"enabled":true},"kubedb-kubestash-catalog":{"enabled":true},"kubedb-metrics":{"enabled":false},"kubedb-ops-manager":{"enabled":true},"kubedb-provisioner":{"enabled":true},"kubedb-schema-manager":{"enabled":false},"sidekick":{"enabled":false}} | diff --git a/charts/ace-installer/templates/featuresets/opscenter-security/cert-manager/cert-manager.yaml b/charts/ace-installer/templates/featuresets/opscenter-security/cert-manager/cert-manager.yaml index 3ee87ba6a..8188f2bb3 100644 --- a/charts/ace-installer/templates/featuresets/opscenter-security/cert-manager/cert-manager.yaml +++ b/charts/ace-installer/templates/featuresets/opscenter-security/cert-manager/cert-manager.yaml @@ -88,8 +88,10 @@ spec: dependsOn: - name: opscenter-features namespace: {{ $.Release.Namespace }} + {{- if eq (include "distro.openshift" $) "false" }} - name: gateway-api namespace: {{ $.Release.Namespace }} + {{- end }} chart: spec: chart: cert-manager diff --git a/charts/ace-installer/values.yaml b/charts/ace-installer/values.yaml index e6449e92f..65bed48aa 100644 --- a/charts/ace-installer/values.yaml +++ b/charts/ace-installer/values.yaml @@ -78,6 +78,9 @@ helm: gateway-api: enabled: true version: "v2025.3.14" + gateway-api-crds: + enabled: true + version: v1.4.1 kubedb: enabled: true version: "v2026.2.26" diff --git a/schema/ace-options/values.openapiv3_schema.yaml b/schema/ace-options/values.openapiv3_schema.yaml index ada7f3b22..39d2d1dc1 100644 --- a/schema/ace-options/values.openapiv3_schema.yaml +++ b/schema/ace-options/values.openapiv3_schema.yaml @@ -113,6 +113,13 @@ properties: type: object context: properties: + actionType: + enum: + - Create + - Reconfigure + - Upgrade + - PromoteToProd + type: string adminPassword: type: string backupPassword: @@ -320,6 +327,7 @@ properties: version: type: string required: + - actionType - deploymentType - inboxServer - installerName