Support OpenShift deployment

Signed-off-by: Tamal Saha <tamal@appscode.com>

Author: tamalsaha

apis/installer/fuzzer/fuzzer.go

@@ -24,8 +24,8 @@ import (
 )
 
 // Funcs returns the fuzzer functions for this api group.
-var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
-	return []interface{}{
+var Funcs = func(codecs runtimeserializer.CodecFactory) []any {
+	return []any{
 		func(s *v1alpha1.InboxAgent, c fuzz.Continue) {
 			c.FuzzNoCustom(s) // fuzz self without calling this function again
 		},

apis/installer/v1alpha1/inbox_agent_types.go

@@ -19,6 +19,7 @@ package v1alpha1
 import (
 	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"kmodules.xyz/resource-metadata/apis/shared"
 )
 
 const (
@@ -81,6 +82,8 @@ type InboxAgentSpec struct {
 	Apiserver   InboxAgentApiserver `json:"apiserver"`
 	Monitoring  Monitoring          `json:"monitoring"`
 	InboxServer InboxServerInfo     `json:"inboxServer"`
+	// +optional
+	Distro shared.DistroSpec `json:"distro"`
 }
 
 type InboxAgentApiserver struct {

apis/installer/v1alpha1/inbox_server_dist_types.go

@@ -19,6 +19,7 @@ package v1alpha1
 import (
 	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"kmodules.xyz/resource-metadata/apis/shared"
 )
 
 const (
@@ -56,6 +57,8 @@ type InboxServerDistributedSpec struct {
 	S3               S3Spec               `json:"s3"`
 	Tika             TikaSpec             `json:"tika"`
 	Service          ServiceSpec          `json:"service"`
+	// +optional
+	Distro shared.DistroSpec `json:"distro"`
 }
 
 type DnsSpec struct {

apis/installer/v1alpha1/inbox_server_types.go

@@ -19,6 +19,7 @@ package v1alpha1
 import (
 	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"kmodules.xyz/resource-metadata/apis/shared"
 )
 
 const (
@@ -52,6 +53,8 @@ type InboxServerSpec struct {
 	AdminIngress     IngressSpec            `json:"adminIngress"`
 	Postgresql       PostgresqlSpec         `json:"postgresql"`
 	Migrate          InboxServerMigrateSpec `json:"migrate"`
+	// +optional
+	Distro shared.DistroSpec `json:"distro"`
 }
 
 type JamesSpec struct {

apis/installer/v1alpha1/zz_generated.deepcopy.go

@@ -1,19 +1,19 @@
----
 - bitnami/kubectl:latest
 - busybox:latest
 - cassandra:4.1.3
-- ghcr.io/appscode/inbox-agent:v0.0.3
+- ghcr.io/appscode/inbox-agent:v0.0.5
 - ghcr.io/appscode/inbox-server:latest
+- ghcr.io/appscode/inbox-server:postgres-latest
 - ghcr.io/appscode/kube-rbac-proxy:v0.15.0
 - ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.110.0
 - ghcr.io/open-telemetry/opentelemetry-operator/target-allocator:main
 - opensearchproject/opensearch:2.1.0
 - otel/opentelemetry-collector-contrib:0.95.0
 - quay.io/brancz/kube-rbac-proxy:v0.15.0
-- quay.io/prometheus-operator/prometheus-operator:v0.80.0
-- quay.io/prometheus/alertmanager:v0.28.0
+- quay.io/prometheus-operator/prometheus-operator:v0.82.0
+- quay.io/prometheus/alertmanager:v0.28.1
 - quay.io/prometheus/node-exporter:v1.8.2
-- quay.io/prometheus/prometheus:v3.1.0
+- quay.io/prometheus/prometheus:v3.3.1
 - rabbitmq:3.12.1-management
-- registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.1
+- registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.3
 - registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.12.0

catalog/imagelist.yaml

@@ -2,8 +2,8 @@
 apiVersion: v2
 description: Inbox Agent by AppsCode
 name: inbox-agent
-version: v2024.12.30
-appVersion: v0.0.3
+version: v2025.12.15
+appVersion: v0.0.5
 home: https://github.com/ops-center
 icon: https://cdn.appscode.com/images/products/searchlight/searchlight-512x512.png
 sources: [https://github.com/ops-center]

charts/inbox-agent/Chart.yaml

@@ -7,8 +7,8 @@
 ```bash
 $ helm repo add appscode https://charts.appscode.com/stable/
 $ helm repo update
-$ helm search repo appscode/inbox-agent --version=v2024.12.30
-$ helm upgrade -i inbox-agent appscode/inbox-agent -n monitoring --create-namespace --version=v2024.12.30
+$ helm search repo appscode/inbox-agent --version=v2025.12.15
+$ helm upgrade -i inbox-agent appscode/inbox-agent -n monitoring --create-namespace --version=v2025.12.15
 ```
 
 ## Introduction
@@ -24,7 +24,7 @@ This chart deploys Inbox Agent on a [Kubernetes](http://kubernetes.io) cluster u
 To install/upgrade the chart with the release name `inbox-agent`:
 
 ```bash
-$ helm upgrade -i inbox-agent appscode/inbox-agent -n monitoring --create-namespace --version=v2024.12.30
+$ helm upgrade -i inbox-agent appscode/inbox-agent -n monitoring --create-namespace --version=v2025.12.15
 ```
 
 The command deploys Inbox Agent on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
@@ -94,17 +94,19 @@ The following table lists the configurable parameters of the `inbox-agent` chart
 | inboxServer.emailDomain               |                                                                                                                                                                                                                                                   | <code>cloud.appscode.com</code>                                                                                                                                                                 |
 | inboxServer.token                     |                                                                                                                                                                                                                                                   | <code>xyz</code>                                                                                                                                                                                |
 | inboxServer.caBundle                  |                                                                                                                                                                                                                                                   | <code>xyz</code>                                                                                                                                                                                |
+| distro.openshift                      | Set true, if installed in OpenShift                                                                                                                                                                                                               | <code>false</code>                                                                                                                                                                              |
+| distro.ubi                            | Set operator or all to use ubi images                                                                                                                                                                                                             | <code>""</code>                                                                                                                                                                                 |
 
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example:
 
 ```bash
-$ helm upgrade -i inbox-agent appscode/inbox-agent -n monitoring --create-namespace --version=v2024.12.30 --set nameOverride=''
+$ helm upgrade -i inbox-agent appscode/inbox-agent -n monitoring --create-namespace --version=v2025.12.15 --set nameOverride=''
 ```
 
 Alternatively, a YAML file that specifies the values for the parameters can be provided while
 installing the chart. For example:
 
 ```bash
-$ helm upgrade -i inbox-agent appscode/inbox-agent -n monitoring --create-namespace --version=v2024.12.30 --values values.yaml
+$ helm upgrade -i inbox-agent appscode/inbox-agent -n monitoring --create-namespace --version=v2025.12.15 --values values.yaml
 ```

charts/inbox-agent/README.md

@@ -110,3 +110,17 @@ imagePullSecrets:
 {{- toYaml . | nindent 2 }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Returns whether the OpenShift distribution is used
+*/}}
+{{- define "distro.openshift" -}}
+{{- or (.Capabilities.APIVersions.Has "project.openshift.io/v1/Project") .Values.distro.openshift -}}
+{{- end }}
+
+{{/*
+Returns if ubi images are to be used
+*/}}
+{{- define "operator.ubi" -}}
+{{ ternary "-ubi" "" (list "operator" "all" | has .Values.distro.ubi) }}
+{{- end }}

charts/inbox-agent/templates/_helpers.tpl

@@ -52,10 +52,15 @@ spec:
       serviceAccountName: {{ include "inbox-agent.serviceAccountName" . }}
       containers:
       - name: operator
-        image: "{{ include "operator.registry" . }}/{{ .Values.operator.repository }}:{{ .Values.operator.tag | default .Chart.AppVersion }}"
+        image: {{ include "operator.registry" . }}/{{ .Values.operator.repository }}:{{ .Values.operator.tag | default .Chart.AppVersion }}{{ include "operator.ubi" . }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
+        {{- if eq "true" ( include "distro.openshift" . ) }}
+        securityContext:
+          {{- toYaml (omit .Values.operator.securityContext "runAsUser" "runAsGroup" "fsGroup" "supplementalGroups") | nindent 10 }}
+        {{- else }}
         securityContext:
           {{- toYaml .Values.operator.securityContext | nindent 10 }}
+        {{- end }}
         args:
         - operator
         - --v={{ .Values.logLevel }}
@@ -135,8 +140,13 @@ spec:
           defaultMode: 420
           secretName: {{ include "inbox-agent.fullname" . }}-config
       {{- end }}
+      {{- 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 }}
     {{- if or $tolerations $criticalAddon }}
       tolerations:
       {{- with $tolerations }}