Merge branch 'master' into oscar2

grycap · May 21, 2024 · c269eb9 · c269eb9
2 parents 15030b3 + 0abf737
commit c269eb9
Show file tree

Hide file tree

Showing 16 changed files with 222 additions and 8 deletions.
diff --git a/IM/Chart.yaml b/IM/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: IM
 description: Deploy a HA Infrastructure Manager
-version: 1.5.2
+version: 1.6.2
 type: application
 home: https://www.grycap.upv.es/im
 sources:
@@ -21,4 +21,8 @@ dependencies:
   - name: vault
     version: ">= 0.17.1"
     repository: https://helm.releases.hashicorp.com
-    condition: vault.enabled
+    condition: vault.enabled
+  - name: mongodb
+    version: ">= 12.1.31"
+    repository: https://charts.bitnami.com/bitnami
+    condition: mongodb.enabled
diff --git a/IM/README.md b/IM/README.md
@@ -99,6 +99,19 @@ see their documentations for advance configuration parameters.
 | `vault.dataStorage.storageClass`  | Type of PVC for `Vault`.                                    | `""`             |
 | `vault.dataStorage.accessMode`    | Access mode of the `Vault` PVC.                             | `ReadWriteOnce`  |
 | `vault.dataStorage.size`          | Size of PVC for `Vault`.                                    | `10Gi`           |
+| `mongodb.enabled`                 | Launch MonoDB to store IM data insted of using MySQL        | `false`          |
+| `mongodb.architecture`            | MongoDB architecture (`standalone` or `replicaset`)         | `replicaset`     |
+| `mongodb.replicaCount`            | MongoDB replicas (only used with `replicaset`)              | `2`              |
+| `mongodb.arbiter.enabled`         | Deploy MongoDB Arbiter                                      | `false`          |
+| `mongodb.auth.replicaSetKey`      | Key used for authentication in the replicaset               | `*****`          |
+| `mongodb.auth.rootUser`           | MongoDB root user                                           | `root`          |
+| `mongodb.auth.rootPassword`       | MongoDB root password                                       | `rootpass`          |
+| `mongodb.persistence.enabled`      | Create a volume to store MongoDB data.                     | `true`          |
+| `mongodb.persistence.storageClass` | Type of PVC for MongoDB data.                              | `""`             |
+| `mongodb.persistence.accessMode`   | Access mode of the MongoDB data PVC.                       | `ReadWriteOnce`  |
+| `mongodb.persistence.size`         | Size of PVC for MongoDB data.                              | `8Gi`            |
+| `mongodb.resources.requests.memory` | MongoDB Memory resource requests/limits                   | `512Mi`          |
+| `mongodb.resources.requests.cpu`    | MongoDB CPU resource requests/limits                      | `250m`           |
 
 ## IM HA mode
 

diff --git a/IM/templates/im_dashboard_ingress.yaml b/IM/templates/im_dashboard_ingress.yaml
@@ -9,7 +9,6 @@ kind: Ingress
 metadata:
   name: im-dashboard
   annotations:
-      kubernetes.io/ingress.class: nginx
       nginx.ingress.kubernetes.io/client-body-buffer-size: 64k
       nginx.ingress.kubernetes.io/proxy-body-size: 20m
       nginx.ingress.kubernetes.io/proxy-connect-timeout: "1800"
@@ -18,6 +17,7 @@ metadata:
       nginx.ingress.kubernetes.io/x-forwarded-prefix: {{ .Values.imdashboard.ingress.path }}
       nginx.ingress.kubernetes.io/rewrite-target: /$1
 spec:
+  ingressClassName: nginx
   rules:
 {{- if .Values.imdashboard.ingress.host }}
     - host: {{ .Values.imdashboard.ingress.host }}
@@ -38,5 +38,9 @@ spec:
           pathType: Prefix
 {{- end }}
           path: {{ .Values.imdashboard.ingress.path }}/?(.*)
+{{- if .Values.imdashboard.ingress.tls }}
+  tls:
+{{ tpl (toYaml .Values.imdashboard.ingress.tls | indent 4) . }}
+{{- end -}}
 
 {{ end }}
diff --git a/IM/templates/im_deployment.yaml b/IM/templates/im_deployment.yaml
@@ -33,7 +33,17 @@ spec:
         imagePullPolicy: Always
         env:
           - name: IM_DATA_DB
+{{ $ReleaseName := .Release.Name }}
+{{- if .Values.mongodb.enabled }}
+            value: mongodb://{{ .Values.mongodb.auth.rootUser }}:{{ .Values.mongodb.auth.rootPassword }}@
+{{- range (untilStep 0 (int .Values.mongodb.replicaCount) 1) -}}
+{{- if ne . 0 }},{{ end -}}
+{{ $ReleaseName }}-mongodb-{{ . }}.{{ $ReleaseName }}-mongodb-headless
+{{- end -}}
+/imdb?replicaSet=rs0
+{{- else }}
             value: mysql://{{ .Values.mysql.mysqlUser }}:{{ .Values.mysql.mysqlPassword }}@{{ .Release.Name }}-mysql/imdb
+{{- end }}
         volumeMounts:
            - name: im
              mountPath: /etc/im/logging.conf

diff --git a/IM/templates/im_ingress.yaml b/IM/templates/im_ingress.yaml
@@ -9,7 +9,6 @@ kind: Ingress
 metadata:
   name: im
   annotations:
-      kubernetes.io/ingress.class: nginx
       nginx.ingress.kubernetes.io/client-body-buffer-size: "64k"
       nginx.ingress.kubernetes.io/proxy-body-size: "20m"
       nginx.ingress.kubernetes.io/proxy-connect-timeout: "1800"
@@ -18,6 +17,7 @@ metadata:
       nginx.ingress.kubernetes.io/x-forwarded-prefix: {{ .Values.im.ingress.path }}
       nginx.ingress.kubernetes.io/rewrite-target: /$1
 spec:
+  ingressClassName: nginx
   rules:
 {{- if .Values.im.ingress.host }}
     - host: {{ .Values.im.ingress.host }}
@@ -52,4 +52,9 @@ spec:
 
 {{- end }}
           path: {{ .Values.im.ingress.path }}/?(.*)
+{{- if .Values.im.ingress.tls }}
+  tls:
+{{ tpl (toYaml .Values.im.ingress.tls | indent 4) . }}
+{{- end -}}
+
 {{- end }}
diff --git a/IM/templates/im_web_ingress.yaml b/IM/templates/im_web_ingress.yaml
@@ -9,14 +9,14 @@ kind: Ingress
 metadata:
   name: im-web
   annotations:
-      kubernetes.io/ingress.class: nginx
       nginx.ingress.kubernetes.io/client-body-buffer-size: 64k
       nginx.ingress.kubernetes.io/proxy-body-size: 20m
       nginx.ingress.kubernetes.io/proxy-connect-timeout: "1800"
       nginx.ingress.kubernetes.io/proxy-send-timeout: "1800"
       nginx.ingress.kubernetes.io/proxy-read-timeout: '1800'
       nginx.ingress.kubernetes.io/x-forwarded-prefix: {{ .Values.imweb.ingress.path }}
 spec:
+  ingressClassName: nginx
   rules:
 {{- if .Values.imweb.ingress.host }}
     - host: {{ .Values.imweb.ingress.host }}
@@ -37,5 +37,8 @@ spec:
           pathType: Prefix
 {{- end }}
           path: {{ .Values.imweb.ingress.path }}/?(.*)
-
+{{- if .Values.imweb.ingress.tls }}
+  tls:
+{{ tpl (toYaml .Values.imweb.ingress.tls | indent 4) . }}
+{{- end -}}
 {{ end }}
diff --git a/IM/tests/im_deployment_test.yaml b/IM/tests/im_deployment_test.yaml
@@ -23,3 +23,14 @@ tests:
       - equal:
           path: spec.template.spec.volumes[1].persistentVolumeClaim.claimName
           value: imlog
+  - name: test_mongo
+    set:
+      mongodb.enabled: true
+      mongodb.auth.rootUser: usertest
+      mongodb.auth.rootPassword: passtest
+    asserts:
+      - isKind:
+          of: Deployment
+      - equal:
+          path: spec.template.spec.containers[0].env[0].value
+          value: mongodb://usertest:[email protected],RELEASE-NAME-mongodb-1.RELEASE-NAME-mongodb-headless/imdb?replicaSet=rs0
diff --git a/IM/tests/im_ingress_test.yaml b/IM/tests/im_ingress_test.yaml
@@ -7,6 +7,10 @@ tests:
       im.ingress.enabled: true
       im.ingress.path: /im
       im.ingress.host: somehost.com
+      im.ingress.tls:
+        - secretName: tls-secret
+          hosts:
+            - somehost.com
     asserts:
       - isKind:
           of: Ingress
@@ -19,3 +23,9 @@ tests:
       - equal:
           path: spec.rules[0].host
           value: somehost.com
+      - equal:
+          path: spec.tls[0].hosts[0]
+          value: somehost.com
+      - equal:
+          path: spec.tls[0].secretName
+          value: tls-secret
diff --git a/IM/values.schema.json b/IM/values.schema.json
@@ -172,6 +172,20 @@
           }
         }
       },
+      "mongodb": {
+        "type": "object",
+        "form": true,
+        "title": "MongoDB Configuration",
+        "description": "MongoDB configuration values",
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "title": "Enable",
+            "description": "Flag to enable the MongoDB server to store IM database.",
+            "form": true
+          }
+        }
+      },
       "vault": {
         "type": "object",
         "form": true,

diff --git a/IM/values.yaml b/IM/values.yaml
@@ -1,5 +1,5 @@
 mysql:
-  imageTag: "5.7.38"
+  imageTag: "8.0.36"
   mysqlPassword: impass
   persistence:
     enabled: true
@@ -22,6 +22,26 @@ mysql:
       CREATE DATABASE IF NOT EXISTS imdashdb;
       GRANT ALL PRIVILEGES ON imdashdb.* TO 'imuser'@'%';
 
+mongodb:
+  enabled: false
+  architecture: replicaset
+  replicaCount: 2
+  arbiter:
+    enabled: false
+  auth:
+    replicaSetKey: "f079596e599b8210f566"
+    rootUser: root
+    rootPassword: rootpass
+  persistence:
+    enabled: true
+    storageClass: ""
+    accessMode: ReadWriteOnce
+    size: 8Gi
+  resources:
+    requests:
+      memory: 512Mi
+      cpu: 250m
+
 imweb:
   deploy: true
   version: latest
@@ -30,6 +50,7 @@ imweb:
     enabled: true
     host: ""
     path: "/im-web"
+    tls: []
   resources:
     requests:
       memory: 256Mi
@@ -43,6 +64,7 @@ imdashboard:
     enabled: true
     host: ""
     path: "/im-dashboard"
+    tls: []
   resources:
     requests:
       memory: 256Mi
@@ -69,6 +91,7 @@ im:
     enabled: true
     host: ""
     path: "/im"
+    tls: []
   resources:
     requests:
       memory: 256Mi
@@ -95,4 +118,4 @@ vault:
   dataStorage:
     storageClass: ""
   injector:
-    enabled: false
+    enabled: false
diff --git a/docs/IM-1.6.0.tgz b/docs/IM-1.6.0.tgz
diff --git a/docs/IM-1.6.1.tgz b/docs/IM-1.6.1.tgz
diff --git a/docs/IM-1.6.2.tgz b/docs/IM-1.6.2.tgz
diff --git a/docs/index.yaml b/docs/index.yaml
@@ -1,6 +1,102 @@
 apiVersion: v1
 entries:
   IM:
+  - apiVersion: v2
+    created: "2024-04-10T10:05:48.594751554Z"
+    dependencies:
+    - name: mysql
+      repository: https://charts.helm.sh/stable
+      version: '>= 1.1.1'
+    - condition: vault.enabled
+      name: vault
+      repository: https://helm.releases.hashicorp.com
+      version: '>= 0.17.1'
+    - condition: mongodb.enabled
+      name: mongodb
+      repository: https://charts.bitnami.com/bitnami
+      version: '>= 12.1.31'
+    description: Deploy a HA Infrastructure Manager
+    digest: ef717f489fabfe443828ed698c0d97e8d02178a8523452c8896a639f1af418b9
+    home: https://www.grycap.upv.es/im
+    icon: https://github.com/grycap/helm-charts/raw/master/icons/im.png
+    keywords:
+    - Infrastructure Manager
+    - Cloud Orchestrator
+    - TOSCA
+    maintainers:
+    - email: [email protected]
+      name: Miguel Caballer
+    name: IM
+    sources:
+    - https://github.com/grycap/im
+    type: application
+    urls:
+    - https://grycap.github.io/helm-charts/IM-1.6.2.tgz
+    version: 1.6.2
+  - apiVersion: v2
+    created: "2024-03-27T07:45:48.471861612Z"
+    dependencies:
+    - name: mysql
+      repository: https://charts.helm.sh/stable
+      version: '>= 1.1.1'
+    - condition: vault.enabled
+      name: vault
+      repository: https://helm.releases.hashicorp.com
+      version: '>= 0.17.1'
+    - condition: mongodb.enabled
+      name: mongodb
+      repository: https://charts.bitnami.com/bitnami
+      version: '>= 12.1.31'
+    description: Deploy a HA Infrastructure Manager
+    digest: 92deecaa95c2f125583882266200481a42ec910d250154b6460712cee31851f2
+    home: https://www.grycap.upv.es/im
+    icon: https://github.com/grycap/helm-charts/raw/master/icons/im.png
+    keywords:
+    - Infrastructure Manager
+    - Cloud Orchestrator
+    - TOSCA
+    maintainers:
+    - email: [email protected]
+      name: Miguel Caballer
+    name: IM
+    sources:
+    - https://github.com/grycap/im
+    type: application
+    urls:
+    - https://grycap.github.io/helm-charts/IM-1.6.1.tgz
+    version: 1.6.1
+  - apiVersion: v2
+    created: "2024-03-26T14:45:49.158279567Z"
+    dependencies:
+    - name: mysql
+      repository: https://charts.helm.sh/stable
+      version: '>= 1.1.1'
+    - condition: vault.enabled
+      name: vault
+      repository: https://helm.releases.hashicorp.com
+      version: '>= 0.17.1'
+    - condition: mongodb.enabled
+      name: mongodb
+      repository: https://charts.bitnami.com/bitnami
+      version: '>= 12.1.31'
+    description: Deploy a HA Infrastructure Manager
+    digest: 37980a7cb9a0cd1e076feb464ca937a2cd20cd8d63d1a5d0b462fd9d22c7c86a
+    home: https://www.grycap.upv.es/im
+    icon: https://github.com/grycap/helm-charts/raw/master/icons/im.png
+    keywords:
+    - Infrastructure Manager
+    - Cloud Orchestrator
+    - TOSCA
+    maintainers:
+    - email: [email protected]
+      name: Miguel Caballer
+    name: IM
+    sources:
+    - https://github.com/grycap/im
+    type: application
+    urls:
+    - https://grycap.github.io/helm-charts/IM-1.6.0.tgz
+    version: 1.6.0
   - apiVersion: v2
     created: "2023-09-13T11:25:37.889101738Z"
     dependencies:
@@ -273,6 +369,26 @@ entries:
     - https://grycap.github.io/helm-charts/IM-1.0.0.tgz
     version: 1.0.0
   oscar:
+  - apiVersion: v1
+    created: "2024-02-26T12:35:41.583618944Z"
+    description: Open Source Serverless Computing for Data-Processing Applications
+    digest: 092399ae834533e6ca65a8f1fad7267b37d16a06fba3b41072fb61bf00ca98c8
+    home: https://grycap.github.io/oscar
+    icon: https://github.com/grycap/helm-charts/raw/master/icons/oscar.png
+    keywords:
+    - serverless
+    - containers
+    - file-processing
+    - batch
+    maintainers:
+    - email: [email protected]
+      name: GRyCAP
+    name: oscar
+    sources:
+    - https://github.com/grycap/oscar
+    urls:
+    - https://grycap.github.io/helm-charts/oscar-3.0.1.tgz
+    version: 3.0.1
   - apiVersion: v1
     created: "2024-02-05T11:31:08.315210413Z"
     description: Open Source Serverless Computing for Data-Processing Applications

diff --git a/docs/oscar-3.0.1.tgz b/docs/oscar-3.0.1.tgz
diff --git a/oscar/templates/populate-oscar-volume-job.yaml b/oscar/templates/populate-oscar-volume-job.yaml
@@ -5,6 +5,7 @@ metadata:
   name: populate-volume-job
   namespace: {{ .Values.servicesNamespace | quote }}
 spec:
+  ttlSecondsAfterFinished: 120
   template:
     spec:
       containers: