From de3f44a0bde0f4b4a15a0f8c2052af9c61d3c923 Mon Sep 17 00:00:00 2001 From: Sergio Gimenez Date: Mon, 2 Mar 2026 23:05:45 +0100 Subject: [PATCH 1/3] Add lite2edge chart and update FM/OEG endpoints --- .../charts/federation-manager/values.yaml | 12 +-- .../charts/lite2edge/Chart.yaml | 6 ++ .../charts/lite2edge/templates/_helpers.tpl | 67 ++++++++++++++++ .../lite2edge/templates/deployment.yaml | 39 ++++++++++ .../charts/lite2edge/templates/namespace.yaml | 15 ++++ .../charts/lite2edge/templates/rbac.yaml | 36 +++++++++ .../charts/lite2edge/templates/service.yaml | 20 +++++ .../lite2edge/templates/serviceaccount.yaml | 9 +++ .../charts/lite2edge/values.yaml | 76 +++++++++++++++++++ oop-platform-chart/charts/oeg/values.yaml | 18 +---- oop-platform-chart/values.yaml | 2 +- 11 files changed, 276 insertions(+), 24 deletions(-) create mode 100644 oop-platform-chart/charts/lite2edge/Chart.yaml create mode 100644 oop-platform-chart/charts/lite2edge/templates/_helpers.tpl create mode 100644 oop-platform-chart/charts/lite2edge/templates/deployment.yaml create mode 100644 oop-platform-chart/charts/lite2edge/templates/namespace.yaml create mode 100644 oop-platform-chart/charts/lite2edge/templates/rbac.yaml create mode 100644 oop-platform-chart/charts/lite2edge/templates/service.yaml create mode 100644 oop-platform-chart/charts/lite2edge/templates/serviceaccount.yaml create mode 100644 oop-platform-chart/charts/lite2edge/values.yaml diff --git a/oop-platform-chart/charts/federation-manager/values.yaml b/oop-platform-chart/charts/federation-manager/values.yaml index 6d8aee9..99003f4 100644 --- a/oop-platform-chart/charts/federation-manager/values.yaml +++ b/oop-platform-chart/charts/federation-manager/values.yaml @@ -140,14 +140,14 @@ federationManager: port: "30760" edgeCloudPlatform: - host: "127.0.0.1" - port: "30499" - client_name: "federation-manager" - flavour_id: "flavour1" + host: "lite2edge.lite2edge.svc.cluster.local" + port: "80" + client_name: "lite2edge" + flavour_id: "default" artefactManager: - host: "127.0.0.1" - port: "30499" + host: "artefact-manager-service.oop.svc.cluster.local" + port: "8000" enabled: "true" dst_registry: "" dst_username: "" diff --git a/oop-platform-chart/charts/lite2edge/Chart.yaml b/oop-platform-chart/charts/lite2edge/Chart.yaml new file mode 100644 index 0000000..fcac2e5 --- /dev/null +++ b/oop-platform-chart/charts/lite2edge/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v2 +name: lite2edge +description: Lite2Edge - Lightweight Edge Cloud Platform for OOP +type: application +version: 0.1.0 +appVersion: "1.0.0" diff --git a/oop-platform-chart/charts/lite2edge/templates/_helpers.tpl b/oop-platform-chart/charts/lite2edge/templates/_helpers.tpl new file mode 100644 index 0000000..27ed1af --- /dev/null +++ b/oop-platform-chart/charts/lite2edge/templates/_helpers.tpl @@ -0,0 +1,67 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "lite2edge.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +*/}} +{{- define "lite2edge.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "lite2edge.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Namespace for lite2edge +*/}} +{{- define "lite2edge.namespace" -}} +{{- .Values.namespace | default "lite2edge" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "lite2edge.labels" -}} +helm.sh/chart: {{ include "lite2edge.chart" . }} +{{ include "lite2edge.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- with .Values.commonLabels }} +{{ toYaml . }} +{{- end }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "lite2edge.selectorLabels" -}} +app.kubernetes.io/name: {{ include "lite2edge.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +app: lite2edge +{{- end }} + +{{/* +Service Account name +*/}} +{{- define "lite2edge.serviceAccountName" -}} +{{- .Values.lite2edge.serviceAccount.name | default "lite2edge-sa" }} +{{- end }} diff --git a/oop-platform-chart/charts/lite2edge/templates/deployment.yaml b/oop-platform-chart/charts/lite2edge/templates/deployment.yaml new file mode 100644 index 0000000..c49d0a9 --- /dev/null +++ b/oop-platform-chart/charts/lite2edge/templates/deployment.yaml @@ -0,0 +1,39 @@ +{{- if .Values.lite2edge.enabled }} +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Values.lite2edge.name }} + namespace: {{ include "lite2edge.namespace" . }} + labels: + {{- include "lite2edge.labels" . | nindent 4 }} +spec: + replicas: {{ .Values.lite2edge.replicaCount }} + selector: + matchLabels: + {{- include "lite2edge.selectorLabels" . | nindent 6 }} + template: + metadata: + labels: + {{- include "lite2edge.selectorLabels" . | nindent 8 }} + spec: + serviceAccountName: {{ include "lite2edge.serviceAccountName" . }} + {{- if .Values.imagePullSecrets.enabled }} + imagePullSecrets: + - name: {{ .Values.imagePullSecrets.name }} + {{- end }} + containers: + - name: lite2edge + image: "{{ .Values.lite2edge.image.repository }}:{{ .Values.lite2edge.image.tag }}" + imagePullPolicy: {{ .Values.lite2edge.image.pullPolicy }} + ports: + - containerPort: {{ .Values.lite2edge.service.targetPort }} + env: + - name: K8S_NAMESPACE + value: "{{ .Values.targetNamespace }}" + - name: LOG_LEVEL + value: "{{ .Values.lite2edge.env.logLevel }}" + {{- with .Values.lite2edge.resources }} + resources: + {{- toYaml . | nindent 12 }} + {{- end }} +{{- end }} diff --git a/oop-platform-chart/charts/lite2edge/templates/namespace.yaml b/oop-platform-chart/charts/lite2edge/templates/namespace.yaml new file mode 100644 index 0000000..d8294e8 --- /dev/null +++ b/oop-platform-chart/charts/lite2edge/templates/namespace.yaml @@ -0,0 +1,15 @@ +{{- if .Values.lite2edge.enabled }} +apiVersion: v1 +kind: Namespace +metadata: + name: {{ include "lite2edge.namespace" . }} + labels: + {{- include "lite2edge.labels" . | nindent 4 }} +--- +apiVersion: v1 +kind: Namespace +metadata: + name: {{ .Values.targetNamespace }} + labels: + app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} diff --git a/oop-platform-chart/charts/lite2edge/templates/rbac.yaml b/oop-platform-chart/charts/lite2edge/templates/rbac.yaml new file mode 100644 index 0000000..a20e21d --- /dev/null +++ b/oop-platform-chart/charts/lite2edge/templates/rbac.yaml @@ -0,0 +1,36 @@ +{{- if and .Values.lite2edge.enabled .Values.rbac.create }} +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: {{ .Values.rbac.clusterRole.name }} + labels: + {{- include "lite2edge.labels" . | nindent 4 }} +rules: + - apiGroups: [""] + resources: ["nodes"] + verbs: ["get", "list", "watch"] + - apiGroups: [""] + resources: ["pods", "services", "namespaces", "secrets", "configmaps", "serviceaccounts"] + verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] + - apiGroups: ["apps"] + resources: ["deployments", "statefulsets", "replicasets"] + verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] + - apiGroups: ["rbac.authorization.k8s.io"] + resources: ["roles", "rolebindings"] + verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: {{ .Values.rbac.clusterRoleBinding.name }} + labels: + {{- include "lite2edge.labels" . | nindent 4 }} +subjects: + - kind: ServiceAccount + name: {{ include "lite2edge.serviceAccountName" . }} + namespace: {{ include "lite2edge.namespace" . }} +roleRef: + kind: ClusterRole + name: {{ .Values.rbac.clusterRole.name }} + apiGroup: rbac.authorization.k8s.io +{{- end }} diff --git a/oop-platform-chart/charts/lite2edge/templates/service.yaml b/oop-platform-chart/charts/lite2edge/templates/service.yaml new file mode 100644 index 0000000..b5eac02 --- /dev/null +++ b/oop-platform-chart/charts/lite2edge/templates/service.yaml @@ -0,0 +1,20 @@ +{{- if .Values.lite2edge.enabled }} +apiVersion: v1 +kind: Service +metadata: + name: {{ .Values.lite2edge.service.name }} + namespace: {{ include "lite2edge.namespace" . }} + labels: + {{- include "lite2edge.labels" . | nindent 4 }} +spec: + type: {{ .Values.lite2edge.service.type }} + selector: + {{- include "lite2edge.selectorLabels" . | nindent 4 }} + ports: + - protocol: TCP + port: {{ .Values.lite2edge.service.port }} + targetPort: {{ .Values.lite2edge.service.targetPort }} + {{- if and (eq .Values.lite2edge.service.type "NodePort") .Values.lite2edge.service.nodePort }} + nodePort: {{ .Values.lite2edge.service.nodePort }} + {{- end }} +{{- end }} diff --git a/oop-platform-chart/charts/lite2edge/templates/serviceaccount.yaml b/oop-platform-chart/charts/lite2edge/templates/serviceaccount.yaml new file mode 100644 index 0000000..619f15e --- /dev/null +++ b/oop-platform-chart/charts/lite2edge/templates/serviceaccount.yaml @@ -0,0 +1,9 @@ +{{- if .Values.lite2edge.enabled }} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "lite2edge.serviceAccountName" . }} + namespace: {{ include "lite2edge.namespace" . }} + labels: + {{- include "lite2edge.labels" . | nindent 4 }} +{{- end }} diff --git a/oop-platform-chart/charts/lite2edge/values.yaml b/oop-platform-chart/charts/lite2edge/values.yaml new file mode 100644 index 0000000..d2c7cee --- /dev/null +++ b/oop-platform-chart/charts/lite2edge/values.yaml @@ -0,0 +1,76 @@ +# Lite2Edge Helm Chart Configuration +# ==================================================================== + +# Namespace for lite2edge deployment +namespace: lite2edge + +# Target namespace where lite2edge will deploy applications +targetNamespace: oop-apps + +# ==================================================================== +# Lite2Edge Configuration +# ==================================================================== +lite2edge: + enabled: true + name: lite2edge + replicaCount: 1 + + image: + repository: gitlab.i2cat.net:5050/areas/software-networks/operator-platform/lite2edge + tag: "latest" + pullPolicy: Always + + service: + name: lite2edge + type: ClusterIP + port: 80 + targetPort: 8080 + # NodePort is optional, only used if type is NodePort + nodePort: 30081 + + serviceAccount: + name: lite2edge-sa + + env: + logLevel: "INFO" + + resources: + limits: + cpu: 500m + memory: 512Mi + requests: + cpu: 100m + memory: 128Mi + +# ==================================================================== +# Image Pull Secret Configuration +# ==================================================================== +imagePullSecrets: + enabled: true + name: gitlab-registry-secret + # Registry credentials - should be provided via --set or external secrets + registry: "gitlab.i2cat.net:5050" + username: "" + password: "" + email: "" + +# ==================================================================== +# RBAC Configuration +# ==================================================================== +rbac: + create: true + clusterRole: + name: lite2edge-runner + clusterRoleBinding: + name: lite2edge-runner-binding + +# ==================================================================== +# Labels & Annotations +# ==================================================================== +commonLabels: + platform: oop + component: lite2edge + +commonAnnotations: + platform: "Open Operator Platform" + component: "lite2edge" diff --git a/oop-platform-chart/charts/oeg/values.yaml b/oop-platform-chart/charts/oeg/values.yaml index 50051aa..83aa53a 100644 --- a/oop-platform-chart/charts/oeg/values.yaml +++ b/oop-platform-chart/charts/oeg/values.yaml @@ -15,14 +15,6 @@ mongodb: type: ClusterIP port: 27017 - resources: - limits: - cpu: 500m - memory: 512Mi - requests: - cpu: 250m - memory: 256Mi - # Persistence configuration persistence: enabled: true @@ -53,21 +45,13 @@ oegcontroller: port: 80 targetPort: 8080 - resources: - limits: - cpu: 1000m - memory: 1Gi - requests: - cpu: 500m - memory: 512Mi - # Environment variables env: mongoUri: "mongodb://oegmongo:27017" srmHost: "http://srm:8080/srm/1.0.0" federationManagerHost: "http://federation-manager.oop.svc.cluster.local:8989/operatorplatform/federation/v1" partnerApiRoot: "http://10.8.0.1:31002" - tokenEndpoint: "http://federation-manager.oop.svc.cluster.local:8080/realms/federation/protocol/openid-connect/token" + tokenEndpoint: "http://federation-manager.oop.svc.cluster.local:8089/realms/federation/protocol/openid-connect/token" availZoneNotifLink: "" # Ingress configuration diff --git a/oop-platform-chart/values.yaml b/oop-platform-chart/values.yaml index 9ce0e8f..7049710 100644 --- a/oop-platform-chart/values.yaml +++ b/oop-platform-chart/values.yaml @@ -142,7 +142,7 @@ oeg: env: mongoUri: "mongodb://oegmongo:27017" srmHost: "http://srm:8080/srm/1.0.0" - federationManagerHost: "http://federation-manager:8989/api/v1" + federationManagerHost: "http://federation-manager.oop.svc.cluster.local:8989/operatorplatform/federation/v1" # ==================================================================== # Federation Manager — in OOP namespace -- GitLab From 0b8ce4ff9f436ef0f44e5008f1cae089989ca1c6 Mon Sep 17 00:00:00 2001 From: Sergio Gimenez Date: Mon, 2 Mar 2026 23:11:48 +0100 Subject: [PATCH 2/3] Remove lite2edge chart from helm --- .../charts/lite2edge/Chart.yaml | 6 -- .../charts/lite2edge/templates/_helpers.tpl | 67 ---------------- .../lite2edge/templates/deployment.yaml | 39 ---------- .../charts/lite2edge/templates/namespace.yaml | 15 ---- .../charts/lite2edge/templates/rbac.yaml | 36 --------- .../charts/lite2edge/templates/service.yaml | 20 ----- .../lite2edge/templates/serviceaccount.yaml | 9 --- .../charts/lite2edge/values.yaml | 76 ------------------- 8 files changed, 268 deletions(-) delete mode 100644 oop-platform-chart/charts/lite2edge/Chart.yaml delete mode 100644 oop-platform-chart/charts/lite2edge/templates/_helpers.tpl delete mode 100644 oop-platform-chart/charts/lite2edge/templates/deployment.yaml delete mode 100644 oop-platform-chart/charts/lite2edge/templates/namespace.yaml delete mode 100644 oop-platform-chart/charts/lite2edge/templates/rbac.yaml delete mode 100644 oop-platform-chart/charts/lite2edge/templates/service.yaml delete mode 100644 oop-platform-chart/charts/lite2edge/templates/serviceaccount.yaml delete mode 100644 oop-platform-chart/charts/lite2edge/values.yaml diff --git a/oop-platform-chart/charts/lite2edge/Chart.yaml b/oop-platform-chart/charts/lite2edge/Chart.yaml deleted file mode 100644 index fcac2e5..0000000 --- a/oop-platform-chart/charts/lite2edge/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v2 -name: lite2edge -description: Lite2Edge - Lightweight Edge Cloud Platform for OOP -type: application -version: 0.1.0 -appVersion: "1.0.0" diff --git a/oop-platform-chart/charts/lite2edge/templates/_helpers.tpl b/oop-platform-chart/charts/lite2edge/templates/_helpers.tpl deleted file mode 100644 index 27ed1af..0000000 --- a/oop-platform-chart/charts/lite2edge/templates/_helpers.tpl +++ /dev/null @@ -1,67 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "lite2edge.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -*/}} -{{- define "lite2edge.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "lite2edge.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Namespace for lite2edge -*/}} -{{- define "lite2edge.namespace" -}} -{{- .Values.namespace | default "lite2edge" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "lite2edge.labels" -}} -helm.sh/chart: {{ include "lite2edge.chart" . }} -{{ include "lite2edge.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- with .Values.commonLabels }} -{{ toYaml . }} -{{- end }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "lite2edge.selectorLabels" -}} -app.kubernetes.io/name: {{ include "lite2edge.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -app: lite2edge -{{- end }} - -{{/* -Service Account name -*/}} -{{- define "lite2edge.serviceAccountName" -}} -{{- .Values.lite2edge.serviceAccount.name | default "lite2edge-sa" }} -{{- end }} diff --git a/oop-platform-chart/charts/lite2edge/templates/deployment.yaml b/oop-platform-chart/charts/lite2edge/templates/deployment.yaml deleted file mode 100644 index c49d0a9..0000000 --- a/oop-platform-chart/charts/lite2edge/templates/deployment.yaml +++ /dev/null @@ -1,39 +0,0 @@ -{{- if .Values.lite2edge.enabled }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ .Values.lite2edge.name }} - namespace: {{ include "lite2edge.namespace" . }} - labels: - {{- include "lite2edge.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.lite2edge.replicaCount }} - selector: - matchLabels: - {{- include "lite2edge.selectorLabels" . | nindent 6 }} - template: - metadata: - labels: - {{- include "lite2edge.selectorLabels" . | nindent 8 }} - spec: - serviceAccountName: {{ include "lite2edge.serviceAccountName" . }} - {{- if .Values.imagePullSecrets.enabled }} - imagePullSecrets: - - name: {{ .Values.imagePullSecrets.name }} - {{- end }} - containers: - - name: lite2edge - image: "{{ .Values.lite2edge.image.repository }}:{{ .Values.lite2edge.image.tag }}" - imagePullPolicy: {{ .Values.lite2edge.image.pullPolicy }} - ports: - - containerPort: {{ .Values.lite2edge.service.targetPort }} - env: - - name: K8S_NAMESPACE - value: "{{ .Values.targetNamespace }}" - - name: LOG_LEVEL - value: "{{ .Values.lite2edge.env.logLevel }}" - {{- with .Values.lite2edge.resources }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} -{{- end }} diff --git a/oop-platform-chart/charts/lite2edge/templates/namespace.yaml b/oop-platform-chart/charts/lite2edge/templates/namespace.yaml deleted file mode 100644 index d8294e8..0000000 --- a/oop-platform-chart/charts/lite2edge/templates/namespace.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.lite2edge.enabled }} -apiVersion: v1 -kind: Namespace -metadata: - name: {{ include "lite2edge.namespace" . }} - labels: - {{- include "lite2edge.labels" . | nindent 4 }} ---- -apiVersion: v1 -kind: Namespace -metadata: - name: {{ .Values.targetNamespace }} - labels: - app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} diff --git a/oop-platform-chart/charts/lite2edge/templates/rbac.yaml b/oop-platform-chart/charts/lite2edge/templates/rbac.yaml deleted file mode 100644 index a20e21d..0000000 --- a/oop-platform-chart/charts/lite2edge/templates/rbac.yaml +++ /dev/null @@ -1,36 +0,0 @@ -{{- if and .Values.lite2edge.enabled .Values.rbac.create }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: {{ .Values.rbac.clusterRole.name }} - labels: - {{- include "lite2edge.labels" . | nindent 4 }} -rules: - - apiGroups: [""] - resources: ["nodes"] - verbs: ["get", "list", "watch"] - - apiGroups: [""] - resources: ["pods", "services", "namespaces", "secrets", "configmaps", "serviceaccounts"] - verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] - - apiGroups: ["apps"] - resources: ["deployments", "statefulsets", "replicasets"] - verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] - - apiGroups: ["rbac.authorization.k8s.io"] - resources: ["roles", "rolebindings"] - verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ .Values.rbac.clusterRoleBinding.name }} - labels: - {{- include "lite2edge.labels" . | nindent 4 }} -subjects: - - kind: ServiceAccount - name: {{ include "lite2edge.serviceAccountName" . }} - namespace: {{ include "lite2edge.namespace" . }} -roleRef: - kind: ClusterRole - name: {{ .Values.rbac.clusterRole.name }} - apiGroup: rbac.authorization.k8s.io -{{- end }} diff --git a/oop-platform-chart/charts/lite2edge/templates/service.yaml b/oop-platform-chart/charts/lite2edge/templates/service.yaml deleted file mode 100644 index b5eac02..0000000 --- a/oop-platform-chart/charts/lite2edge/templates/service.yaml +++ /dev/null @@ -1,20 +0,0 @@ -{{- if .Values.lite2edge.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: {{ .Values.lite2edge.service.name }} - namespace: {{ include "lite2edge.namespace" . }} - labels: - {{- include "lite2edge.labels" . | nindent 4 }} -spec: - type: {{ .Values.lite2edge.service.type }} - selector: - {{- include "lite2edge.selectorLabels" . | nindent 4 }} - ports: - - protocol: TCP - port: {{ .Values.lite2edge.service.port }} - targetPort: {{ .Values.lite2edge.service.targetPort }} - {{- if and (eq .Values.lite2edge.service.type "NodePort") .Values.lite2edge.service.nodePort }} - nodePort: {{ .Values.lite2edge.service.nodePort }} - {{- end }} -{{- end }} diff --git a/oop-platform-chart/charts/lite2edge/templates/serviceaccount.yaml b/oop-platform-chart/charts/lite2edge/templates/serviceaccount.yaml deleted file mode 100644 index 619f15e..0000000 --- a/oop-platform-chart/charts/lite2edge/templates/serviceaccount.yaml +++ /dev/null @@ -1,9 +0,0 @@ -{{- if .Values.lite2edge.enabled }} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "lite2edge.serviceAccountName" . }} - namespace: {{ include "lite2edge.namespace" . }} - labels: - {{- include "lite2edge.labels" . | nindent 4 }} -{{- end }} diff --git a/oop-platform-chart/charts/lite2edge/values.yaml b/oop-platform-chart/charts/lite2edge/values.yaml deleted file mode 100644 index d2c7cee..0000000 --- a/oop-platform-chart/charts/lite2edge/values.yaml +++ /dev/null @@ -1,76 +0,0 @@ -# Lite2Edge Helm Chart Configuration -# ==================================================================== - -# Namespace for lite2edge deployment -namespace: lite2edge - -# Target namespace where lite2edge will deploy applications -targetNamespace: oop-apps - -# ==================================================================== -# Lite2Edge Configuration -# ==================================================================== -lite2edge: - enabled: true - name: lite2edge - replicaCount: 1 - - image: - repository: gitlab.i2cat.net:5050/areas/software-networks/operator-platform/lite2edge - tag: "latest" - pullPolicy: Always - - service: - name: lite2edge - type: ClusterIP - port: 80 - targetPort: 8080 - # NodePort is optional, only used if type is NodePort - nodePort: 30081 - - serviceAccount: - name: lite2edge-sa - - env: - logLevel: "INFO" - - resources: - limits: - cpu: 500m - memory: 512Mi - requests: - cpu: 100m - memory: 128Mi - -# ==================================================================== -# Image Pull Secret Configuration -# ==================================================================== -imagePullSecrets: - enabled: true - name: gitlab-registry-secret - # Registry credentials - should be provided via --set or external secrets - registry: "gitlab.i2cat.net:5050" - username: "" - password: "" - email: "" - -# ==================================================================== -# RBAC Configuration -# ==================================================================== -rbac: - create: true - clusterRole: - name: lite2edge-runner - clusterRoleBinding: - name: lite2edge-runner-binding - -# ==================================================================== -# Labels & Annotations -# ==================================================================== -commonLabels: - platform: oop - component: lite2edge - -commonAnnotations: - platform: "Open Operator Platform" - component: "lite2edge" -- GitLab From eb847c83383e27d7f749ce52714adda8299289f8 Mon Sep 17 00:00:00 2001 From: dimi Date: Tue, 3 Mar 2026 15:32:51 +0000 Subject: [PATCH 3/3] fix: remove resource limits, change image pull policy, small readme addition for lite2edge --- .../charts/federation-manager/README.md | 9 ++++++ .../charts/federation-manager/values.yaml | 2 +- oop-platform-chart/charts/oeg/values.yaml | 8 +++-- oop-platform-chart/charts/portal/values.yaml | 8 +---- oop-platform-chart/charts/srm/values.yaml | 32 ++++--------------- oop-platform-chart/values.yaml | 26 +++------------ 6 files changed, 28 insertions(+), 57 deletions(-) diff --git a/oop-platform-chart/charts/federation-manager/README.md b/oop-platform-chart/charts/federation-manager/README.md index ff7017c..b01682f 100644 --- a/oop-platform-chart/charts/federation-manager/README.md +++ b/oop-platform-chart/charts/federation-manager/README.md @@ -118,8 +118,17 @@ federationManager: host: "127.0.0.1" server: "/operatorplatform/federation/v1" port: "8992" + + # Edge cloud platform (lite2edge) — prerequisite for testing federation in this version + edgeCloudPlatform: + host: "lite2edge.lite2edge.svc.cluster.local" + port: "80" + client_name: "lite2edge" + flavour_id: "default" ``` +**Edge cloud platform (lite2edge):** Federation Manager uses this to talk to the edge cloud (lite2edge). Lite2edge is **not** deployed by this chart; deploy it separately (e.g. in namespace `lite2edge`) if you need to test federation. Override `edgeCloudPlatform` if your lite2edge runs at a different host/port or requires a specific `flavour_id`. + ### OpenVPN Configuration (Optional) To enable VPN connectivity for remote federation: diff --git a/oop-platform-chart/charts/federation-manager/values.yaml b/oop-platform-chart/charts/federation-manager/values.yaml index 99003f4..d367c72 100644 --- a/oop-platform-chart/charts/federation-manager/values.yaml +++ b/oop-platform-chart/charts/federation-manager/values.yaml @@ -103,7 +103,7 @@ federationManager: image: repository: labs.etsi.org:5050/oop/code/federation-manager tag: "1.0.0" - pullPolicy: Always + pullPolicy: IfNotPresent service: name: federation-manager diff --git a/oop-platform-chart/charts/oeg/values.yaml b/oop-platform-chart/charts/oeg/values.yaml index 83aa53a..bea2440 100644 --- a/oop-platform-chart/charts/oeg/values.yaml +++ b/oop-platform-chart/charts/oeg/values.yaml @@ -15,6 +15,8 @@ mongodb: type: ClusterIP port: 27017 + resources: {} + # Persistence configuration persistence: enabled: true @@ -37,7 +39,7 @@ oegcontroller: image: repository: labs.etsi.org:5050/oop/code/open-exposure-gateway tag: 1.0.0 - pullPolicy: Always + pullPolicy: IfNotPresent service: name: oeg @@ -45,13 +47,15 @@ oegcontroller: port: 80 targetPort: 8080 + resources: {} + # Environment variables env: mongoUri: "mongodb://oegmongo:27017" srmHost: "http://srm:8080/srm/1.0.0" federationManagerHost: "http://federation-manager.oop.svc.cluster.local:8989/operatorplatform/federation/v1" partnerApiRoot: "http://10.8.0.1:31002" - tokenEndpoint: "http://federation-manager.oop.svc.cluster.local:8089/realms/federation/protocol/openid-connect/token" + tokenEndpoint: "http://federation-manager.oop.svc.cluster.local:8080/realms/federation/protocol/openid-connect/token" availZoneNotifLink: "" # Ingress configuration diff --git a/oop-platform-chart/charts/portal/values.yaml b/oop-platform-chart/charts/portal/values.yaml index de7e169..8b1c4b7 100644 --- a/oop-platform-chart/charts/portal/values.yaml +++ b/oop-platform-chart/charts/portal/values.yaml @@ -21,10 +21,4 @@ service: targetPort: 3000 nodePort: "" -resources: - limits: - cpu: 500m - memory: 512Mi - requests: - cpu: 100m - memory: 256Mi +resources: {} diff --git a/oop-platform-chart/charts/srm/values.yaml b/oop-platform-chart/charts/srm/values.yaml index aee5639..e4e8473 100644 --- a/oop-platform-chart/charts/srm/values.yaml +++ b/oop-platform-chart/charts/srm/values.yaml @@ -15,14 +15,8 @@ mongodb: type: ClusterIP port: 27017 - resources: - limits: - cpu: 500m - memory: 512Mi - requests: - cpu: 250m - memory: 256Mi - + resources: {} + # Persistence configuration persistence: enabled: true @@ -44,7 +38,7 @@ srmcontroller: image: repository: labs.etsi.org:5050/oop/code/service-resource-manager tag: 1.0.0 - pullPolicy: Always + pullPolicy: IfNotPresent service: name: srm @@ -53,14 +47,8 @@ srmcontroller: targetPort: 8080 nodePort: 32415 # Fixed port for testing - resources: - limits: - cpu: 1000m - memory: 1Gi - requests: - cpu: 500m - memory: 512Mi - + resources: {} + # Environment variables for SRM env: kubernetesMasterIp: k3d-sunriseop-server-0 @@ -98,14 +86,8 @@ artifactManager: targetPort: 8000 nodePort: 30080 # Fixed port for testing - resources: - limits: - cpu: 500m - memory: 512Mi - requests: - cpu: 250m - memory: 256Mi - + resources: {} + env: pythonPath: "/app" diff --git a/oop-platform-chart/values.yaml b/oop-platform-chart/values.yaml index 7049710..1969e4a 100644 --- a/oop-platform-chart/values.yaml +++ b/oop-platform-chart/values.yaml @@ -26,13 +26,7 @@ srm: service: type: ClusterIP port: 27017 - resources: - limits: - cpu: 500m - memory: 512Mi - requests: - cpu: 250m - memory: 256Mi + resources: {} persistence: enabled: true accessMode: ReadWriteOnce @@ -57,13 +51,7 @@ srm: port: 8080 targetPort: 8080 nodePort: "" - resources: - limits: - cpu: 1000m - memory: 1Gi - requests: - cpu: 500m - memory: 512Mi + resources: {} env: empStorageUri: "mongodb://mongosrm:27017" artifactManagerAddress: "http://artefact-manager-service:8000" @@ -142,7 +130,7 @@ oeg: env: mongoUri: "mongodb://oegmongo:27017" srmHost: "http://srm:8080/srm/1.0.0" - federationManagerHost: "http://federation-manager.oop.svc.cluster.local:8989/operatorplatform/federation/v1" + federationManagerHost: "http://federation-manager:8989/api/v1" # ==================================================================== # Federation Manager — in OOP namespace @@ -270,10 +258,4 @@ portal: targetPort: 3000 nodePort: "" - resources: - limits: - cpu: 500m - memory: 512Mi - requests: - cpu: 100m - memory: 256Mi + resources: {} -- GitLab