Merge pull request #41 from adhoc-dev/ta-49041

T-49041

Author: az-adhoc

charts/adhoc-odoo/v0.2.9/questions.yml

@@ -504,7 +504,21 @@ questions:
     type: "string"
     required: true
     default: "Unknown"
-
+  - variable: adhoc.dnsBannedHost
+    group: "Adhoc"
+    label: "no not resolve this host list"
+    type: "listofstrings"
+    default:
+    - mercadolibre.com
+    - mercadolibre.com.ar
+    - mercadolibre.com.uy
+    - mercadolibre.cl
+    - mercadolibre.com.mx
+    - api.pagos360.com
+    - apis.andreani.com
+    - api.mercadopago.com
+    - stripe.api.odoo.com
+    required: False
   # Cloud Native Postgres
   - variable: cloudNativePG.enabled
     group: "CloudNativePG"
@@ -531,17 +545,10 @@ questions:
   - variable: cloudNativePG.persistence.size
     group: "CloudNativePG"
     label: "Disk size"
-    description: "size of pg disk"
-    type: enum
+    description: "size of pg disk (GB)"
+    type: "int"
     required: false
-    default: 5Gi
-    options:
-      - 1Gi
-      - 5Gi
-      - 10Gi
-      - 20Gi
-      - 50Gi
-      - 100Gi
+    default: 5
     show_if: "cloudNativePG.enabled=true"
   - variable: cloudNativePG.superUserPassword
     group: "CloudNativePG"

charts/adhoc-odoo/v0.2.9/templates/_cnpg_helpers.tpl charts/adhoc-odoo/v0.2.9/templates/cnpg/_helpers.tpl

@@ -46,15 +46,15 @@ spec:
     topologyKey: kubernetes.io/hostname # Default value
     podAntiAffinityType: preferred # Default value
   storage:
-    size: {{ .Values.cloudNativePG.persistence.size }}
+    size: {{ .Values.cloudNativePG.persistence.size }}Gi
     {{- if .Values.cloudNativePG.persistence.storageClass }}
     storageClass: {{ .Values.cloudNativePG.persistence.storageClass }}
     {{- end }}
   {{/* Used to Separate WAL into a diferent volume */}}
   {{ if .Values.cloudNativePG.persistence.separateWAL }}
   walStorage:
     {{/* TODO: This need to be calculated considerating retention and backups frecuency */}}
-    size: {{ .Values.cloudNativePG.persistence.size }}
+    size: {{ .Values.cloudNativePG.persistence.size }}Gi
     {{- if .Values.cloudNativePG.persistence.storageClass }}
     storageClass: {{ .Values.cloudNativePG.persistence.storageClass }}
     {{- end }}

charts/adhoc-odoo/v0.2.9/templates/cnpg_check-crd.yaml charts/adhoc-odoo/v0.2.9/templates/cnpg/checkCrd.yaml

@@ -99,12 +99,17 @@ spec:
           volumeMounts:
           {{- if eq .Values.storage.location "fuse" }}
           - name: gcs-fuse-csi-ephemeral
+            readOnly: false
             {{- if .Values.cloudNativePG.enabled }}
             mountPath: /home/odoo/data/filestore/odoo
             {{- else }}
             mountPath: /home/odoo/data/filestore/{{ .Release.Name }}
             {{- end }}
-            readOnly: false
+          {{- end }}
+          {{- if and .Values.adhoc.dnsBannedHost ( ne .Values.adhoc.appType "prod" ) }}
+          - name: hosts
+            mountPath: /etc/hosts
+            subPath: hosts
           {{- end }}
       affinity:
           podAntiAffinity:
@@ -162,8 +167,13 @@ spec:
       {{- with .Values.nodeSelector }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if eq .Values.storage.location "fuse" }}
       volumes:
+      {{- if and .Values.adhoc.dnsBannedHost ( ne .Values.adhoc.appType "prod" ) }}
+      - name: hosts
+        configMap:
+          name: {{ include "adhoc-odoo.fullname" . }}-hosts
+      {{- end }}
+      {{- if eq .Values.storage.location "fuse" }}
       - name: gcs-fuse-csi-ephemeral
         csi:
           driver: gcsfuse.csi.storage.gke.io

charts/adhoc-odoo/v0.2.9/templates/cnpg_np.yaml charts/adhoc-odoo/v0.2.9/templates/cnpg/networkPolicy.yaml

@@ -0,0 +1,20 @@
+{{- if and .Values.adhoc.dnsBannedHost ( ne .Values.adhoc.appType "prod" ) }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "adhoc-odoo.fullname" . }}-hosts
+  labels:
+    {{- include "adhoc-odoo.labels" . | nindent 4 }}
+data:
+  hosts: |
+    # Kubernetes-managed hosts file.
+    127.0.0.1       localhost
+    ::1     localhost ip6-localhost ip6-loopback
+    fe00::0 ip6-localnet
+    fe00::0 ip6-mcastprefix
+    fe00::1 ip6-allnodes
+    fe00::2 ip6-allrouters
+    {{- range .Values.adhoc.dnsBannedHost }}
+    127.0.0.1       {{ . }}
+    {{- end }}
+{{- end }}

charts/adhoc-odoo/v0.2.9/templates/cnpg_pg.yaml charts/adhoc-odoo/v0.2.9/templates/cnpg/pgcluster.yaml

@@ -177,6 +177,16 @@ adhoc:
   appType: prod
   clientAnalyticAccount: "Unknown"
   devMode: false
+  dnsBannedHost:
+    - mercadolibre.com
+    - mercadolibre.com.ar
+    - mercadolibre.com.uy
+    - mercadolibre.cl
+    - mercadolibre.com.mx
+    - api.pagos360.com
+    - apis.andreani.com
+    - api.mercadopago.com
+    - stripe.api.odoo.com
 
 cloudNativePG:
   checkCRD: false
@@ -192,7 +202,7 @@ cloudNativePG:
       memory: 5000Mi
   instances: 1
   persistence:
-    size: 10Gi
+    size: 10
     separateWAL: false
     # options are:
     # - gcp-ssd-r (to create as retain )