Merge branch 'master' of https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed into...

Merge branch 'master' of https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed into my5grantester_tutorial

.gitignore

@@ -5,3 +5,9 @@ ci-scripts/temp/ci-*.sh
 deploy_results_oai_cn5g.html
 ds_tester_results_oai_cn5g.html
 cn5g_fed_docker_logs.zip
+charts/oai-5g-core/oai-5g-mini/Chart.lock
+charts/oai-5g-core/oai-5g-mini/charts/
+charts/oai-5g-core/oai-5g-basic/Chart.lock
+charts/oai-5g-core/oai-5g-basic/charts/
+charts/oai-5g-core/oai-5g-slicing/Chart.lock
+charts/oai-5g-core/oai-5g-slicing/charts/

charts/mysql/Chart.yaml → charts/oai-5g-core/mysql/Chart.yaml

-apiVersion: v1
+apiVersion: v2
 name: mysql
 version: 1.6.9
 appVersion: 5.7.30
-description: DEPRECATED - Fast, reliable, scalable, and easy to use open-source relational database
-  system.
+description: mysql chart used for oai5g core 
 keywords:
 - mysql
 - database
@@ -13,4 +12,5 @@ icon: https://www.mysql.com/common/logos/logo-mysql-170x115.png
 sources:
 - https://github.com/kubernetes/charts
 - https://github.com/docker-library/mysql
-engine: gotpl
+deprecated: false
\ No newline at end of file
+engine: gotpl

charts/mysql/templates/deployment.yaml → charts/oai-5g-core/mysql/templates/deployment.yaml

@@ -178,10 +178,8 @@ spec:
           subPath: {{ $key }}
         {{- end -}}
         {{- end }}
-        {{- if .Values.initializationFiles }}
         - name: migrations
           mountPath: /docker-entrypoint-initdb.d
-        {{- end }}
         {{- if .Values.ssl.enabled }}
         - name: certificates
           mountPath: /ssl
@@ -237,11 +235,9 @@ spec:
         configMap:
           name: {{ template "mysql.fullname" . }}-configuration
       {{- end }}
-      {{- if .Values.initializationFiles }}
       - name: migrations
         configMap:
           name: {{ template "mysql.fullname" . }}-initialization
-      {{- end }}
       {{- if .Values.ssl.enabled }}
       - name: certificates
         secret:

charts/mysql/templates/initializationFiles-configmap.yaml → charts/oai-5g-core/mysql/templates/initializationFiles-configmap.yaml

-{{- if .Values.initializationFiles }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "mysql.fullname" . }}-initialization
   namespace: {{ .Release.Namespace }}
 data:
-{{- range $key, $val := .Values.initializationFiles }}
-  {{ $key }}: |-
-{{ $val | indent 4}}
+{{- if eq .Values.oai5gdatabase "mini" }}
+  {{ (.Files.Glob "initialization/oai_db-mini.sql").AsConfig | indent 2 | trim }}
+{{- else }}
+  {{ (.Files.Glob "initialization/oai_db-basic.sql").AsConfig | indent 2 | trim }}
 {{- end }}
-{{- end -}}
\ No newline at end of file

charts/oai-5g-core/mysql/values.yaml

+# mysql image version
+## ref: https://hub.docker.com/r/library/mysql/tags/
+##
+image: "mysql"
+imageTag: "5.7.30"
+
+strategy:
+  type: Recreate
+
+busybox:
+  image: "busybox"
+  tag: "latest"
+
+testFramework:
+  enabled: false
+  image: "bats/bats"
+  tag: "1.2.1"
+  imagePullPolicy: IfNotPresent
+  securityContext: {}
+
+## Specify password for root user
+##
+## Default: random 10 character string
+mysqlRootPassword: linux
+
+## Create a database user
+##
+mysqlUser: test
+## Default: random 10 character string
+mysqlPassword: test
+
+## Allow unauthenticated access, uncomment to enable
+##
+# mysqlAllowEmptyPassword: true
+
+## Create a database
+##
+mysqlDatabase: oai_db
+
+#### added to handle two setting for oai database for mini and basic
+
+oai5gdatabase: basic #only two values mini or basic nothing else default is basic
+
+
+## Specify an imagePullPolicy (Required)
+## It's recommended to change this to 'Always' if the image tag is 'latest'
+## ref: http://kubernetes.io/docs/user-guide/images/#updating-images
+##
+imagePullPolicy: IfNotPresent
+
+## Additionnal arguments that are passed to the MySQL container.
+## For example use --default-authentication-plugin=mysql_native_password if older clients need to
+## connect to a MySQL 8 instance.
+args: []
+
+extraVolumes: |
+  # - name: extras
+  #   emptyDir: {}
+extraVolumeMounts: |
+  # - name: extras
+  #   mountPath: /usr/share/extras
+  #   readOnly: true
+extraInitContainers: |
+  # - name: do-something
+  #   image: busybox
+  #   command: ['do', 'something']
+## A string to add extra environment variables
+# extraEnvVars: |
+#   - name: EXTRA_VAR
+#     value: "extra"
+
+# Optionally specify an array of imagePullSecrets.
+# Secrets must be manually created in the namespace.
+# ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
+imagePullSecrets:
+  - name: regcred
+
+## Node selector
+## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
+#nodeSelector:
+#  env: dev
+
+## Affinity
+## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+affinity: {}
+
+## Tolerations for pod assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+##
+tolerations: []
+
+livenessProbe:
+  initialDelaySeconds: 50
+  periodSeconds: 15
+  timeoutSeconds: 10
+  successThreshold: 1
+  failureThreshold: 3
+
+readinessProbe:
+  initialDelaySeconds: 15
+  periodSeconds: 15
+  timeoutSeconds: 5
+  successThreshold: 1
+  failureThreshold: 3
+
+## Persist data to a persistent volume
+persistence:
+  enabled: true
+  ## database data Persistent Volume Storage Class
+  ## If defined, storageClassName: <storageClass>
+  ## If set to "-", storageClassName: "", which disables dynamic provisioning
+  ## If undefined (the default) or set to null, no storageClassName spec is
+  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+  ##   GKE, AWS & OpenStack)
+  ##
+  # storageClass: "-"
+  accessMode: ReadWriteOnce
+  size: 8Gi
+  annotations: {}
+
+## Use an alternate scheduler, e.g. "stork".
+## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+##
+# schedulerName:
+
+## Security context
+securityContext:
+  enabled: false
+  runAsUser: 999
+  fsGroup: 999
+
+## Configure resource requests and limits
+## ref: http://kubernetes.io/docs/user-guide/compute-resources/
+##
+resources:
+  requests:
+    memory: 256Mi
+    cpu: 100m
+
+# Custom mysql configuration files path
+configurationFilesPath: /etc/mysql/conf.d/
+
+# Custom mysql configuration files used to override default mysql settings
+configurationFiles: {}
+#  mysql.cnf: |-
+#    [mysqld]
+#    skip-name-resolve
+#    ssl-ca=/ssl/ca.pem
+#    ssl-cert=/ssl/server-cert.pem
+#    ssl-key=/ssl/server-key.pem
+
+
+mysqlx:
+  port:
+    enabled: false
+
+metrics:
+  enabled: false
+  image: prom/mysqld-exporter
+  imageTag: v0.10.0
+  imagePullPolicy: IfNotPresent
+  resources: {}
+  annotations: {}
+    # prometheus.io/scrape: "true"
+    # prometheus.io/port: "9104"
+  livenessProbe:
+    initialDelaySeconds: 15
+    timeoutSeconds: 5
+  readinessProbe:
+    initialDelaySeconds: 5
+    timeoutSeconds: 1
+  flags: []
+  serviceMonitor:
+    enabled: false
+    additionalLabels: {}
+
+## Configure the service
+## ref: http://kubernetes.io/docs/user-guide/services/
+service:
+  annotations: {}
+  ## Specify a service type
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services---service-types
+  type: ClusterIP
+  port: 3306
+  # nodePort: 32000
+  # loadBalancerIP:
+
+## Pods Service Account
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
+serviceAccount:
+  ## Specifies whether a ServiceAccount should be created
+  ##
+  create: false
+  ## The name of the ServiceAccount to use.
+  ## If not set and create is true, a name is generated using the mariadb.fullname template
+  # name:
+
+ssl:
+  enabled: false
+  secret: mysql-ssl-certs
+  certificates:
+#  - name: mysql-ssl-certs
+#    ca: |-
+#      -----BEGIN CERTIFICATE-----
+#      ...
+#      -----END CERTIFICATE-----
+#    cert: |-
+#      -----BEGIN CERTIFICATE-----
+#      ...
+#      -----END CERTIFICATE-----
+#    key: |-
+#      -----BEGIN RSA PRIVATE KEY-----
+#      ...
+#      -----END RSA PRIVATE KEY-----
+
+## Populates the 'TZ' system timezone environment variable
+## ref: https://dev.mysql.com/doc/refman/5.7/en/time-zone-support.html
+##
+## Default: nil (mysql will use image's default timezone, normally UTC)
+## Example: 'Australia/Sydney'
+# timezone:
+
+# Deployment Annotations
+deploymentAnnotations: {}
+
+# To be added to the database server pod(s)
+podAnnotations: {}
+podLabels: {}
+
+## Set pod priorityClassName
+# priorityClassName: {}
+
+
+## Init container resources defaults
+initContainer:
+  resources:
+    requests:
+      memory: 10Mi
+      cpu: 10m