Eoc 2.0.0

.github/workflows/release-beta.yml

@@ -0,0 +1,32 @@
+name: Release EOC Beta Chart
+
+on:
+  push:
+    branches:
+      - eoc-2.0.0
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Install Helm
+        uses: azure/setup-helm@v4
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Chart | Push
+        uses: appany/helm-oci-chart-releaser@v0.5.0
+        with:
+          name: eoc
+          repository: radiantlogic-devops/helm-charts
+          path: charts/eoc
+          tag: 2.0.0
+          registry: ghcr.io
+          update_dependencies: true
+          registry_username: "$GITHUB_ACTOR"
+          registry_password: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,4 +1,6 @@
 
 .DS_Store
 *.tgz
-*.lock
+*.lock
+local/
+.devcontainer/

charts/eoc/Chart.yaml

@@ -7,13 +7,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.5.3-rc.1
+version: 2.0.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.5.3-rc.1"
+appVersion: "2.0.0"
 
 maintainers:
   - name: pgodey

charts/eoc/templates/_helpers.tpl

@@ -212,4 +212,179 @@ Create the name of the service account to use
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
+{{- end }}
+
+{{/*
+WORKER
+*/}}
+
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "eoc-worker.name" -}}
+{{- if .Values.nameOverride }}
+{{- printf "%s-%s" .Values.nameOverride "worker" | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Chart.Name "worker" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- 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 "eoc-worker.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $_name := default .Chart.Name .Values.nameOverride }}
+{{- $name := printf "%s-%s" $_name "worker" }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s" $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "eoc-worker.chart" -}}
+{{- printf "%s-%s-%s" .Chart.Name "worker" .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "eoc-worker.labels" -}}
+helm.sh/chart: {{ include "eoc-worker.chart" . }}
+{{ include "eoc-worker.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "eoc-worker.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "eoc-worker.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "eoc-worker.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "eoc-worker.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+CLOUD PROVIDER ACCOUNTS HELPERS
+*/}}
+
+{{/*
+Cloud Provider Accounts with credentials (for orchestrator)
+*/}}
+{{- define "eoc.cloudProviderAccounts.withCredentials" -}}
+{{- if .Values.cloudProviderAccounts }}
+{{- .Values.cloudProviderAccounts | toJson }}
+{{- else }}
+{{- "[]" }}
+{{- end }}
+{{- end }}
+
+{{/*
+Cloud Provider Accounts without credentials (for backend)
+*/}}
+{{- define "eoc.cloudProviderAccounts.withoutCredentials" -}}
+{{- if .Values.cloudProviderAccounts }}
+{{- $accounts := list }}
+{{- range .Values.cloudProviderAccounts }}
+{{- $account := dict "name" .name "label" .label "managedBy" .managedBy "platform" .platform }}
+{{- $accounts = append $accounts $account }}
+{{- end }}
+{{- $accounts | toJson }}
+{{- else }}
+{{- "[]" }}
+{{- end }}
+{{- end }}
+
+{{/*
+MCP
+*/}}
+
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "eoc-mcp.name" -}}
+{{- if .Values.nameOverride }}
+{{- printf "%s-%s" .Values.nameOverride "mcp" | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Chart.Name "mcp" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- 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 "eoc-mcp.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $_name := default .Chart.Name .Values.nameOverride }}
+{{- $name := printf "%s-%s" $_name "mcp" }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s" $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "eoc-mcp.chart" -}}
+{{- printf "%s-%s-%s" .Chart.Name "mcp" .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "eoc-mcp.labels" -}}
+helm.sh/chart: {{ include "eoc-mcp.chart" . }}
+{{ include "eoc-mcp.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "eoc-mcp.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "eoc-mcp.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "eoc-mcp.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "eoc-mcp.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
 {{- end }}

charts/eoc/templates/backend_configmap.yaml

@@ -114,6 +114,14 @@ data:
 
   REGION: {{ .Values.global.region | quote }}
 
+  CLOUD_PROVIDER_ACCOUNTS: {{ include "eoc.cloudProviderAccounts.withoutCredentials" . | quote }}
+
+  TIERS_ENABLED: {{ .Values.ui.tiersVisibility | default false | quote }}
+  TASK_MANAGEMENT_LOGS_ENABLED: {{ .Values.ui.taskManagementLogsEnabled | default false | quote }}
+  TASK_MANAGEMENT_RE_RUN_ENABLED: {{ .Values.ui.taskManagementReRunEnabled | default false | quote }}
+  TASK_MANAGEMENT_CANCEL_ENABLED: {{ .Values.ui.taskManagementCancelEnabled | default false | quote }}
+  PROMOTION_PIPELINES_ENABLED: {{ .Values.features.pipeline.enabled | default false | quote }}
+
 {{- range $key, $value := (.Values.backend).env }}
   {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }}
 {{- end }}

charts/eoc/templates/backend_deployment.yaml

@@ -5,7 +5,7 @@ metadata:
   labels:
     {{- include "eoc-backend.labels" . | nindent 4 }}
 spec:
-  replicas: 1
+  replicas: {{ .Values.backend.replicas | default 1 }}
   selector:
     matchLabels:
       {{- include "eoc-backend.selectorLabels" . | nindent 6 }}

charts/eoc/templates/mcp_configmap.yaml

@@ -0,0 +1,28 @@
+{{- if .Values.mcp.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "eoc-mcp.fullname" . }}
+  labels:
+    app: {{ template "eoc-mcp.fullname" . }}
+    chart: "{{ template "eoc-mcp.chart" . }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+    role: eoc-mcp
+data:
+  # Server Configuration
+  PORT: "3000"
+  NODE_ENV: {{ .Values.mcp.nodeEnv | default "production" | quote }}
+
+  # Global Configuration
+  ENV_PREFIX: {{ .Values.global.infrastructureName | quote }}
+  DOMAIN_NAME: {{ .Values.global.domainName | quote }}
+  REGION: {{ .Values.global.region | quote }}
+
+{{- range $key, $value := (.Values.mcp).env }}
+  {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }}
+{{- end }}
+{{- range $key, $value := (.Values.global).env }}
+  {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }}
+{{- end }}
+{{- end }}

charts/eoc/templates/mcp_deployment.yaml

@@ -0,0 +1,66 @@
+{{- if .Values.mcp.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "eoc-mcp.fullname" . }}
+  labels:
+    {{- include "eoc-mcp.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.mcp.replicas | default 1 }}
+  selector:
+    matchLabels:
+      {{- include "eoc-mcp.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      name: {{ include "eoc-mcp.fullname" . | nindent 8 }}
+      labels:
+        {{- include "eoc-mcp.selectorLabels" . | nindent 8 }}   
+      annotations:
+      {{- if (.Values.checksumConfigMap).enabled | default true }}
+        checksum/environment: {{ include (print $.Template.BasePath "/mcp_configmap.yaml") . | sha256sum }}
+      {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+      containers:
+      - name: {{ .Chart.Name }}
+        image: "{{ .Values.mcp.image.repository }}:{{ .Values.mcp.image.tag | default .Chart.AppVersion }}"
+        imagePullPolicy: {{ .Values.mcp.image.pullPolicy }}
+        ports:
+          - name: http
+            containerPort: 3000
+            protocol: TCP
+        envFrom:
+          - configMapRef:
+              name: {{ template "eoc-mcp.fullname" . }}
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: 3000
+          initialDelaySeconds: {{ default 60 .Values.mcp.initialDelaySeconds }}
+          periodSeconds: {{ default 30 .Values.mcp.periodSeconds }}
+          failureThreshold: 10
+          successThreshold: 1
+        readinessProbe:
+          httpGet:
+              path: /health
+              port: 3000
+          initialDelaySeconds: {{ default 60 .Values.mcp.initialDelaySeconds }}
+          periodSeconds: {{ default 30 .Values.mcp.periodSeconds }}
+          failureThreshold: 10
+          successThreshold: 1
+      {{- with .Values.mcp.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.mcp.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.mcp.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+{{- end }}

charts/eoc/templates/mcp_service.yaml

@@ -0,0 +1,17 @@
+{{- if .Values.mcp.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "eoc-mcp.fullname" . }}
+  labels:
+    {{- include "eoc-mcp.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.mcp.service.type }}
+  ports:
+    - port: {{ .Values.mcp.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "eoc-mcp.selectorLabels" . | nindent 4 }}
+{{- end }}

charts/eoc/templates/orchestrator_configmap.yaml

@@ -23,6 +23,7 @@ data:
   APP_GIT_PRIVATE_KEY: {{ .Values.applications.fid.pipelineConfig.git.privateKey | quote }}
   DUPLO_SERVICES_NAMESPACE: {{  .Values.global.commonServicesNamespace | default .Values.orchestrator.duplo.servicesTenantName | quote }}
   ENVIRONMENT_NAMESPACE_PREFIX: {{ .Values.global.environmentNamespacePrefix | quote }}
+  CLOUD_PROVIDER_ACCOUNTS: {{ include "eoc.cloudProviderAccounts.withCredentials" . | quote }}
 {{- range $key, $value := (.Values.orchestrator).env }}
   {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }}
 {{- end }}

charts/eoc/templates/orchestrator_deployment.yaml

@@ -5,7 +5,7 @@ metadata:
   labels:
     {{- include "eoc-orchestrator.labels" . | nindent 4 }}
 spec:
-  replicas: 1
+  replicas: {{ .Values.orchestrator.replicas | default 1 }}
   selector:
     matchLabels:
       {{- include "eoc-orchestrator.selectorLabels" . | nindent 6 }}