fix: helm chart sgconfig serialization issue

Author: teoincontatto

stackgres-k8s/e2e/spec/operator-demo

@@ -49,11 +49,11 @@ test_yamls() {
     | sed "${OPERATOR_JVM_IMAGE_VERSION_LN}s/value: .*$/value: '${IMAGE_TAG%-jvm}-jvm'/" \
     | sed "${OPERATOR_NATIVE_IMAGE_VERSION_LN}s/value: .*$/value: '${IMAGE_TAG%-jvm}'/" \
     | sed "s|imagePullPolicy:.*[a-zA-Z].*$|imagePullPolicy: $E2E_OPERATOR_PULL_POLICY|" \
-    | sed "${OPERATOR_IMAGE_TAG_LN}s/tag: .*$/tag: '$IMAGE_TAG'/" \
-    | sed "${RESTAPI_IMAGE_TAG_LN}s/tag: .*$/tag: '$IMAGE_TAG'/" \
-    | sed "${JOBS_IMAGE_TAG_LN}s/tag: .*$/tag: '$IMAGE_TAG'/" \
-    | sed "${ADMINUI_IMAGE_TAG_LN}s/tag: .*$/tag: '$ADMINUI_IMAGE_TAG'/" \
-    | sed "s|pullPolicy:.*[a-zA-Z].*$|pullPolicy: $E2E_OPERATOR_PULL_POLICY|" \
+    | sed "s/{\(\"name\":\"stackgres\/operator\",[^}]\+\)\"tag\":\"[^\"]\+\"}/{\1\"tag\":\"$IMAGE_TAG\"}/" \
+    | sed "s/{\(\"name\":\"stackgres\/restapi\",[^}]\+\)\"tag\":\"[^\"]\+\"}/{\1\"tag\":\"$IMAGE_TAG\"}/" \
+    | sed "s/{\(\"name\":\"stackgres\/jobs\",[^}]\+\)\"tag\":\"[^\"]\+\"}/{\1\"tag\":\"$IMAGE_TAG\"}/" \
+    | sed "s/{\(\"name\":\"stackgres\/admin-ui\",[^}]\+\)\"tag\":\"[^\"]\+\"}/{\1\"tag\":\"$ADMINUI_IMAGE_TAG\"}/" \
+    | sed "s/\"pullPolicy\":\"[^\"]\+\"/\"pullPolicy\":\"$E2E_OPERATOR_PULL_POLICY\"/g" \
     | sed '/image: \([^/]\+\/\)\?ongres\/.*$/{$!{N;s/image: \([^/]\+\/\)\?\(ongres\/.*\)\n\( *\)imagePullPolicy: .*$/image: \2\n\3imagePullPolicy: IfNotPresent/;ty;P;D;:y}}' \
     | if grep -q 'http%3A%2F%2Fstackgres-operator-extensions-cache\.stackgres%3FsetHttpScheme%3Dtrue' "${STACKGRES_YAMLS}/stackgres-operator-demo.yml"
       then
@@ -75,12 +75,12 @@ test_yamls() {
   grep -qF "imagePullPolicy: $E2E_OPERATOR_PULL_POLICY" "${LOG_PATH}/stackgres-operator-demo.yml"
   if [ "$IMAGE_TAG" != "$ADMINUI_IMAGE_TAG" ]
   then
-    grep -c "tag: '$IMAGE_TAG'$" "${LOG_PATH}/stackgres-operator-demo.yml" | grep -qxF 3
-    grep -c "tag: '$ADMINUI_IMAGE_TAG'$" "${LOG_PATH}/stackgres-operator-demo.yml" | grep -qxF 1
+    grep -o -i "\"tag\":\"$IMAGE_TAG\"" "${LOG_PATH}/stackgres-operator-demo.yml" | wc -l | grep -qxF 3
+    grep -o -i "\"tag\":\"$ADMINUI_IMAGE_TAG\"" "${LOG_PATH}/stackgres-operator-demo.yml" | wc -l | grep -qxF 1
   else
-    grep -c "tag: '$IMAGE_TAG'$" "${LOG_PATH}/stackgres-operator-demo.yml" | grep -qxF 4
+    grep -o -i "\"tag\":\"$IMAGE_TAG\"" "${LOG_PATH}/stackgres-operator-demo.yml" | wc -l | grep -qxF 4
   fi
-  grep -qF "pullPolicy: $E2E_OPERATOR_PULL_POLICY" "${LOG_PATH}/stackgres-operator-demo.yml"
+  grep -qF "\"pullPolicy\":\"$E2E_OPERATOR_PULL_POLICY\"" "${LOG_PATH}/stackgres-operator-demo.yml"
   if grep -q 'http%3A%2F%2Fstackgres-operator-extensions-cache\.stackgres%3FsetHttpScheme%3Dtrue' "${STACKGRES_YAMLS}/stackgres-operator-demo.yml"
   then
     grep -qF "value: \"$EXTENSIONS_REPOSITORY_URL$(

stackgres-k8s/install/helm/stackgres-operator/templates/operator-deployment.yaml

@@ -90,12 +90,11 @@ spec:
               metadata:
                 name: {{ .Release.Name }}
                 namespace: {{ .Values.sgConfigNamespace | default .Release.Namespace }}
-              spec:
                 {{- $spec := dict }}
                 {{- range .Values.specFields }}
                 {{- $spec := set $spec . (index $.Values .) }}
                 {{- end }}
-                {{ regexReplaceAll "[^ ]+: null" (toYaml $spec | nindent 16) "" }}
+              spec: {{ toJson $spec }}
           {{- end }}
 
           - name: INSTALL_CRDS

stackgres-k8s/install/helm/stackgres-operator/templates/sgconfig.yaml

@@ -22,18 +22,17 @@ metadata:
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
     "helm.sh/hook-weight": "9"
 data:
-  sgconfig.yaml: |
+  sgconfig.json: |
     apiVersion: stackgres.io/v1
     kind: SGConfig
     metadata:
       name: {{ .Release.Name }}
       namespace: {{ .Values.sgConfigNamespace | default .Release.Namespace }}
-    spec:
       {{- $spec := dict }}
       {{- range .Values.specFields }}
       {{- $spec := set $spec . (index $.Values .) }}
       {{- end }}
-      {{ regexReplaceAll "[^ ]+: null" (toYaml $spec | nindent 6) "" }}
+    spec: {{ toJson $spec }}
 ---
 apiVersion: batch/v1
 kind: Job
@@ -89,7 +88,7 @@ spec:
             RETRY=10
             while true
             do
-              if kubectl apply -f /sgconfig.yaml
+              if kubectl apply -f /sgconfig.json
               then
                 break
               else
@@ -106,8 +105,8 @@ spec:
           mountPath: /SGConfig.yaml
           subPath: SGConfig.yaml
         - name: sgconfig
-          mountPath: /sgconfig.yaml
-          subPath: sgconfig.yaml
+          mountPath: /sgconfig.json
+          subPath: sgconfig.json
       volumes:
       - name: sgconfig-crd
         configMap: