Add ubi mode

Signed-off-by: Tamal Saha <[email protected]>

Author: tamalsaha

apis/installer/v1alpha1/kubedb_catalog_types.go

@@ -53,6 +53,8 @@ type KubedbCatalogSpec struct {
 	SkipDeprecated bool                             `json:"skipDeprecated"`
 	EnableVersions map[string][]string              `json:"enableVersions"`
 	CustomVersions map[string]*runtime.RawExtension `json:"customVersions"`
+	// +optional
+	Distro DistroSpec `json:"distro"`
 }
 
 type PSP struct {

apis/installer/v1alpha1/kubedb_kubestash_catalog_types.go

@@ -62,6 +62,8 @@ type KubedbKubestashCatalogSpec struct {
 	Singlestore    KubestashDatabaseSpec       `json:"singlestore"`
 	ZooKeeper      KubestashDatabaseSpec       `json:"zookeeper"`
 	Kubedbverifier KubestashVerifierSpec       `json:"kubedbverifier"`
+	// +optional
+	Distro DistroSpec `json:"distro"`
 }
 
 // KubestashDatabaseSpec is the schema for DB values file

apis/installer/v1alpha1/types.go

@@ -104,6 +104,10 @@ type NetworkPolicySpec struct {
 	Enabled bool `json:"enabled"`
 }
 
+// +kubebuilder:validation:Enum=all;catalog;operator
+type UBIMode string
+
 type DistroSpec struct {
-	Openshift bool `json:"openshift"`
+	Openshift bool    `json:"openshift"`
+	UBI       UBIMode `json:"ubi"`
 }

apis/installer/v1alpha1/zz_generated.deepcopy.go

@@ -49,6 +49,12 @@ const (
 	distroOfficial = "Official"
 )
 
+var ubiImageList = sets.NewString(
+	"ghcr.io/kubedb/mariadb-archiver",
+	"ghcr.io/kubedb/mysql-archiver",
+	"ghcr.io/kubedb/postgres-archiver",
+)
+
 type StashAddon struct {
 	DBType    string
 	DBVersion string
@@ -537,6 +543,10 @@ func main() {
 							}
 							if ref.Tag != "" && ref.Tag != "latest" {
 								newimg += ":" + ref.Tag
+								i2 := fmt.Sprintf("%s/%s", ref.Registry, ref.Repository)
+								if ubiImageList.Has(i2) {
+									newimg += `{{ include "catalog.ubi" $ }}`
+								}
 							}
 							err = unstructured.SetNestedField(objCopy.Object, newimg, fieldList...)
 							if err != nil {

catalog/kubedb/fmt/main.go

@@ -1,9 +1,11 @@
 {{ "{{ $featureGates := .Values.featureGates }}" }}
+{{ "{{ $ubi := .Values.distro.ubi }}" }}
 {{ "{{- if .Values.global }}" }}
 {{ "  {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }}" }}
+{{ "  {{ $ubi = default .Values.distro.ubi .Values.global.distro.ubi }}" }}
 {{ "{{- end }}" }}
 
-{{ "{{ if $featureGates."}}{{ .kind }}{{" }}" }}
+{{"{{ if and $featureGates."}}{{ .kind }}{{" (not (eq $ubi \"operator\")) }}"}}
 {{- range $idx, $object := .objects }}
 {{ if gt $idx 0 }}
 ---

catalog/kubedb/fmt/templates/dbver.yaml

@@ -1,9 +1,11 @@
 {{ "{{ $featureGates := .Values.featureGates }}" }}
+{{ "{{ $ubi := .Values.distro.ubi }}" }}
 {{ "{{- if .Values.global }}" }}
 {{ "  {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }}" }}
+{{ "  {{ $ubi = default .Values.distro.ubi .Values.global.distro.ubi }}" }}
 {{ "{{- end }}" }}
 
-{{"{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has \"policy/v1beta1/PodSecurityPolicy\") $featureGates."}}{{ .kind }}{{" }}"}}
+{{"{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has \"policy/v1beta1/PodSecurityPolicy\") $featureGates."}}{{ .kind }}{{" (not (eq $ubi \"operator\")) }}"}}
 apiVersion: {{ .object.apiVersion }}
 kind: {{ .object.kind }}
 metadata:

catalog/kubedb/fmt/templates/psp.yaml

@@ -213,7 +213,7 @@ func main() {
 					panic("unsupported registry for image " + img)
 				}
 				if found {
-					newimg += ":" + tag
+					newimg += ":" + tag + `{{ include "catalog.ubi" $ }}`
 				}
 				err = unstructured.SetNestedField(obj.UnstructuredContent(), newimg, "spec", "image")
 				if err != nil {

catalog/kubestash/fmt/main.go

@@ -90,6 +90,7 @@ The following table lists the configurable parameters of the `kubedb-autoscaler`
 | recommender.cpuHistogramDecayHalfLife      |                                                                                                                                                                                                                                                                                                                                                                              | <code>"5m0s"</code>                                                                                                                                                                            |
 | maxConcurrentReconciles                    | The maximum number of concurrent reconciles which can be run                                                                                                                                                                                                                                                                                                                 | <code>0</code>                                                                                                                                                                                 |
 | distro.openshift                           |                                                                                                                                                                                                                                                                                                                                                                              | <code>false</code>                                                                                                                                                                             |
+| distro.ubi                                 |                                                                                                                                                                                                                                                                                                                                                                              | <code>""</code>                                                                                                                                                                                |
 
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example:

charts/kubedb-autoscaler/README.md

@@ -94,6 +94,13 @@ Returns the registry used for waitfor docker image
 {{- list .Values.registryFQDN .Values.waitfor.registry | compact | join "/" }}
 {{- end }}
 
+{{/*
+Returns if ubi images are to be used
+*/}}
+{{- define "operator.ubi" -}}
+{{ ternary "-ubi" "" (list "operator" "all" | has .Values.distro.ubi) }}
+{{- end }}
+
 {{- define "docker.imagePullSecrets" -}}
 {{- with .Values.imagePullSecrets -}}
 imagePullSecrets: