From cda34eff0f22c6bd3408cee2e66e592dcd05f5c5 Mon Sep 17 00:00:00 2001 From: Arnob kumar saha Date: Wed, 30 Sep 2026 18:13:02 +0600 Subject: [PATCH] Move config-syncer to opscenter-features (enterprise); add centralizedOTEL option Signed-off-by: Arnob kumar saha --- apis/installer/v1alpha1/ace_options_types.go | 2 + charts/ace-installer-certified-crds/README.md | 2 - .../ace-installer-certified-crds/values.yaml | 3 -- charts/ace-installer-certified/README.md | 2 - .../helmreleases/ace/ace.yaml | 4 -- .../config-syncer.yaml | 53 ------------------- charts/ace-installer-certified/values.yaml | 3 -- charts/ace-installer/README.md | 2 - .../helmreleases/ace/ace.yaml | 4 -- .../config-syncer.yaml | 53 ------------------- charts/ace-installer/values.yaml | 3 -- .../config-syncer.yaml | 2 +- .../ace-options/values.openapiv3_schema.yaml | 2 + 13 files changed, 5 insertions(+), 130 deletions(-) delete mode 100644 charts/ace-installer-certified/templates/featuresets/opscenter-secret-management/config-syncer.yaml delete mode 100644 charts/ace-installer/templates/featuresets/opscenter-secret-management/config-syncer.yaml diff --git a/apis/installer/v1alpha1/ace_options_types.go b/apis/installer/v1alpha1/ace_options_types.go index 3528f18b4f..88300ee67a 100644 --- a/apis/installer/v1alpha1/ace_options_types.go +++ b/apis/installer/v1alpha1/ace_options_types.go @@ -237,6 +237,8 @@ type AceOptionsMonitoring struct { Exporter GlobalPrometheusExporter `json:"exporter"` //+optional AlertManager AceOptionsAlertManager `json:"alertManager"` + // +optional + CentralizedOTEL bool `json:"centralizedOTEL"` } type AceOptionsAlertManager struct { diff --git a/charts/ace-installer-certified-crds/README.md b/charts/ace-installer-certified-crds/README.md index 51c7d3ff91..faa348167f 100644 --- a/charts/ace-installer-certified-crds/README.md +++ b/charts/ace-installer-certified-crds/README.md @@ -81,8 +81,6 @@ The following table lists the configurable parameters of the `ace-installer-cert | helm.releases.cert-manager.version | | "v1.19.3" | | helm.releases.cert-manager-csi-driver-cacerts.enabled | | true | | helm.releases.cert-manager-csi-driver-cacerts.version | | "v2026.9.18" | -| helm.releases.config-syncer.enabled | | true | -| helm.releases.config-syncer.version | | "v0.15.5" | | helm.releases.external-dns-operator.enabled | | true | | helm.releases.external-dns-operator.version | | "v2026.6.22" | | helm.releases.flux2.enabled | | false | diff --git a/charts/ace-installer-certified-crds/values.yaml b/charts/ace-installer-certified-crds/values.yaml index 40bab1b5ad..19b4db97ee 100644 --- a/charts/ace-installer-certified-crds/values.yaml +++ b/charts/ace-installer-certified-crds/values.yaml @@ -74,9 +74,6 @@ helm: cert-manager-csi-driver-cacerts: enabled: true version: "v2026.9.18" - config-syncer: - enabled: true - version: "v0.15.5" external-dns-operator: enabled: true version: "v2026.6.22" diff --git a/charts/ace-installer-certified/README.md b/charts/ace-installer-certified/README.md index d416fc96dc..430be3ce7b 100644 --- a/charts/ace-installer-certified/README.md +++ b/charts/ace-installer-certified/README.md @@ -81,8 +81,6 @@ The following table lists the configurable parameters of the `ace-installer-cert | helm.releases.cert-manager.version | | "v1.19.3" | | helm.releases.cert-manager-csi-driver-cacerts.enabled | | true | | helm.releases.cert-manager-csi-driver-cacerts.version | | "v2026.9.18" | -| helm.releases.config-syncer.enabled | | true | -| helm.releases.config-syncer.version | | "v0.15.5" | | helm.releases.external-dns-operator.enabled | | true | | helm.releases.external-dns-operator.version | | "v2026.6.22" | | helm.releases.flux2.enabled | | false | diff --git a/charts/ace-installer-certified/resourcetemplates/helmreleases/ace/ace.yaml b/charts/ace-installer-certified/resourcetemplates/helmreleases/ace/ace.yaml index 8f425b65c2..278cd253cf 100644 --- a/charts/ace-installer-certified/resourcetemplates/helmreleases/ace/ace.yaml +++ b/charts/ace-installer-certified/resourcetemplates/helmreleases/ace/ace.yaml @@ -34,10 +34,6 @@ spec: {{- end }} - name: reloader namespace: {{ $.Release.Namespace }} - {{- if (dig "config-syncer" "enabled" false $.Values.helm.releases) }} - - name: config-syncer - namespace: {{ $.Release.Namespace }} - {{- end }} {{- if (dig "service-vault" "enabled" false $.Values.helm.releases) }} - name: service-vault namespace: {{ $.Release.Namespace }} diff --git a/charts/ace-installer-certified/templates/featuresets/opscenter-secret-management/config-syncer.yaml b/charts/ace-installer-certified/templates/featuresets/opscenter-secret-management/config-syncer.yaml deleted file mode 100644 index 915d0bb166..0000000000 --- a/charts/ace-installer-certified/templates/featuresets/opscenter-secret-management/config-syncer.yaml +++ /dev/null @@ -1,53 +0,0 @@ -{{- with (index .Values "helm" "releases" "config-syncer") }} -{{- if .enabled }} - -{{ $defaults := dict "mode" "oss" "registryFQDN" (include "registry.ghcr" $) }} - -{{ $vals := dig "values" dict . }} -{{ $vals = mergeOverwrite $defaults $vals }} - -{{- if eq (include "distro.openshift" $) "true" }} -{{ $vals = mergeOverwrite $vals (pick ($.Values.options | fromYaml) "distro") }} -{{- end }} - -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: config-syncer - namespace: {{ $.Release.Namespace }} - labels: - app.kubernetes.io/component: config-syncer - app.kubernetes.io/part-of: opscenter-secret-management -spec: - interval: 5m - timeout: 30m - releaseName: config-syncer - targetNamespace: kubeops - storageNamespace: kubeops - install: - createNamespace: {{ $.Values.helm.createNamespace }} - # crds: CreateReplace - remediation: - retries: -1 - upgrade: - crds: CreateReplace - remediation: - retries: -1 - dependsOn: - - name: opscenter-features - namespace: {{ $.Release.Namespace }} - chart: - spec: - chart: config-syncer - version: {{ .version | quote }} - interval: 60m - sourceRef: - kind: HelmRepository - name: appscode-charts-oci - namespace: {{ $.Release.Namespace }} -{{- with $vals }} - {{- dict "values" . | toYaml | nindent 2 }} -{{- end }} - -{{- end }} -{{- end }} diff --git a/charts/ace-installer-certified/values.yaml b/charts/ace-installer-certified/values.yaml index 40bab1b5ad..19b4db97ee 100644 --- a/charts/ace-installer-certified/values.yaml +++ b/charts/ace-installer-certified/values.yaml @@ -74,9 +74,6 @@ helm: cert-manager-csi-driver-cacerts: enabled: true version: "v2026.9.18" - config-syncer: - enabled: true - version: "v0.15.5" external-dns-operator: enabled: true version: "v2026.6.22" diff --git a/charts/ace-installer/README.md b/charts/ace-installer/README.md index fb6e328765..01932b46fb 100644 --- a/charts/ace-installer/README.md +++ b/charts/ace-installer/README.md @@ -81,8 +81,6 @@ The following table lists the configurable parameters of the `ace-installer` cha | helm.releases.cert-manager.version | | "v1.19.3" | | helm.releases.cert-manager-csi-driver-cacerts.enabled | | true | | helm.releases.cert-manager-csi-driver-cacerts.version | | "v2026.9.18" | -| helm.releases.config-syncer.enabled | | true | -| helm.releases.config-syncer.version | | "v0.15.5" | | helm.releases.external-dns-operator.enabled | | true | | helm.releases.external-dns-operator.version | | "v2026.6.22" | | helm.releases.flux2.enabled | | false | diff --git a/charts/ace-installer/resourcetemplates/helmreleases/ace/ace.yaml b/charts/ace-installer/resourcetemplates/helmreleases/ace/ace.yaml index 8f425b65c2..278cd253cf 100644 --- a/charts/ace-installer/resourcetemplates/helmreleases/ace/ace.yaml +++ b/charts/ace-installer/resourcetemplates/helmreleases/ace/ace.yaml @@ -34,10 +34,6 @@ spec: {{- end }} - name: reloader namespace: {{ $.Release.Namespace }} - {{- if (dig "config-syncer" "enabled" false $.Values.helm.releases) }} - - name: config-syncer - namespace: {{ $.Release.Namespace }} - {{- end }} {{- if (dig "service-vault" "enabled" false $.Values.helm.releases) }} - name: service-vault namespace: {{ $.Release.Namespace }} diff --git a/charts/ace-installer/templates/featuresets/opscenter-secret-management/config-syncer.yaml b/charts/ace-installer/templates/featuresets/opscenter-secret-management/config-syncer.yaml deleted file mode 100644 index 915d0bb166..0000000000 --- a/charts/ace-installer/templates/featuresets/opscenter-secret-management/config-syncer.yaml +++ /dev/null @@ -1,53 +0,0 @@ -{{- with (index .Values "helm" "releases" "config-syncer") }} -{{- if .enabled }} - -{{ $defaults := dict "mode" "oss" "registryFQDN" (include "registry.ghcr" $) }} - -{{ $vals := dig "values" dict . }} -{{ $vals = mergeOverwrite $defaults $vals }} - -{{- if eq (include "distro.openshift" $) "true" }} -{{ $vals = mergeOverwrite $vals (pick ($.Values.options | fromYaml) "distro") }} -{{- end }} - -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: config-syncer - namespace: {{ $.Release.Namespace }} - labels: - app.kubernetes.io/component: config-syncer - app.kubernetes.io/part-of: opscenter-secret-management -spec: - interval: 5m - timeout: 30m - releaseName: config-syncer - targetNamespace: kubeops - storageNamespace: kubeops - install: - createNamespace: {{ $.Values.helm.createNamespace }} - # crds: CreateReplace - remediation: - retries: -1 - upgrade: - crds: CreateReplace - remediation: - retries: -1 - dependsOn: - - name: opscenter-features - namespace: {{ $.Release.Namespace }} - chart: - spec: - chart: config-syncer - version: {{ .version | quote }} - interval: 60m - sourceRef: - kind: HelmRepository - name: appscode-charts-oci - namespace: {{ $.Release.Namespace }} -{{- with $vals }} - {{- dict "values" . | toYaml | nindent 2 }} -{{- end }} - -{{- end }} -{{- end }} diff --git a/charts/ace-installer/values.yaml b/charts/ace-installer/values.yaml index 40bab1b5ad..19b4db97ee 100644 --- a/charts/ace-installer/values.yaml +++ b/charts/ace-installer/values.yaml @@ -74,9 +74,6 @@ helm: cert-manager-csi-driver-cacerts: enabled: true version: "v2026.9.18" - config-syncer: - enabled: true - version: "v0.15.5" external-dns-operator: enabled: true version: "v2026.6.22" diff --git a/charts/opscenter-features/templates/featuresets/opscenter-secret-management/config-syncer.yaml b/charts/opscenter-features/templates/featuresets/opscenter-secret-management/config-syncer.yaml index 3ce30f0ed7..74f1229e61 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-secret-management/config-syncer.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-secret-management/config-syncer.yaml @@ -1,5 +1,5 @@ {{ $defaults := printf ` -mode: oss +mode: enterprise registryFQDN: %q ` (include "registry.ghcr" $) diff --git a/schema/ace-options/values.openapiv3_schema.yaml b/schema/ace-options/values.openapiv3_schema.yaml index 108e5671fc..dd0c041f67 100644 --- a/schema/ace-options/values.openapiv3_schema.yaml +++ b/schema/ace-options/values.openapiv3_schema.yaml @@ -1516,6 +1516,8 @@ properties: - email - webhook type: object + centralizedOTEL: + type: boolean exporter: properties: resources: