Commit e8385c6a authored by dgiannopoulos's avatar dgiannopoulos
Browse files

feat: error handling and kubeconfig from local dir

parent b2c50d7d

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

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

apiVersion: v1

apiVersion: v1

kind: ConfigMap

kind: Secret

metadata:

metadata:

  namespace: {{ .Release.Namespace }}

  namespace: {{ .Release.Namespace }}

  labels:

  labels:
@@ -8,6 +9,7 @@ metadata: 
    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" . }}-cridge-kubeconfig

type: Opaque

data:

data:

  config: |-

  config: |-

    {{- .Files.Get "files/org.etsi.osl.cridge/config" | nindent 4 }}
 
    {{- required "A kubeconfig file is required." ($kubeconfig | b64enc) | nindent 4 }}

kubernetes/helm/openslice/templates/cridge.yaml

+2 −6
Original line number Original line Diff line number Diff line
@@ -24,10 +24,6 @@ spec: 
        org.etsi.osl.service: cridge

        org.etsi.osl.service: cridge

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

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

    spec:

    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:

      containers:

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

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

          imagePullPolicy: {{ .Values.image.cridge.pullPolicy | default "Always" }}

          imagePullPolicy: {{ .Values.image.cridge.pullPolicy | default "Always" }}
@@ -51,5 +47,5 @@ spec: 
      restartPolicy: Always

      restartPolicy: Always

      volumes:

      volumes:

        - name: cridge-kubeconfig

        - name: cridge-kubeconfig

          configMap:

          secret:

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