Fix security context in service-gateway for openshift

charts/ace-installer/resourcetemplates/helmreleases/ace/ace.yaml

@@ -34,10 +34,6 @@ spec:
   {{- end }}
   - name: reloader
     namespace: {{ $.Release.Namespace }}
-  {{- if (dig "kubestash" "enabled" false $.Values.helm.releases) }}
-  - name: kubestash
-    namespace: {{ $.Release.Namespace }}
-  {{- end }}
   {{- if and (dig "catalog-manager" "enabled" false $.Values.helm.releases) (dig "service-gateway-presets" "enabled" false $.Values.helm.releases) }}
   - name: ace
     namespace: ace-gw

charts/ace-installer/templates/featuresets/opscenter-networking/gateway-api.yaml

@@ -1,5 +1,5 @@
 {{- with (index .Values "helm" "releases" "gateway-api") }}
-{{- if .enabled }}
+{{- if and .enabled (not (include "distro.openshift" $))  }}
 
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease

charts/ace-installer/templates/featuresets/saas-core/catalog-manager.yaml

@@ -18,8 +18,8 @@ spec:
   interval: 5m
   timeout: 30m
   releaseName: catalog-manager
-  targetNamespace: envoy-gateway-system
-  storageNamespace: envoy-gateway-system
+  targetNamespace: ace
+  storageNamespace: ace
   install:
     createNamespace: {{ $.Values.helm.createNamespace }}
     remediation:

charts/ace/templates/gateway/route-main.yaml

@@ -32,6 +32,9 @@ spec:
       namespace: {{ .Release.Namespace }}
       port: 80
       weight: 1
+    timeouts: # They default to 15s.
+      backendRequest: 2m
+      request: 2m
   - matches:
     - path:
         type: PathPrefix

charts/catalog-manager/Chart.yaml

@@ -3,7 +3,7 @@ name: catalog-manager
 description: A Helm chart for AppsCode SaaS Calalog
 type: application
 version: v2026.2.16
-appVersion: v0.10.0
+appVersion: v0.11.0
 home: https://github.com/appscode-cloud/catalog-manager
 icon: https://cdn.appscode.com/images/products/searchlight/icons/android-icon-192x192.png
 sources:

charts/catalog-manager/templates/deployment.yaml

@@ -49,6 +49,7 @@ spec:
             - --keda-proxyservice-namespace={{ .Values.keda.proxyService.namespace }}
             - --oci-registry-config-file=/var/platform-auth/oci.yaml
             - --platform-url={{ .Values.platform.baseURL }}
+            - --distro.openshift={{ include "distro.openshift" . }}
             {{- if .Values.platform.caBundle }}
             - --platform-ca-file=/var/platform-auth/ca.crt
             {{- end }}

charts/service-gateway-presets/README.md

@@ -106,7 +106,7 @@ The following table lists the configurable parameters of the `service-gateway-pr
 | chart.name                                         |                                                                | <code>service-gateway</code>                                                                                                                                                                                      |
 | chart.namespace                                    |                                                                | <code>ace</code>                                                                                                                                                                                                  |
 | chart.createNamespace                              |                                                                | <code>true</code>                                                                                                                                                                                                 |
-| chart.version                                      |                                                                | <code>"v2026.1.15"</code>                                                                                                                                                                                         |
+| chart.version                                      |                                                                | <code>"v2026.2.16"</code>                                                                                                                                                                                         |
 | chart.sourceRef.kind                               |                                                                | <code>HelmRepository</code>                                                                                                                                                                                       |
 | chart.sourceRef.name                               |                                                                | <code>appscode-charts-oci</code>                                                                                                                                                                                  |
 | chart.sourceRef.namespace                          |                                                                | <code>kubeops</code>                                                                                                                                                                                              |

charts/service-gateway-presets/templates/_helpers.tpl

@@ -49,3 +49,10 @@ Selector labels
 app.kubernetes.io/name: {{ include "service-gateway-presets.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
+
+{{/*
+Returns whether the OpenShift distribution is used
+*/}}
+{{- define "distro.openshift" -}}
+{{- or (.Capabilities.APIVersions.Has "project.openshift.io/v1/Project") .Values.global.distro.openshift (and .Values.distro .Values.distro.openshift) -}}
+{{- end }}

charts/service-gateway-presets/values.yaml

@@ -145,7 +145,7 @@ chart:
   name: service-gateway
   namespace: ace
   createNamespace: true
-  version: "v2026.1.15"
+  version: "v2026.2.16"
   sourceRef:
     kind: HelmRepository
     name: appscode-charts-oci

charts/service-gateway/templates/gateway/gw.yaml

@@ -49,13 +49,6 @@ spec:
         app: {{ include "tenant.name" . }}-gw-seed-backend
     spec:
       serviceAccountName: {{ include "tenant.name" . }}-gw-seed-backend
-      {{- if eq "true" ( include "distro.openshift" . ) }}
-      securityContext:
-        {{- toYaml (omit .Values.podSecurityContext "runAsUser" "runAsGroup" "fsGroup" "supplementalGroups") | nindent 8 }}
-      {{- else }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      {{- end }}
       containers:
         - image: "{{ .Values.echoserver.image }}:{{ .Values.echoserver.tag }}"
           imagePullPolicy: IfNotPresent

charts/service-gateway/templates/gateway/gwclass.yaml

@@ -40,8 +40,13 @@ spec:
       {{- end }}
         container:
           image: "{{ .Values.envoy.image }}:{{ .Values.envoy.tag }}"
+          {{- if eq "true" ( include "distro.openshift" . ) }}
+          securityContext:
+            {{- toYaml (omit .Values.envoy.securityContext "runAsUser" "runAsGroup" "fsGroup" "supplementalGroups") | nindent 12 }}
+          {{- else }}
           securityContext:
             {{- toYaml .Values.envoy.securityContext | nindent 12 }}
+          {{- end }}
         {{- if .Values.envoy.nodeSelector }}
         pod:
           nodeSelector:
@@ -54,8 +59,13 @@ spec:
                 spec:
                   containers:
                   - name: shutdown-manager
+                    {{- if eq "true" ( include "distro.openshift" . ) }}
+                    securityContext:
+                      {{- toYaml (omit .Values.envoy.securityContext "runAsUser" "runAsGroup" "fsGroup" "supplementalGroups") | nindent 22 }}
+                    {{- else }}
                     securityContext:
                       {{- toYaml .Values.envoy.securityContext | nindent 22 }}
+                    {{- end }}
 
       envoyService:
         {{- if eq .Values.infra.hostType "domain" }}