Commit e3326188 authored by Dimitrios Giannopoulos's avatar Dimitrios Giannopoulos
Browse files

feat: enhance cridge helm chart

parent e8385c6a

kubernetes/helm/openslice/Chart.yaml

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,4 +20,4 @@ version: 1.0.0 
# This is the version number of the application being deployed. This version number should be

# This is the version number of the application being deployed. This version number should be

# incremented each time you make changes to the application. Versions are not expected to

# incremented each time you make changes to the application. Versions are not expected to

# follow Semantic Versioning. They should reflect the version the application is using.

# follow Semantic Versioning. They should reflect the version the application is using.

appVersion: 2024Q2
 
appVersion: 2024Q4-SNAPSHOT

kubernetes/helm/openslice/templates/cridge-secret.yaml

+19 −2
Original line number Original line Diff line number Diff line 
{{- $kubeconfig := .Values.kubeconfig | default (.Files.Get "files/org.etsi.osl.cridge/kubeconfig.yaml") -}}

{{ if .Values.cridge.enabled }}



{{- $kubeconfigBase64 := .Values.cridge.kubeconfig.base64 | default "" -}}

{{- $kubeconfigFile := .Values.cridge.kubeconfig.raw | default (.Files.Get "files/org.etsi.osl.cridge/kubeconfig.yaml") -}}

{{- $kubeconfig := "" -}}



{{- if $kubeconfigBase64 }}

  {{- $kubeconfig = $kubeconfigBase64 | b64dec }}

{{- else if $kubeconfigFile }}

  {{- $kubeconfig = $kubeconfigFile }}

{{- end }}



apiVersion: v1

apiVersion: v1

kind: Secret

kind: Secret

metadata:

metadata:
@@ -8,8 +19,14 @@ metadata: 
    org.etsi.osl.service: cridge

    org.etsi.osl.service: cridge

    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"

    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"

    {{- include "openslice.labels" . | nindent 4 }}

    {{- include "openslice.labels" . | nindent 4 }}

  name: {{ include "openslice.fullname" . }}-cridge-kubeconfig

  name: {{ include "openslice.fullname" . }}-kubeconfig

type: Opaque

type: Opaque

data:

data:

  config: |-

  config: |-

    {{- if $kubeconfig }}

    {{ $kubeconfig | b64enc | nindent 4 }}

    {{- else }}

    {{- required "A kubeconfig file is required." ($kubeconfig | b64enc) | nindent 4 }}

    {{- required "A kubeconfig file is required." ($kubeconfig | b64enc) | nindent 4 }}

    {{- end }}



{{- end }}

kubernetes/helm/openslice/templates/cridge.yaml

+5 −5
Original line number Original line Diff line number Diff line 
{{ if .Values.cridge.enabled }}

apiVersion: apps/v1

apiVersion: apps/v1

kind: Deployment

kind: Deployment

metadata:	

metadata:
@@ -9,9 +10,7 @@ metadata: 
    {{- include "openslice.labels" . | nindent 4 }}

    {{- include "openslice.labels" . | nindent 4 }}

  name: {{ include "openslice.fullname" . }}-cridge

  name: {{ include "openslice.fullname" . }}-cridge

spec:

spec:

  {{- if not .Values.autoscaling.enabled }}

  replicas: {{ .Values.replicaCount }}

  replicas: {{ .Values.replicaCount }}

  {{- end }}

  selector:

  selector:

    matchLabels:

    matchLabels:

      app: {{ include "openslice.fullname" . }}

      app: {{ include "openslice.fullname" . }}
@@ -41,11 +40,12 @@ spec: 
          resources:

          resources:

            {{- toYaml .Values.resources | nindent 12 }}

            {{- toYaml .Values.resources | nindent 12 }}

          volumeMounts:

          volumeMounts:

            - name: cridge-kubeconfig

            - name: kubeconfig

              readOnly: true

              readOnly: true

              mountPath: /root/.kube

              mountPath: /root/.kube

      restartPolicy: Always

      restartPolicy: Always

      volumes:

      volumes:

        - name: cridge-kubeconfig

        - name: kubeconfig

          secret:

          secret:

            secretName: {{ include "openslice.fullname" . }}-cridge-kubeconfig
 
            secretName: {{ include "openslice.fullname" . }}-kubeconfig

{{- end }}

kubernetes/helm/openslice/values.yaml

+4 −0
Original line number Original line Diff line number Diff line
@@ -112,9 +112,13 @@ mysql: 
  storage: 10Gi

  storage: 10Gi

  

  

cridge:

cridge:

  enabled: true

  logLevel: INFO

  logLevel: INFO

  spring:

  spring:

    loglevel: INFO

    loglevel: INFO

  kubeconfig:

    base64: ""   # Provide base64-encoded kubeconfig here if available

    raw: ""      # Provide raw kubeconfig here if available





portalapi:

portalapi:

  logLevel: INFO

  logLevel: INFO