Skip to content

Fix version detection for openshift deployment #1172

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

Merged
tamalsaha merged 1 commit into from
Feb 20, 2026
Merged

Fix version detection for openshift deployment #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions charts/opscenter-features/templates/featuresets/capi-core/cluster-presets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,6 @@ spec:
kind: HelmRepository
name: appscode-charts-oci
namespace: {{ .Release.Namespace }}
valuesFrom:
{{- if eq (include "distro.openshift" $) "true" }}
- kind: ConfigMap
name: ace-openshift-scc
valuesKey: cluster-presets.yaml
{{- end }}
{{- with $vals }}
{{- dict "values" . | toYaml | nindent 2 }}
{{- end }}
6 changes: 0 additions & 6 deletions charts/opscenter-features/templates/featuresets/ocm-hub/cluster-auth-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@ spec:
kind: HelmRepository
name: appscode-charts-oci
namespace: {{ .Release.Namespace }}
valuesFrom:
{{- if eq (include "distro.openshift" $) "true" }}
- kind: ConfigMap
name: ace-openshift-scc
valuesKey: cluster-auth-manager.yaml
{{- end }}
{{- with $vals }}
{{- dict "values" . | toYaml | nindent 2 }}
{{- end }}
6 changes: 0 additions & 6 deletions charts/opscenter-features/templates/featuresets/ocm-hub/cluster-gateway-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ spec:
kind: HelmRepository
name: appscode-charts-oci
namespace: {{ .Release.Namespace }}
valuesFrom:
{{- if eq (include "distro.openshift" $) "true" }}
- kind: ConfigMap
name: ace-openshift-scc
valuesKey: cluster-gateway-manager.yaml
{{- end }}
{{- with $vals }}
{{- dict "values" . | toYaml | nindent 2 }}
{{- end }}
6 changes: 0 additions & 6 deletions charts/opscenter-features/templates/featuresets/ocm-hub/cluster-manager-hub.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@ spec:
kind: HelmRepository
name: appscode-charts-oci
namespace: {{ .Release.Namespace }}
valuesFrom:
{{- if eq (include "distro.openshift" $) "true" }}
- kind: ConfigMap
name: ace-openshift-scc
valuesKey: cluster-manager-hub.yaml
{{- end }}
{{- with $vals }}
{{- dict "values" . | toYaml | nindent 2 }}
{{- end }}
5 changes: 0 additions & 5 deletions charts/opscenter-features/templates/featuresets/ocm-hub/cluster-profile-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,6 @@ spec:
name: ace-features-cred
valuesKey: cluster-profile-manager.yaml
optional: true
{{- if eq (include "distro.openshift" $) "true" }}
- kind: ConfigMap
name: ace-openshift-scc
valuesKey: cluster-profile-manager.yaml
{{- end }}
{{- with $vals }}
{{- dict "values" . | toYaml | nindent 2 }}
{{- end }}
6 changes: 0 additions & 6 deletions charts/opscenter-features/templates/featuresets/ocm-hub/cluster-proxy-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,6 @@ spec:
kind: HelmRepository
name: appscode-charts-oci
namespace: {{ .Release.Namespace }}
valuesFrom:
{{- if eq (include "distro.openshift" $) "true" }}
- kind: ConfigMap
name: ace-openshift-scc
valuesKey: cluster-proxy-manager.yaml
{{- end }}
{{- with $vals }}
{{- dict "values" . | toYaml | nindent 2 }}
{{- end }}
6 changes: 0 additions & 6 deletions charts/opscenter-features/templates/featuresets/ocm-hub/fluxcd-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,6 @@ spec:
kind: HelmRepository
name: appscode-charts-oci
namespace: {{ .Release.Namespace }}
valuesFrom:
{{- if eq (include "distro.openshift" $) "true" }}
- kind: ConfigMap
name: ace-openshift-scc
valuesKey: fluxcd-manager.yaml
{{- end }}
{{- with $vals }}
{{- dict "values" . | toYaml | nindent 2 }}
{{- end }}
6 changes: 0 additions & 6 deletions charts/opscenter-features/templates/featuresets/ocm-hub/hub-cluster-robot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@ spec:
kind: HelmRepository
name: appscode-charts-oci
namespace: {{ .Release.Namespace }}
valuesFrom:
{{- if eq (include "distro.openshift" $) "true" }}
- kind: ConfigMap
name: ace-openshift-scc
valuesKey: hub-cluster-robot.yaml
{{- end }}
{{- with $vals }}
{{- dict "values" . | toYaml | nindent 2 }}
{{- end }}
5 changes: 0 additions & 5 deletions charts/opscenter-features/templates/featuresets/ocm-hub/license-proxyserver-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,6 @@ spec:
name: ace-licenseserver-cred
valuesKey: license-proxyserver-manager.yaml
optional: true
{{- if eq (include "distro.openshift" $) "true" }}
- kind: ConfigMap
name: ace-openshift-scc
valuesKey: license-proxyserver-manager.yaml
{{- end }}
{{- with $vals }}
{{- dict "values" . | toYaml | nindent 2 }}
{{- end }}
6 changes: 0 additions & 6 deletions charts/opscenter-features/templates/featuresets/ocm-hub/managed-serviceaccount-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,6 @@ spec:
kind: HelmRepository
name: appscode-charts-oci
namespace: {{ .Release.Namespace }}
valuesFrom:
{{- if eq (include "distro.openshift" $) "true" }}
- kind: ConfigMap
name: ace-openshift-scc
valuesKey: managed-serviceaccount-manager.yaml
{{- end }}
{{- with $vals }}
{{- dict "values" . | toYaml | nindent 2 }}
{{- end }}
6 changes: 0 additions & 6 deletions charts/opscenter-features/templates/featuresets/ocm-spoke/cluster-manager-spoke.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,6 @@ spec:
kind: HelmRepository
name: appscode-charts-oci
namespace: {{ .Release.Namespace }}
valuesFrom:
{{- if eq (include "distro.openshift" $) "true" }}
- kind: ConfigMap
name: ace-openshift-scc
valuesKey: cluster-manager-spoke.yaml
{{- end }}
{{- with $vals }}
{{- dict "values" . | toYaml | nindent 2 }}
{{- end }}
6 changes: 0 additions & 6 deletions charts/opscenter-features/templates/featuresets/opscenter-datastore/kubedb-ui-presets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@ spec:
kind: HelmRepository
name: appscode-charts-oci
namespace: {{ .Release.Namespace }}
valuesFrom:
{{- if eq (include "distro.openshift" $) "true" }}
- kind: ConfigMap
name: ace-openshift-scc
valuesKey: kubedb-ui-presets.yaml
{{- end }}
{{- with $vals }}
{{- dict "values" . | toYaml | nindent 2 }}
{{- end }}
10 changes: 4 additions & 6 deletions charts/opscenter-features/templates/featuresets/opscenter-networking/voyager-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ gateway-converter:
{{ $vals := dig "voyager-gateway" "values" (dict) .Values.helm.releases }}
{{ $vals = mergeOverwrite $defaults $vals }}

{{- if eq (include "distro.openshift" $) "true" }}
{{ $vals = mergeOverwrite $vals (dict "global" (dict "distro" .Values.distro)) }}
{{- end }}

apiVersion: ui.k8s.appscode.com/v1alpha1
kind: Feature
metadata:
Expand Down Expand Up @@ -51,12 +55,6 @@ spec:
kind: HelmRepository
name: appscode-charts-oci
namespace: {{ .Release.Namespace }}
valuesFrom:
{{- if eq (include "distro.openshift" $) "true" }}
- kind: ConfigMap
name: ace-openshift-scc
valuesKey: voyager-gateway.yaml
{{- end }}
{{- with $vals }}
{{- dict "values" . | toYaml | nindent 2 }}
{{- end }}
214 changes: 0 additions & 214 deletions ...ures/templates/featuresets/opscenter-observability/opentelemetry/appscode-otel-stack.yaml
View file
Open in desktop

This file was deleted.

Loading