Commit 80b6a9ad authored by Muhammad Umair Khan's avatar Muhammad Umair Khan
Browse files

run EDGEAPP as its own sandbox service with a separate ECS

parent d9194f7d
Loading
Loading
Loading
Loading
+0 −4
Changes for charts/mec-services/meep-app-enablement/values-template.yaml: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ ingress:
        - /{{.SandboxName}}/{{.LocationName}}/eecs-serviceprovisioning
        - /{{.SandboxName}}/{{.LocationName}}/eees-eecregistration
        - /{{.SandboxName}}/{{.LocationName}}/eees-easdiscovery
        - /{{.SandboxName}}/{{.LocationName}}/eees-easregistration
        
        {{- else }}
        - /{{.SandboxName}}/mec_app_support
@@ -63,7 +62,6 @@ ingress:
        - /{{.SandboxName}}/eecs-serviceprovisioning
        - /{{.SandboxName}}/eees-eecregistration
        - /{{.SandboxName}}/eees-easdiscovery
        - /{{.SandboxName}}/eees-easregistration
        {{- end }}
  annotations:
    kubernetes.io/ingress.class: nginx
@@ -78,7 +76,6 @@ ingress:
      rewrite ^/{{ .SandboxName }}/{{.LocationName}}/eecs-serviceprovisioning(/|$)(.*)$ /eecs-serviceprovisioning/$2 break;
      rewrite ^/{{ .SandboxName }}/{{.LocationName}}/eees-eecregistration(/|$)(.*)$ /eees-eecregistration/$2 break;
      rewrite ^/{{ .SandboxName }}/{{.LocationName}}/eees-easdiscovery(/|$)(.*)$ /eees-easdiscovery/$2 break;
      rewrite ^/{{ .SandboxName }}/{{.LocationName}}/eees-easregistration(/|$)(.*)$ /eees-easregistration/$2 break;
    {{- else }}
    nginx.ingress.kubernetes.io/configuration-snippet: |
      rewrite ^/{{ .SandboxName }}/mec_app_support(/|$)(.*)$ /mec_app_support/$2 break;
@@ -89,7 +86,6 @@ ingress:
      rewrite ^/{{ .SandboxName }}/eecs-serviceprovisioning(/|$)(.*)$ /eecs-serviceprovisioning/$2 break;
      rewrite ^/{{ .SandboxName }}/eees-eecregistration(/|$)(.*)$ /eees-eecregistration/$2 break;
      rewrite ^/{{ .SandboxName }}/eees-easdiscovery(/|$)(.*)$ /eees-easdiscovery/$2 break;
      rewrite ^/{{ .SandboxName }}/eees-easregistration(/|$)(.*)$ /eees-easregistration/$2 break;
    {{- end }}
    {{- if .AuthEnabled }}
    nginx.ingress.kubernetes.io/auth-url: {{ if .HttpsOnly }}https{{ else }}http{{ end }}://$http_host/auth/v1/authenticate?svc=meep-app-enablement&sbox={{.SandboxName}}&mep={{.LocationName}}
+5 −0
Changes for charts/mec-services/meep-edgeapp/Chart.yaml: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
apiVersion: v1
appVersion: "1.0.0"
description: MEEP EDGEAPP Service (3GPP EES / ECS, EDGE-1 / EDGE-4 / EDGE-3) Helm chart for Kubernetes
name: meep-edgeapp
version: 1.0.0
+32 −0
Changes for charts/mec-services/meep-edgeapp/templates/_helpers.tpl: 32 added lines, 0 removed lines.
Original line number Diff line number Diff line
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "meep-edgeapp.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "meep-edgeapp.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 "meep-edgeapp.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
+13 −0
Changes for charts/mec-services/meep-edgeapp/templates/clusterrolebinding.yaml: 13 added lines, 0 removed lines.
Original line number Diff line number Diff line
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
  name: "{{ .Release.Namespace }}:{{ template "meep-edgeapp.fullname" . }}"
roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: ClusterRole
  name: cluster-admin
subjects:
- kind: ServiceAccount
  name: {{ template "meep-edgeapp.fullname" . }}
  namespace: {{ .Release.Namespace }}
  
 No newline at end of file
+35 −0
Changes for charts/mec-services/meep-edgeapp/templates/codecov-pv.yaml: 35 added lines, 0 removed lines.
Original line number Diff line number Diff line
{{- if .Values.codecov.enabled}}
kind: PersistentVolume
apiVersion: v1
metadata:
  name: meep-edgeapp-codecov-pv
spec:
  storageClassName: meep-edgeapp-codecov-sc
  capacity:
    storage: 100Mi
  accessModes:
    - ReadWriteOnce
  persistentVolumeReclaimPolicy: Retain
  hostPath:
    path: {{ .Values.codecov.location }}

---
kind: StorageClass
apiVersion: storage.k8s.io/v1
metadata:
  name: meep-edgeapp-codecov-sc
provisioner: kubernetes.io/no-provisioner
volumeBindingMode: WaitForFirstConsumer
---
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
  name: meep-edgeapp-codecov-pvc
spec:
  storageClassName: meep-edgeapp-codecov-sc
  accessModes:
    - ReadWriteOnce
  resources:
    requests:
      storage: 100Mi
{{- end}}
Loading