Release version RELEASE_34 (#50)

Co-authored-by: Build Automation <[email protected]>
OPSWAT · Oct 17, 2024 · c32276e · c32276e
1 parent 4d396bc
commit c32276e
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 7 deletions.
diff --git a/helm_charts/mdcore/Chart.yaml b/helm_charts/mdcore/Chart.yaml
@@ -50,5 +50,5 @@ long_description: |
   
 type: application
 
-version: 5.11.1
-appVersion: 5.11.1
+version: 5.12.0
+appVersion: 5.12.0
diff --git a/helm_charts/mdcore/templates/ingress-template.yml b/helm_charts/mdcore/templates/ingress-template.yml
@@ -21,7 +21,8 @@ spec:
   ingressClassName: {{ .Values.core_ingress.class }}
   {{ end }}
   {{ if .Values.core_ingress.rules }}
-  rules: {{ .Values.core_ingress.rules }}
+  rules: 
+    {{- toYaml .Values.core_ingress.rules | nindent 4 }}
   {{ else }}
   rules:
   - host: {{ .Values.core_ingress.host | replace "<APP_NAMESPACE>" .Release.Namespace }}

diff --git a/helm_charts/mdcore/values.yaml b/helm_charts/mdcore/values.yaml
@@ -154,7 +154,7 @@ core_components:
 
   md-core:
     name: md-core
-    image: opswat/metadefendercore-debian:5.11.1         # Overrides the default docker image for the MD Core service, this value can be changed if you want to set a different version of MD Core
+    image: opswat/metadefendercore-debian:5.12.0        # Overrides the default docker image for the MD Core service, this value can be changed if you want to set a different version of MD Core
     replicas: 1                                         # Sets the number of replicas if you want to have multiple MD Core instances
     env:
       - name: MD_USER
@@ -251,7 +251,7 @@ core_components:
         maxSurge: 0
     initContainers:
       - name: check-db-ready
-        image: opswat/metadefendercore-debian:5.11.1 
+        image: opswat/metadefendercore-debian:5.12.0 
         imagePullPolicy: IfNotPresent
         envFrom:
           - configMapRef:
@@ -283,7 +283,7 @@ core_components:
           defaultMode: 0777
     initContainers:
       - name: wait-for-hub-services
-        image: opswat/metadefendercore-debian:5.11.1 
+        image: opswat/metadefendercore-debian:5.12.0
         imagePullPolicy: IfNotPresent
         command: [ '/wait-for-hub-services.sh' ]
         volumeMounts:

diff --git a/helm_charts/mdss/templates/ingress-template.yml b/helm_charts/mdss/templates/ingress-template.yml
@@ -7,7 +7,18 @@ metadata:
   annotations:
     kubernetes.io/ingress.class: {{ .Values.mdss_ingress.class }}
     ingress.kubernetes.io/rewrite-target: /
+    {{- if .Values.mdss_ingress.ingress_annotations }}
+      {{- toYaml .Values.mdss_ingress.ingress_annotations | nindent 4 }}
+    {{ end }}
+
 spec:
+  {{ if .Values.mdss_ingress.spec_className }}
+  ingressClassName: {{ .Values.mdss_ingress.class }}
+  {{ end }}
+  {{ if .Values.mdss_ingress.rules }}
+  rules: 
+    {{- toYaml .Values.mdss_ingress.rules | nindent 4 }}
+  {{ else }}
   rules:
   - host: {{ .Values.mdss_ingress.host | replace "<APP_NAMESPACE>" .Release.Namespace }}
     http:
@@ -19,5 +30,11 @@ spec:
               name: {{ .Values.mdss_ingress.service }}
               port:
                 number: {{ .Values.mdss_ingress.port }}
-
+  {{ end }}
+  {{ if .Values.mdss_ingress.tls }}
+  tls:
+  - hosts:
+    - {{ .Values.mdss_ingress.host | replace "<APP_NAMESPACE>" .Release.Namespace }}
+    secretName: {{ .Values.mdss_ingress.secret }}
+  {{ end }}
 {{ end }}
diff --git a/helm_charts/mdss/values.yaml b/helm_charts/mdss/values.yaml
@@ -177,6 +177,9 @@ mdss_ingress:
   port: 80                              # Port where the ingress should route to
   enabled: false                        # Enable or disable the ingress creation      
   class: public                         # Sets the ingress class, it can be "public" or "nginx" or some other value depending on the ingress controller in the cluster
+  spec_className: false                 # true -> for adding class as spec || false -> for adding class as annotation. false for GKE as it needs to be as annotation.
+  tls: false                            # Flag for set up tls section in ingress
+  secret: mdss-tls                      # SecretName of the tls secret created to be used for ingress
 
 # Auto onboarding settings
 auto_onboarding: false                  # If set to true, it will deploy a container that will do the initial setup automatically if correct values are provided