feat: added cridge to helm chart

kubernetes/helm/openslice/files/org.etsi.osl.cridge/kubeconfig.yaml

+apiVersion: v1
+kind: Config
+clusters:
+- name: development-cluster
+  cluster:
+    certificate-authority: path/to/ca.crt # Path to certificate authority file
+    server: https://123.45.67.89:6443 # Cluster API server address
+contexts:
+- name: dev-user@development-cluster
+  context:
+    cluster: development-cluster
+    namespace: development # Default namespace
+    user: dev-user
+current-context: dev-user@development-cluster
+users:
+- name: dev-user
+  user:
+    client-certificate: path/to/cert.crt # Path to the client certificate
+    client-key: path/to/key.key # Path to the client key

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

+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:
+  kubeconfig: |-
+    {{ .Files.Get "files/org.etsi.osl.cridge/kubeconfig.yaml" | indent 4 }}

kubernetes/helm/openslice/templates/cridge.yaml

+apiVersion: apps/v1
+kind: StatefulSet
+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
+spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
+  serviceName: {{ include "openslice.fullname" . }}-cridge
+  selector:
+    matchLabels:
+      app: {{ include "openslice.fullname" . }}
+      org.etsi.osl.service: cridge
+      {{- include "openslice.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        app: {{ include "openslice.fullname" . }}
+        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 }}"
+          name: {{ include "openslice.fullname" . }}-cridge
+          env:
+            - name: SPRING_APPLICATION_JSON
+              value: >-
+                {
+                  "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", 
+                  "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", 
+                  "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",
+                  "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default 'INFO' }}",
+                  "org.etsi.osl.cridge" : "{{ .Values.cridge.mode | default 'DEBUG' }}"  
+                }
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+            - name: cridge-kubeconfig
+              readOnly: true
+              mountPath: /root/.kube
+          readinessProbe:
+            exec:
+              command: ["sh", "-c", "kubectl version --client"]
+            initialDelaySeconds: 5
+            periodSeconds: 2
+            timeoutSeconds: 1
+      restartPolicy: Always
+      volumes:
+        - name: cridge-kubeconfig
+          configMap:
+            name: {{ include "openslice.fullname" . }}-cridge-kubeconfig

kubernetes/helm/openslice/templates/portalweb.yaml

@@ -36,6 +36,10 @@ spec:
             - name: portalweb-configuration
               mountPath: /usr/share/nginx/html/nfvportal/js/config.js
               subPath: config.js
+          readinessProbe:
+            httpGet:
+              path: /tmf-api/serviceCatalogManagement/v4
+              port: 80
       volumes:
         - name: portalweb-configuration
           configMap:

kubernetes/helm/openslice/values.yaml

@@ -75,6 +75,11 @@ image:
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
     tag: "develop"
+  cridge:
+    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge
+    pullPolicy: IfNotPresent
+    # Overrides the image tag whose default is the chart appVersion.
+    tag: "develop"
 
 bugzillaurl: example.com:443/bugzilla
 bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z
@@ -107,6 +112,9 @@ spring:
 mysql:
   storage: 10Gi
   
+cridge:
+  mode: "DEBUG"
+  
 # Storage class to be used for provisioning. Default is manual
 # storageClass: ~