[eoc] merge from master

.github/workflows/lint-test-eoc.yml

@@ -8,14 +8,14 @@ on:
 jobs:
   lint-test:
     runs-on: ubuntu-latest
-    
+
     steps:
-    
+
       - name: Clear any existing tool cache
         run: |
           mv "${{ runner.tool_cache }}" "${{ runner.tool_cache }}.old"
           mkdir -p "${{ runner.tool_cache }}"
-          
+
       - name: Checkout
         uses: actions/checkout@v2
         with:
@@ -28,7 +28,7 @@ jobs:
 
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.9
 
       - name: Set up chart-testing
         uses: helm/[email protected]
@@ -42,24 +42,87 @@ jobs:
           fi
           helm repo add bitnami https://charts.bitnami.com/bitnami
           helm repo add radiantone https://radiantlogic-devops.github.io/helm-charts
-          
+
       - name: Run chart-testing (lint)
         run: ct lint --target-branch ${{ github.event.repository.default_branch }}
 
       - name: Create kind cluster
         uses: helm/[email protected]
         if: steps.list-changed.outputs.changed == 'true'
-        
+
       - name: Kind cluster-info
         run: |
           kubectl cluster-info --context kind-chart-testing
           kubectl get nodes --context kind-chart-testing
 
+      - name: Create temporary values file
+        run: |
+          cat << EOF > temp-values.yaml
+          backend:
+            releaseChannels:
+              - name: "Official"
+                url: "https://radiantlogic-devops.github.io/release-stable/index.yaml"
+                isDefault: "true"
+            tiers:
+              - name: BaseTier
+                asg:
+                  Capacity: m5a.large
+                  DesiredCapacity: 1
+                  MinSize: 0
+                  MaxSize: 3
+                  MetaData:
+                  - Key: OsDiskSize
+                    Value: 50Gi
+                bwigrc:
+                  resources:
+                    limits:
+                      cpu: 1
+                      memory: 4Gi
+                    requests:
+                      cpu: 1
+                      memory: 4Gi
+                fid:
+                  persistence:
+                    enabled: true
+                    size: 100Gi
+                    storageClass: gp3
+                  resources:
+                    limits:
+                      cpu: 1
+                      memory: 4Gi
+                    requests:
+                      cpu: 1
+                      memory: 4Gi
+              - name: Tier1
+                asg:
+                  Capacity: m5a.xlarge
+                bwigrc:
+                  resources:
+                    limits:
+                      cpu: 2
+                      memory: 8Gi
+                fid:
+                  persistence:
+                    size: 100Gi
+                  resources:
+                    limits:
+                      cpu: 2
+                      memory: 8Gi
+                    requests:
+                      cpu: 2
+                      memory: 8Gi
+          EOF
+
       - name: Run chart-testing (install)
         run: |
           ct install --charts=charts/eoc --debug --helm-extra-args="--timeout=15m0s" --helm-extra-set-args="--set=postgresql.enabled=true \
                       --set=backend.database.auth.pass=eocadmin --set=backend.oauth.google.clientId=xxxxxx \
-                      --set=backend.oauth.microsoft.clientSecret=xxxxxx --set=backend.oauth.microsoft.clientId=xxxxxx \
-                      --set=backend.oauth.google.clientSecret=xxxxxx --set=backend.oauth.github.clientId=xxxxxx \
-                      --set=backend.oauth.github.clientSecret=xxxxxx --set=backend.s3BucketName=r1-eoc \
-                      --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2" --upgrade
+                      --set=backend.oauth.microsoft.enabled=true --set=backend.oauth.microsoft.clientSecret=xxxxxx --set=backend.oauth.microsoft.clientId=xxxxxx \
+                      --set=backend.oauth.google.enabled=true --set=backend.oauth.google.clientSecret=xxxxxx --set=backend.oauth.github.clientId=xxxxxx \
+                      --set=backend.oauth.github.enabled=true --set=backend.s3BucketName=r1-eoc --set=backend.grafana.metricsPrefixes=ldap \
+                      --set=backend.oauth.local.enabled=true --set=features.mfa.enabled=false --set=features.mfa.appName=Radiant-Logic-EOC \
+                      --set=applications.fid.nodeLimit=2 --set=applications.brainwave.nodeLimit=2 \
+                      --set=applications.fid.minVersion=xxx --set=applications.brainwave.minVersion=xxx \
+                      --set=global.commonServicesNamespace=xxxx --set=global.environmentNamespacePrefix=xxxx \
+                      --set=sss.s3.bucketName=r1-eoc --set=sss.s3.region=us-west-2 \
+                      --values temp-values.yaml" --upgrade

.github/workflows/lint-test-sdc-client.yaml

@@ -0,0 +1,58 @@
+name: Lint and Test SDC Client Charts
+
+on:
+  pull_request:
+    paths:
+      - 'charts/sdc-client/**'
+
+jobs:
+  lint-test:
+    runs-on: ubuntu-latest
+
+    steps:
+
+      - name: Clear any existing tool cache
+        run: |
+          mv "${{ runner.tool_cache }}" "${{ runner.tool_cache }}.old"
+          mkdir -p "${{ runner.tool_cache }}"
+
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.9.2
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+
+      - name: Set up chart-testing
+        uses: helm/[email protected]
+
+      - name: Run chart-testing (list-changed)
+        id: list-changed
+        run: |
+          changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }})
+          if [[ -n "$changed" ]]; then
+            echo "::set-output name=changed::true"
+          fi
+          helm repo add bitnami https://charts.bitnami.com/bitnami
+
+      - name: Run chart-testing (lint)
+        run: ct lint --target-branch ${{ github.event.repository.default_branch }}
+
+      - name: Create kind cluster
+        uses: helm/[email protected]
+        if: steps.list-changed.outputs.changed == 'true'
+
+      - name: Kind cluster-info
+        run: |
+          kubectl cluster-info --context kind-chart-testing
+          kubectl get nodes --context kind-chart-testing
+
+      - name: Run chart-testing (install)
+        run: ct install --charts=charts/sss --debug

.github/workflows/lint-test-sdc.yml

@@ -28,7 +28,7 @@ jobs:
 
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.9
 
       - name: Set up chart-testing
         uses: helm/[email protected]

.github/workflows/lint-test-sss.yml

@@ -28,7 +28,7 @@ jobs:
 
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.9
 
       - name: Set up chart-testing
         uses: helm/[email protected]

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: 0.4.0
+version: 1.5.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: "0.4.0"
+appVersion: "1.5.0"
 
 maintainers:
   - name: pgodey

charts/eoc/templates/backend_configmap.yaml

@@ -17,18 +17,27 @@ data:
   DATABASE_USERNAME: {{ .Values.backend.database.auth.user | quote }}
   DATABASE_PASSWORD: {{ .Values.backend.database.auth.pass | quote }}
 
+  ENABLE_MFA: {{ .Values.features.mfa.enabled | quote }}
+  APP_MFA_NAME: {{ .Values.features.mfa.appName | quote }}
+
   JWT_SECRET: {{ .Values.backend.jwt.secret | quote }}
   JWT_EXPIRES_IN: {{ .Values.backend.jwt.expiresIn | quote }}
 
+  OAUTH_GOOGLE_ENABLE: {{ .Values.backend.oauth.google.enabled | quote }}
   OAUTH_GOOGLE_CLIENT_ID: {{ .Values.backend.oauth.google.clientId | quote }}
   OAUTH_GOOGLE_CLIENT_SECRET: {{ .Values.backend.oauth.google.clientSecret | quote }}
 
+  OAUTH_GITHUB_ENABLE: {{ .Values.backend.oauth.github.enabled | quote }}
   OAUTH_GITHUB_CLIENT_ID: {{ .Values.backend.oauth.github.clientId | quote }}
   OAUTH_GITHUB_CLIENT_SECRET: {{ .Values.backend.oauth.github.clientSecret | quote }}
 
+  OAUTH_MICROSOFT_ENABLE: {{ .Values.backend.oauth.microsoft.enabled | quote }}
   OAUTH_MICROSOFT_CLIENT_ID: {{ .Values.backend.oauth.microsoft.clientId | quote }}
   OAUTH_MICROSOFT_CLIENT_SECRET: {{ .Values.backend.oauth.microsoft.clientSecret | quote }}
 
+  AUTH_LOCAL_ENABLE: {{ .Values.backend.oauth.local.enabled | quote }}
+  AUTH_LOCAL_MFA_ENABLE: {{ .Values.backend.oauth.local.mfa | default "false" | quote }}
+
   EMAIL_FROM: {{ .Values.backend.smtp.from | quote }}
   EMAIL_ID: {{ .Values.backend.smtp.user | quote }}
   EMAIL_PASS: {{ .Values.backend.smtp.pass | quote }}
@@ -38,16 +47,20 @@ data:
   ADMIN_EMAIL: {{ .Values.backend.admin.email | quote }}
   ADMIN_FIRST_NAME: {{ .Values.backend.admin.firstName | quote }}
   ADMIN_LAST_NAME: {{ .Values.backend.admin.lastName | quote }}
+  ADMIN_PASSWORD: {{ .Values.backend.admin.password | default "" | quote }}
 
   APP_ROOT_DIRECTORY: {{ .Values.backend.appRootDirectory | quote }}
 
   ENCRYPTION_KEY: {{ .Values.backend.encryptionKey | quote }}
 
   KIBANA_API_LINK: {{ .Values.backend.kibana.apiUrl | quote }}
+  KIBANA_BASIC_AUTH: {{ .Values.backend.kibana.basicAuth | default "" | quote }}
 
   GRAFANA_BASE_URL: {{ .Values.backend.grafana.host | quote }}
   GRAFANA_USERNAME: {{ .Values.backend.grafana.username | quote }}
   GRAFANA_PASSWORD: {{ .Values.backend.grafana.password | quote }}
+  GRAFANA_METRICS_PREFIXES: {{ .Values.backend.grafana.metricsPrefixes | quote }}
+  GRAFANA_BASIC_AUTH: {{ .Values.backend.grafana.basicAuth | default "" | quote }}
 
   AGENTS_BASE_PATH: {{ .Values.backend.agents.api.endpoint | quote }}
   AGENTS_CLIENT_ID: {{ .Values.backend.agents.api.clientId | quote }}
@@ -56,11 +69,57 @@ data:
   AGENTS_SERVER_NAME: {{ .Values.backend.agents.inlets.serverName | quote }}
   AGENTS_SERVER_ENDPOINT: {{ .Values.backend.agents.inlets.serverEndpoint | quote }}
 
-  MIN_ENVIRONMENT_VERSION: {{ .Values.global.minFidVersion | quote }}
+  SDC_AWS_ACCESS_KEY_ID: {{ .Values.backend.agents.client.accessKeyId | quote}}
+  SDC_AWS_ACCESS_KEY_SECRET: {{ .Values.backend.agents.client.accessKeySecret | quote }}
+  SDC_AWS_REGION: {{ .Values.backend.agents.client.s3Region | quote }}
+  SDC_AWS_S3_BUCKET_NAME: {{ .Values.backend.agents.client.s3BucketName | quote }}
+  SDC_CLIENT_VERSION: {{ .Values.backend.agents.client.version | quote }}
+
   ENV_PREFIX: {{ .Values.global.infrastructureName | quote }}
   DOMAIN_NAME: {{ .Values.global.domainName | quote }}
 
-  NODE_LIMIT: {{ .Values.global.nodeLimit | quote }}
+  NODE_LIMIT_FID: {{ .Values.applications.fid.nodeLimit | default 1 | quote }}
+  NODE_LIMIT_BRAINWAVE: {{ .Values.applications.brainwave.nodeLimit | default 1 | quote }}
+  NODE_LIMIT_IDO: {{ .Values.applications.ido.nodeLimit | default 1 | quote }}
+  FID_MIN_VERSION: {{ .Values.applications.fid.minVersion | default "8.0.0" | quote }}
+  BW_MIN_VERSION: {{ .Values.applications.brainwave.minVersion | default "3.0.0" | quote }}
+  IDO_MIN_VERSION: {{ .Values.applications.ido.minVersion | default "0.0.0" | quote }}
+
+  FID_MIN_VERSION_UPDATE: {{ .Values.applications.fid.minVersionUpdate | default "8.0.0" | quote }}
+  BW_MIN_VERSION_UPDATE: {{ .Values.applications.brainwave.minVersionUpdate | default "3.0.0" | quote }}
+  IDO_MIN_VERSION_UPDATE: {{ .Values.applications.ido.minVersionUpdate | default "0.0.0" | quote }}
+
+  DUPLO_SERVICES_NAMESPACE: {{  .Values.global.commonServicesNamespace | default .Values.orchestrator.duplo.servicesTenantName | quote }}
+  ENVIRONMENT_NAMESPACE_PREFIX: {{ .Values.global.environmentNamespacePrefix | default "" | quote }}
+
+  DEFAULT_TIER: {{ .Values.backend.defaultTierName | default "Tier1" | quote }}
+
+  DISABLE_SEQUENTIAL_APP_VERSION_UPDATE: {{ .Values.backend.disableSequentialAppVersionUpdate | default "true" | quote }}
+
+  OIDC_TEMPLATES: {{ .Values.backend.oidcTemplates | default "" | toJson | quote }}
+
+  RELEASE_CHANNELS: {{ .Values.backend.releaseChannels | default "[{\"isDefault\":\"true\",\"name\":\"Official\",\"url\":\"https://radiantlogic-devops.github.io/release-stable/index.yaml\"}]" | toJson | quote }}
+
+  TIERS: {{ .Values.backend.tiers | default "[{\"name\":\"BaseTier\",\"asg\":{\"MinSize\":0,\"MaxSize\":3,\"DesiredCapacity\":1,\"Capacity\":\"m5a.large\",\"MetaData\":[{\"Key\":\"OsDiskSize\",\"Value\":\"50Gi\"}]},\"fid\":{\"persistence\":{\"enabled\":true,\"storageClass\":\"gp3\",\"size\":\"100Gi\"},\"resources\":{\"limits\":{\"cpu\":1,\"memory\":\"4Gi\"},\"requests\":{\"cpu\":1,\"memory\":\"4Gi\"}}},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":1,\"memory\":\"4Gi\"},\"requests\":{\"cpu\":1,\"memory\":\"4Gi\"}}}},{\"name\":\"Tier1\",\"asg\":{\"Capacity\":\"m5a.xlarge\"},\"fid\":{\"persistence\":{\"size\":\"100Gi\"},\"resources\":{\"limits\":{\"cpu\":2,\"memory\":\"8Gi\"},\"requests\":{\"cpu\":2,\"memory\":\"8Gi\"}}},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":2,\"memory\":\"8Gi\"}}}},{\"name\":\"Tier2\",\"asg\":{\"Capacity\":\"m5a.2xlarge\"},\"fid\":{\"persistence\":{\"size\":\"200Gi\"},\"resources\":{\"limits\":{\"cpu\":4,\"memory\":\"16Gi\"},\"requests\":{\"cpu\":4,\"memory\":\"16Gi\"}}},\"bwigrc\":{\"resources\":{\"limits\":{\"cpu\":4,\"memory\":\"16Gi\"},\"requests\":{\"cpu\":4,\"memory\":\"16Gi\"}}}}]" | toJson | quote}}
+
+  SERVICE_STATUS_CONFIG: {{ .Values.backend.serviceStatusConfig | default "" | toJson | quote }}
+
+  FID_LOG_SETTINGS: {{ .Values.applications.fid.logsConfig | default "" | toJson | quote }}
+
+  DEFAULT_AGGREGATOR: {{ .Values.backend.defaultLogAggregator | default "" | toJson | quote }}
+
+  SCHEDULED_MAINTENANCE_CONFIG: {{ .Values.backend.scheduledMaintenanceConfig | default "" | toJson | quote }}
+
+  NOTIFICATION_CONFIG: {{ .Values.backend.userNotificationsConfig | default "" | toJson | quote }}
+
+  REGION: {{ .Values.global.region | quote }}
+
+{{- range $key, $value := (.Values.backend).env }}
+  {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }}
+{{- end }}
+{{- range $key, $value := (.Values.global).env }}
+  {{ tpl $key $ }}: {{ tpl (print $value) $ | quote }}
+{{- end }}
 kind: ConfigMap
 metadata:
   labels:

charts/eoc/templates/backend_deployment.yaml

@@ -14,7 +14,15 @@ spec:
       name: {{ include "eoc-backend.fullname" . | nindent 8 }}
       labels:
         {{- include "eoc-backend.selectorLabels" . | nindent 8 }}   
+      annotations:
+      {{- if (.Values.checksumConfigMap).enabled | default true }}
+        checksum/environment: {{ include (print $.Template.BasePath "/backend_configmap.yaml") . | sha256sum }}
+      {{- end }}
     spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
       containers:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.backend.image.repository }}:{{ .Values.backend.image.tag | default .Chart.AppVersion }}"
@@ -28,16 +36,16 @@ spec:
           httpGet:
             path: /eoc-backend/health
             port: 3000
-          initialDelaySeconds: 120
-          periodSeconds: 30
+          initialDelaySeconds: {{ default 60 .Values.backend.initialDelaySeconds }}
+          periodSeconds: {{ default 30 .Values.backend.periodSeconds }}
           failureThreshold: 10
           successThreshold: 1
         readinessProbe:
           httpGet:
               path: /eoc-backend/health
               port: 3000
-          initialDelaySeconds: 120
-          periodSeconds: 30
+          initialDelaySeconds: {{ default 60 .Values.backend.initialDelaySeconds }}
+          periodSeconds: {{ default 30 .Values.backend.periodSeconds }}
           failureThreshold: 10
           successThreshold: 1
       {{- with .Values.backend.nodeSelector }}

charts/eoc/templates/backend_service.yaml

@@ -2,6 +2,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "eoc-backend.fullname" . }}-service
+{{- if .Values.backend.metrics.enabled }}
+  annotations:
+    prometheus.io/scrape: 'true'
+    prometheus.io/port: '3000'
+    prometheus.io/path: {{ .Values.backend.basePath }}/metrics
+{{- end }}  
 spec:
   ports:
     - name: {{ include "eoc-backend.fullname" . }}-service-port