Commit 29bf90e3 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch 'cridge-features' into 'develop' 

Feat: Enhanced Cridge helm chart features

See merge request !43
parents 99f727cd bc6d54a8

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

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
apiVersion: v1

kind: ConfigMap

metadata:

  namespace: {{ .Release.Namespace }}

  labels:

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

    org.etsi.osl.service: cridge

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

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

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

data:

  config: |-

    {{- .Files.Get "files/org.etsi.osl.cridge/config" | nindent 4 }}

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

0 → 100644
+32 −0
Original line number Diff line number Diff line 
{{ 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

kind: Secret

metadata:

  namespace: {{ .Release.Namespace }}

  labels:

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

    org.etsi.osl.service: cridge

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

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

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

type: Opaque

data:

  config: |-

    {{- if $kubeconfig }}

    {{ $kubeconfig | b64enc | nindent 4 }}

    {{- else }}

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

    {{- end }}



{{- end }}

kubernetes/helm/openslice/templates/cridge.yaml

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

apiVersion: apps/v1

kind: Deployment

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

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

spec:

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

  replicas: {{ .Values.replicaCount }}

  {{- end }}

  selector:

    matchLabels:

      app: {{ include "openslice.fullname" . }}
@@ -24,10 +23,6 @@ spec: 
        org.etsi.osl.service: cridge

        {{- include "openslice.selectorLabels" . | nindent 8 }}

    spec:

      initContainers:

        - name: init-osscapi

          image: busybox:1.28

          command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-osscapi; do echo waiting for osscapi; sleep 2; done"]

      containers:

        - image: "{{ .Values.image.cridge.repository }}:{{ .Values.image.cridge.tag | default .Chart.AppVersion }}"

          imagePullPolicy: {{ .Values.image.cridge.pullPolicy | default "Always" }}
@@ -45,11 +40,12 @@ spec: 
          resources:

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

          volumeMounts:

            - name: cridge-kubeconfig

            - name: kubeconfig

              readOnly: true

              mountPath: /root/.kube

      restartPolicy: Always

      volumes:

        - name: cridge-kubeconfig

          configMap:

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

          secret:

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

{{- end }}

kubernetes/helm/openslice/values.yaml

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

  

cridge:

  enabled: true

  logLevel: INFO

  spring:

    loglevel: INFO

  kubeconfig:

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

    raw: ""      # Provide raw kubeconfig here if available



portalapi:

  logLevel: INFO