Update sed version to fix failure to render

app.yaml

@@ -18,3 +18,28 @@ spec:
     automated:
       prune: true
       selfHeal: true
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: developer-portal-dev
+  namespace: dev-portal
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  project: dev-portal
+  source:
+    repoURL: https://github.com/diamondlightsource/developer-portal
+    targetRevision: dev
+    path: charts/apps
+    helm:
+      valueFiles:
+        - values.yaml
+        - dev-values.yaml
+  destination:
+    name: argus
+    namespace: dev-portal
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true

backstage/Dockerfile

@@ -19,14 +19,14 @@ COPY plugins/viewdocs-react/package.json plugins/viewdocs-react/package.json
 ENV CYPRESS_INSTALL_BINARY=0
 RUN --mount=type=cache,target=/root/.cache/yarn,sharing=locked \
     yarn global add node-gyp \
-    && yarn install --frozen-lockfile 
+    && yarn install --frozen-lockfile
 
 COPY ./ ./
 
 RUN yarn run tsc
 
-RUN yarn --cwd packages/app build 
-RUN yarn --cwd packages/backend build 
+RUN yarn --cwd packages/app build
+RUN yarn --cwd packages/backend build
 
 RUN mkdir packages/backend/dist/skeleton packages/backend/dist/bundle \
     && tar xzf packages/backend/dist/skeleton.tar.gz -C packages/backend/dist/skeleton \
@@ -36,7 +36,7 @@ FROM docker.io/library/nginx:1.29.1-alpine-slim as frontend
 
 WORKDIR /app
 
-RUN apk add --no-cache jq
+RUN apk add --no-cache jq sed
 
 COPY --from=build /app/packages/app/dist /usr/share/nginx/html
 COPY --chmod=700 container_utils/inject-config.sh /docker-entrypoint.d/40-inject-config.sh

charts/apps/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: developer-portal
 description: An ArgoCD App of Apps for deploying the Developer Portal
 type: application
-version: 0.1.1
+version: 0.2.0
 dependencies:
   - name: common
     repository: https://charts.bitnami.com/bitnami

charts/apps/dev-values.yaml

@@ -0,0 +1,17 @@
+project: ""
+destination:
+  name: pollux
+  server: ""
+  namespace: dev-portal
+
+postgresql:
+  enabled: true
+  targetRevision: 15.5.32
+
+backend:
+  enabled: true
+  targetRevision: dev
+
+frontend:
+  enabled: true
+  targetRevision: dev

charts/apps/templates/backend-app.yaml

@@ -12,6 +12,10 @@ spec:
     repoURL: https://github.com/diamondlightsource/developer-portal
     targetRevision: {{ .Values.backend.targetRevision }}
     path: charts/backend
+    helm:
+      valueFiles:
+        - values.yaml
+        - dev-values.yaml
   destination:
     name: {{ .Values.destination.name }}
     server: {{ .Values.destination.server }}

charts/apps/templates/frontend-app.yaml

@@ -12,6 +12,10 @@ spec:
     repoURL: https://github.com/diamondlightsource/developer-portal
     targetRevision: {{ .Values.frontend.targetRevision }}
     path: charts/frontend
+    helm:
+      valueFiles:
+        - values.yaml
+        - dev-values.yaml
   destination:
     name: {{ .Values.destination.name }}
     server: {{ .Values.destination.server }}

charts/backend/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: developer-portal-backend
 description: A Helm chart for deploying the Diamond developer portal backend
 type: application
-version: 0.1.8
-appVersion: 0.0.27
+version: 0.2.0
+appVersion: 0.0.28
 dependencies:
   - name: common
     repository: https://charts.bitnami.com/bitnami

charts/backend/dev-values.yaml

@@ -0,0 +1,22 @@
+fullnameOverride: developer-portal-dev-backend
+
+image:
+  tag: latest
+
+ingress:
+  host: dev-portal-dev.diamond.ac.uk
+
+postgres:
+  host: developer-portal-dev-postgresql
+  password:
+    existingSecret: developer-portal-dev-postgresql
+
+secrets:
+  githubAppClientId: AgALl0fTMkvt3cU17r+rp/uBcST48wKNJ6FrwN1A5fPSc2gg/a0G2TZhN1Kl6vK1Vy1D37UVHY5pjMNUZwGDHFDpT00iC0T4xqyHUx332ojtA4gq+o5JLPddPPxPs1c+dUGe2zfWJ9r1JcxVKMBm0lpwVxlrDwmPWkAXxf3pPlQK9C2umz7eaLmIrPdXb1/tBrNaJ6e1JyLPOLmjvqbRfK77mcKoOt2Rcl7Oxswnu6i3BzqdBnkzWr0h/vKquHYrhnwtPzjf2bn8ZAScMbNIf8uk4/ymbfYMMNkFsGUoQj2arnefHKt1Ub+Rm3AHVmwi+pjKMuqyVSQczhkb+oa0KPJe/R9d261QcEC42pebA6AHmZ0UqL42Ud2lEQyPlWyc17dwBP56WLIN+ZKqWfrdT2pw6EklAGyCJGyDnUNS9TYA/oPKPOQD9rnqhCIy+MXoFdkdHPS3bnWF8ofv+8ZdGQTFN9cQToRpgXCPGfMXQRvDmCVazqNrbJ2k4xl378mssnYJq5zi41+QXRg6d9j55TeRx9J7gaSZPQVDTi/Nm+EGqUlEZG6b1t0B88AR7y4pCaFF4yWD5uOWvnWLxUaJDIwC+Wo3qaMMuSiq3JQOxp1n8u63pp5mapTxK+IlHMW/piylW0lDwTugKiUh/axpZ3QprO01tVLebk06KrV+OQbr3PGaxS9Phrize9dJsF1KyI+UTWJfbUM2VUh55tv/j/hD2S9img==
+  githubAppSecret: AgBViW+/AOCSg+nIhhxWqZf/Zn7WxWWHIYte6A5Y89W1aEl7iVI/dl4Fr+QGS/ucQVEpO0hKv2d1JVxbiJv82yR2BsHlvZnv6D6BTdfpW8XFrTGpgK5AUMIVoFpBBXuyd/3120KdqIN9U6V/MGFRvY4Cc5uf0yZ4DIfh8Om4BcgiyUkkKMSrnBftnEeP7ZOiDXMGyb5OGcFHc5duNDpIjgnfJz4E6mSqEHjrNcREeqxXWFa+hGoPDMr100h0x/cgseWMMi8FNZgDFmL8qfu/uzLbPTjG0auyajKjUJcbrpZHc85cLER9mLY5dIBSbn8Fm37z523kkAx2tDsw387/1e3frL81fTpqBCL/lGuqmGhV9e064KFf6iahRJXOJ133RrPsae1HkeNDzNp2gifLLWOCN1tl5DkmpgIZtN/9Bgz+hIqVGo4Q369Xrljx2xpzaFALV/EmjkSiaxsHeAJGITC2FYWEo+5hwg+hsVKehUWzbTBQVhIlSNr/xsSCWqcl8kJ3AD2QvWUtQtZn+eSjAnol8NgYUzfD4de0vDAy2o1LVEIF0+kPv6YxC+8DEWkrDiAR/N0sdWlviCnys8VEjzvf1kML6mPHBKHtfjR3QR+uNTSXv4kLDpMvQvuDNe0QGaUoOcim4MQCysYa215fu8NyycmhCAsO9kMvrdEgSfpetkA1rbq8grDLxWL1ptfc0cSMLkevOuGNI+omH04kLV9JUyZSUa3TOZMn6rAkmGXLCF5bJGpUI6T/
+  githubToken: AgBzT2e7LLlWULBMWWe2FAoa2e17cS6Hh6xklIFNCfK3vYVuXip7fk3wau1zF0t45hCpNhplFP261M1ABC27Sauh48Z7xMJZy2vqiP9YvArp57GUsfUypk5FKHCI17/vULIxAs5zpqAuOUG8kVt7931/SymMqxX/mDl78THdCHE3ozJ0iFv9FiPzkyzh4FHCZcxKfZKr5xfL7hlIHa6bZvVTMPD+KxQ5iV2YFmdMf9ef6W2C+K0NvW8Mfq1q+retW/v7zln8vJfJTA1rUUmC28bvFHZkzjRGqtI2VlgiPl9xe06/jhO1l15brteThaVOW6OrbSLesLfuKZEvBJoHQsivyNHFWfBwYUFb3hZNQpzdK8MRbmheo7Dm7OdLF+HkiqKtoHn3Tx7o/BUHh+jk3e3RehVzrSTZOJrMeOf8/wh76KoWMmawgd8wQwLEY9byOWkjlxY/FE3n2FHYhUDikwjV0/nv1V7gzdV8Z2j671jq7SVdIuOGIEjT1IYl/foDRXLZhs6e/P4oHyEVADBLqMz4rrRaDQWIXkIKsv1UHthrH7n8l7drh7/nrWbtFsSmbwApj+jj3MdRjjFcS54RAg7Z/QzqduHjk2f1kjfiJGv2ggdRypbCcjqLtS8UilCWe6yDcvXFCN1VzuGSUxyqFI1kBHMqGMNiYZUExaCwmLe0nN9zyFsUBEICHHFfDWqBZpg4HkXG6krg0OEMYC+Fcg1UpQbBVZpsV81x/GzWIEAPOqSUQzmh6lYy
+  gitlabToken: AgBa7p/lRp1jIde24Yugul/gK/8HHnkKG0pyIk22/wGqdKWc7uzZp9BbdNAhdblieE8T6AVLd87TcmK+3wgDwMgyAbYMtI3uOFIDknkUtnS2EKPnTCnpWQ8OoRqJ1qrxG4O/Z1hMhmlQXzwM4hGgvBE5HrWXDRLi1W5W5r7QwsJ6OFTcRk0Tloc2D22TRClRxoZ9f3JU9hmH+f40wqBenVhhz/DckOGFMuvGLuqg63O4dcX4B6VAHZaf9F8lFb6iJjp8lWpNyv46qW+UukbssOFWy9Z+z9zS5A3qUK5sHMfAu3bS8vgQ+uv9Ea2Vr1kRMJ7iDitl/aaaHUqzRlEsaAJ7NTgwf5aBeHOfm6VWzOEhLVKZyGIUPtI3Wzgq5x0vykkSbczPc4ZoNIqI9YgaFD8c3WNZ4OAj01cHZN4Zqc43KKeBMgDXa9NE49PUpToKz6AC1zDuuL0gno4dpf73NCYI6fgDEl1IAmRmtef1iXPMVKJkSdW/0lHbOkcs3SDMjIQZspYeL92Q+K6rkWMMBJ/9/x7MA85AS7ZS7qr3S6NTRvj3FXJ2eaFGuL81hBEwY9yKnro/13PXuCaIGtrnxrGUoxgz1Q7fUbnY/aldDdeFCqDcW6uBzGD1Z4xwu/O/UBsS7VsvYeV4RiDBvlDswEiUJ0Ifvpy79tQ9LUeQ4xubu4/0npy1Gy1hl4DyfyUWRYrE+Jgl70ld5cMmVJ+YTk5JM6Mc9xElSBoiZw==
+  authGitlabClientId: AgBoTlY1xr1SM9BvQMbaPGVok8sb5s8QWpFs2Y6wr7UIeIMgkGbKBhv7HE2qJD7HiJ/DDL3p4r1of95vz1sKaPuZ/+AwxstjSEf6+N8YJbFz/aXNJ1RLZlExJ+V2/CWBVL4hGrg4OXpnNzc7LqUnnv3P2ZqeKX1341dt7EiGUYS2ymeLtmA+G0IXaAxwiydNUYsb0aMfUEnEL0f2IORzj+nInTNFRGwl8tUO9lsWhS356+FZDBlEtaErtqHsY1KzY5ox6DLiXlxmJKxeLNvrA6f0ycmhZqbmgF6FbZ4SccZA7ExAqxgiQpC3bc2K3Rw+mpZX6fNeRaSxSC3dlkCzjnFgoPUpeJrNtSDUzu7CoBqU4BcqhQ+6c/2xl0iFjoMlZx2hc8JpBlHao035FoawP4z4maXWevJayU4vkVNwq5ha/8K7GOaXL8Tl+Tv/W8BWvbfDSHNCXqYv5lzNyTkO8upUIt5nRibFxEO5dUbmbv72pRk9l/ecr+nTsdMhY2l3wgBHbJVEqarsrNu1s/QKq3BEvIs73fwETwueD7LE10RDo3T/WqPPYgdTwLEqwoiCWbFtXh6FSAttDCersUZXMW4oQqiC+p8fYfXonv/A+5JhIuXsmCffMO8oUkXYDiSBu2nsFag+VLDMCgQaG7Dmk4Ed/oO7WhWhJtXxvi9zmvMFv1B9L6/2kuJRXweSQn0YcfHYATq0sNZ9qo9jjZbTbfJbvlMaWsgPBmm6qVOqvTZinoiCl8sc1elD+sJJl8DzbpHz0UXAz2YIh/GDGb+ChfjM
+  authGitlabClientSecret: AgAto99I1TxoOQWYQI/OFZelbqlM76cwkNM6vNqfbmi6sbGiab6FoZZ78wCJuaB+WU0Dgcdgi2yZGvLyLQjG6/AwrwZMTWsmE18Va+rW/apCsUAIZeQkiJYoDmV0HE6ptGvAa1ve/Evzp+QIzq7i5JX8VLe6FGo1VXMa1Arzuh5UQ4NKjaKWOO5FbJY75Ge4HuIoxFwz91drfluF3O2FgxSMXpoHY6tCaxJpy10VQhYWbeTcvY2EVfVJnofWhOUIH7VmvLdzoghZG2FuDbRpFHMLmOjDrlRQyDYxWjtIAThJ6o+BB8k9j/HDhMT4jgWMQSRHUOB8jcQVI+2oXkdCSAelsFVbfzjg/DnwzS/dlyXCrV9951GPmitbc3dI9roNqkrXlM7Azce/vjSst4wEvGBa5UjQutE+am6PCdTmgh5xEOXyAEcFDMojzxakDVNKr/C4vmvHOBqom6sNnbQc9vst0uWQmPyt+QtUs6JZYNx1Ig7J9K3a5qmwR/46SPiVcVb0e2u9N9q49UcklqeEPSOOhUz2fP9EVr0l2AhNKkphKNaovoFCA0XC+u8hJif+3/TPWj0zedrcS2x2JVr76+PO5auXrWAKPPOB+2y5rTKjp0w21ekfz+yCDQ34WsSSF/BGWLpkPyMqKYtxMeSOti+lUjRSa4wUHPbW8d7keLM7oN3AFtMMWFnyiIHPfA8TKPiKf1VAlFYuFb3y93K4DcH7hZsSJgjp4loqpmWJPAVzcsk3AJdZaUSde9w5hgnswzq8/w8bsg6uJa0CvC7prnBErlEpJLWn
+  s3AccessKeyId: AgAHW3zmQDNqqdGam0sDwZ6cmVKNQpNXqLRQLbVycmG2XFCRPRe3ayAibj+nhMIqwM9sBcL9/qf6s2rGy9VKVnj810EXyVan+fTpPbFP/coEWf5mU7fFImv+baREJlqY5WuZoy+pZoqyY1tyxvjxRdnDEasVKX0CP0EnA3jpw9JFryY7cRgam+sz2FNmPc+0BnsmFUtIZzOzfGRFesXtLLVJkYZeXvG8VoQMLJOwVOiXNz1+/pMdGDsr6AEQh9aKhFOTMFpaVaQ4xwmATc5CFAbG4mVs3FOFjFOP1N3aHVZxubYrQKYyeRZNMkFOGnvs/j4dZSqoLau1T9ckS+3o3F5YJYYQl32YerKPHCridvqIUmEyBMCAtJBpgilsc07Nak+alSSn4UvDQK5TfwpOn/sIQoeyVKl1oiMnSkSpnhqxfdigJCTQv1JwIrt31ZRSz51uSiCILrRQGUnFqsK3iD5lS8wl2Lhzw6MjvDJhHJtCMErhKPy81//YCJrUziDy4Ha6/RCFTV1PNkTwWOMbQOa3gitwwPLhO3A6cWGspUO/mVH3r+TlJ0aRlZEGRkCCMASyOzAQELSSYre7+byhH7XrsAKAMgwI+sLLUZrkp9WnnwDbeCcRS+bxX1M7Qrr9bD2uOVG2oDQ97Hj4BLEXpKbI3oWFaVTV9loeM92liQI0Rt/DCCdBIK03Es4rD3VKkavGMDbZspNYju8GmSWRRi+mZ4UZ6w==
+  s3AccessKeySecret: AgAmLViKnuqALeXA4otvsUymw9R+2ydPdL6r+aUAM/w6i8KDUq8o9f+wtN7hcyiklMbed0moos5j8P/Cko9hIcKH/AHh93JTPo+/kh9XSJWmtpoI2osbKrFT176XsHwhfW5K3nmKDcNa/7h3JuXQsc7v+yOLeZMdfmD4unFrKKTcbMGmv4i+9LrTRxAxVoakxiEP64swIM7wZF9St2NlCQA5CPJu+Q61mNWY0v7KnCbKpX3BzmPrIAERscYPY8GgfzXaz0y/01CMD8xrmt7O0YhDSrh+pVvb0iwV8tabn3zu0Y9srNn1bPsVFbCHTsN/kNXr+ikQ5xnKJijBC40M+POoe/O+6pQNqu68gNyCvOmTdOYUBAaUGPA3/D5KUJNmX+5nMYRhqUNS8bR0Z4/ppt9gcAgsZOEwb0+KUk10N32ELvrgdVXPJizUDXX1+lab+gED65ITCAxijlIc4dNIQGOYdcrsv18phJqphTuXPZT9dJxxDHM3s9dbhus77YN1DRCdMJvG2qjl9BPKfC0uUwKcKNhp0URhGF1Mq+dyliYo92kxW7pPs+QZOUAPjtcxJt+wCKj2+R6fuoNXm2sZRAKkHKkQ48iv9SBUxUCOAinP7CrrJwap29m7gVC4oehkHMqnlVwLXY5dw4toGxcB2R7lMWnZwDFED1/+kUkSt8xAGO6pyzYhc9A6Ft2yrpDq5J9O6C6OJVg/fP3WxiN7J2J7OBJHWJuQS+saShnTGdEhj2OzR5XgaAGG

charts/backend/templates/secrets.yaml

@@ -14,9 +14,11 @@ spec:
       name: backstage-secrets
       namespace: dev-portal
   encryptedData:
-    github-app-client-id: AgBGJChwcZVcnz5Zrs/BGVCu6PgGdga8Vg/w6Nv5ZUbN04/tkT+uz98as3TSJH9/A7cK3ebzmcrHATeNT/zzmaZjkz6qieCmHgKrTraHrGN7gOxd7zDyeD15iQY8tUdZx+iGKKyvpvuyHlRv6TfypgnOwf3Jif8wXZnNDpz7e+aJSORvlSxqftJFCaU9VaK0ahKeWWC+FxoON9AHLddQwp/rAele8xJLvWNudyFkv4p4lPSbmFOX19IagkMtw9YbZ6Aa16xrGrDJxgNhJHAluQ+ncPDPiH3BnSxzwwAnHSLgCE82pEnpF9cgpHVDyeImb9a1IiZIW6ftjgEpnkS7v7YhIq3Lovr/NMkOwSWGQP2dznn2ZF8tDREW3JZFJOrYKTnErqyP3zFZUVuJbpXANMcm6bD2hOTK0qXj1dHZXwXOnOKO0aRhEtNa05umSST55RkVOdRAC6D08VguOvSvSEDxHzas8GbMyBfdAt8Porqie2qJ5fzf0Y22rmrZW00gJes0XsdTe9N74nH0y3kZANn61LRlS2dMQ33lqU6KFG0dp754GDuA3FQ3ZgR8ZvbQPi+dArHjgmfqPtOHTQNxMG1vfrlFUyI+zNqmysO1PZBc4jXNZ7pOVlJX4n/d/kjF/pbRNdNgHgXA2e3WU217AOUhMOUbOfYn3NV0OVJ2mjrpWgecWgPMEF9kfBSy9kp9en9MZzUM/MeTgQyKCIC6ABNqCZEQew==
-    github-app-secret: AgAHXs6tAywlS5DpcPVx54GQlLzwSoioFt2meRBxfm4MBFIcJTQcgaZuSYTTctbqJP04jIY3KVfGAzNKF7YLC7+RULVbA1SHtFJt8R9Um1CHOT+Z1n1nkDVUEvy3MA0vKyhjDfHNG/2AAE/kW58PKcFSXyKFBxsWUDRHuRLg9kXZ3kOGfuF8VAY/5pQJt0EB+4bBLt8h5/vVXl66p5QBci6m1pMBqlFTAI+rnHDMCCM4NJQrZOFblQGBc1U5/nc+0sUO31/wltu3EvZ6oAc0S215G+6UkRclXxD8UNKrXV0+wXvQsaAQBsraXTA6RokKWEapSZStw47tQxihZPdnt5xdFmKMd0kbgqt+bWcTNku6kvHxLyggKKGuvJlRAvu4sxDntbeyffN5oUw9SKkaTVHnCtzYk/9ewaA9oaZYQ6DPSarF0cAkSayBvhNd8NxBXj+NOkY9Za/if3Pb7MMkudg9D5YS28Ib5GoXz21BXEoYOMdzgde9fwsTfan0YD2/JPHEe1FI+/QrLCdHCAfZhzKpm+9dnMxGktueVkpfiGitB0T0SYkN4lz9hA/G/5UadXlZ5hZmOSVXUMfGhmzyjcaQWgsUn9rTFqmDpF9RwI8JCUrvBF5vKM9JsWNnoV/CXKIwhNX08UF39GeUax7cEnJjxyuRkg2IFQH7emkv8XwTEPDz2/PsSjcUEwlkE0P4xpRoAPNuOCAw1WVB/86Ms6Cs+/nCa4E8lGNIRWQs4h5sBpzbLvfaUy+a
-    github-token: AgBsYqfHV6hkMBg4HcX9vufOaGOGfJgSDF0i4KW3k/Ek6tYvbN864Jm0pE4NGJT0ERwX3mtaEi0Gt5bPW45TMoZr7NG8iA3D27oEdk4MqzDmGN7VZdiq9LyOHRUJXFSEg/i7NRbEWGvy+FDO09ZvreRW3OVmw2DSTj2ARJtG2xdPiPYJ4MSR8Q48wGRYp2I6So8RfWsPtoeOosEMeWV97gItAcWDNUz1RBCfxncDL0uWyBgEr7LGj9aXx0GfZSf2n1QQtbCb29txLyxeoAdfKCNQ+SG6vLatW69IzGKQ872nf66tz5N4LCiNjtWq0GBm4fm06GW9MFL4iVrPVHma1Dmd+7lxYA2Cw+4SmPvO/i8MLY2B1b0XxGYcDXTYRcfGYkVL7BNxXt6xlKecA6edNtrKeK2YvM1lUFM32yGhGjJsRO7OXg46KxAP4x+QS9VddVRzEgLZWn+e1hX3lFxdL0I+ADNV5fEGpgTEPnIZkC1Uww8nmERUE6hE9ryNafwsOpNoi99GdDVs7d3TgJsUNADgEQdXyw4UjFY3p0Dv7jYz4UyOB8h0NgC3QM/X6Np92T815Dogh9bIB9bi6zTNsXxlXU3gp+MkJoAV+mNWqTMBxrIaFm0ANZgSM9HGNIWN5kzSFRDmogKflJSVBAS7j4VzESsMRaeBBIxwODWqqwd+j+tNe5c69P3HddVD4uTp4yagA9+/pN4B58zExF7XwjaWyGP4ep8kIqH8Pk55MIoMwX3uoVOSVmO4
-    gitlab-token: AgAL9v31M279LQy+8m1lYKJRUjXbaa4NoE9/nZXoQLosdFB22QkAuWoCkW8YnFpX+6eL7Ycw1D4s2d2eGe2R8FERSTMpI95YJD669EjwHThh9f7KO0/GrjMZikUojZNBX2sL5Yd5lqZOEBQLYsgVMCvVo2R4NgYddmiJl+n2f7gQH57MfQA4fhqa0rMhgH56zCJyMeFlEIaezybg/LZZOg7ut8wVApF5SiepA0hWPhTi5G05bmsjiIOy9EsTNIZUL3rs2bwd+6WC293PQTaSaAOWJ1Na4fwOLaAgUZcIFLabOVmcRX0vFOGh5Yw8sQ4Unnzp2RuU3ndT2O92qAgnc48MiSQwcemBcKSQaHW/SDwW8YzonjvkGL/EWpTbLDOuADPqfAPJldU+LN+nFrrBs1SaYs+iHhpbrq4VnGUMUjC75uaTfx/kMNop4nDsorZosyoLnhKzxyCJdcUC3bXANKtoo6crS4x/Epzt3KJwAwxnWbvFRi8q7bVsykmf/764rXG59L2O/2lj7+QEvAfSas5a2Iyomc1vt/bkg526QuQgm1iegaoQB6r+7CBgZca4+n251JRk2hRTi6902vbTGCwftbltnKalEykDHZVCkdvh5u05ON+/lJsmppfirHv7jngWzODEGcugNmWp4Ize01Qq+Xo/n+tDlXIDcOuMqe5af3Jugor6I7DlE79/Y1M0kB7UF6EudiSm6p021dmiPFgKNtrTVTdWz7tp2A==
-    s3-access-key-id: AgCkGhsZpj7RCX3/mDHpa38PyU1OfWKjdClYhFt5YaolEzvSazv5btvW+nL1vJ7ZxDdx6CPbaU8Ihg070EZ5ROfm6X1Ic0VY0QkRZg0gW2OfEMi/BPZwesCh3RWkwLTb4oO1ZiRFWWLbupf2Iv5CVEbGEhyLJGRBOvF2DVOsp5ZvJC+iyJ6U0vyIHxtlVqhI7yHVHfFtBgisqMdEbtJRDY10KHx+8iqrYpP1oNJONrF4gSM7uXpLFkDD+27neycs+2wSNIHqmDa4XCbHuUFkztElp2/CiazBK+0URAK5F8KuUktyz91/BnYtEjD/+3LwhETdZAk0vQZtSrMGyhG8ZiD0+yiuylztWxk8vYNEVfB+zeDJf+Wa6BnKtDDAmKjwWUSGqxGjrys3RDur3gjQpqhPetdE5U2kkKIsu06ijYEhPgKIjPAJVDJRVrZTJg8xHgh1XXVirBRYhUgLLIxr+y/AsCTiekvsG8NwiE80VgpmlsFZBz62Vx3esmsYQsJo2SQqMk1gsgwXt4DZw8rvJzWmMNw0Xa/9Wl/CZQHCIdrmkn8P/A6hwo2yDS8AmIUp77/KEBrqDLmz2bBcOrKlcEbw2bKusn1fScmoOEKvgE/Ew7JfPp74YxoOfLdpqjh74F3Pav+AEIBolRbDOc/t7eTbppiwESaBfLytUMV3C77C0FTvfd50t1I8YZQPTnBPw2tGP7I6iJn/udr7vmrX4tkM8LCz5Q==
-    s3-access-key-secret: AgAVE6KEEy1Vh97M/rHz9LRCzJ4do9GFRtQYO7o3tD6jpOQAbLHRHptBESSSJDBRWZia2wBjGL+rIwg/UW/EHDklHwq98wlF45ARCc38fGCJtYUlBWkE9bR1ERvA5eICmv5AduH7RxBPdhDTTwxASYH52xn0gq7tBlRg9a+Z7a7axKbfPd1ILCRWZKIm86aKoOiEryIc/9p8wP/il/JS8SmcOThyVarIEeaIVORKobdbFSXsuYmANNCN/say5rZQ7CB6+YoBk6jyWE9BRLMd33BTP3vY/bxywLdas6mgzCpEkjKtd1AQgtPiu68i8CJzS+XBN/QqWtcYzf7B7R5yvYmk4WL0X010EdkB1vxCu3tzMmk6Y6wzQ6IU1573ZnjL+8dro3keqBcZSM/qxGyfu/VrUiUkoKFu9gzKeUI+EmCFuJh0sx06PJiR8+kxaIOVHPy+XH6Xzw3NkztTDkhfbqj4mWbbuCgySmkLTJU4SjYI2gpqfqAUuHgosnYhl8mNiOYQ0e8yMTJNALgo1g+uTzjey5Aui93MpADmPkVOpZe/I9Wwn88v6hdpZrwbQrcU/JI7lo5YHDx7DRONT6boYAhRsgwKOZNlm//OhcXBjvs5CtVzlWEXHwj3jsJnQCYdu86a1hEGAMnDRY117f87kAEIY03CZuuUoAj2xsz2M5syl+54rIJ2Ps4kpJEB+VFBJ42ynYVAZddeXJYh6VZX+Ba8uHkX/05KkkCa79XizRyoh3cuEcBa9K/t
+    github-app-client-id: {{ .Values.secrets.githubAppClientId }}
+    github-app-secret: {{ .Values.secrets.githubAppSecret }}
+    github-token: {{ .Values.secrets.githubToken }}
+    auth-gitlab-client-id: {{ .Values.secrets.authGitlabClientId }}
+    auth-gitlab-client-secret: {{ .Values.secrets.authGitlabClientSecret }}
+    gitlab-token: {{ .Values.secrets.gitlabToken }}
+    s3-access-key-id: {{ .Values.secrets.s3AccessKeyId }}
+    s3-access-key-secret: {{ .Values.secrets.s3AccessKeySecret }}

charts/backend/values.yaml

@@ -39,3 +39,11 @@ ingress:
 serviceAccount:
   create: true
   name: ""
+
+secrets:
+  githubAppClientId: AgBGJChwcZVcnz5Zrs/BGVCu6PgGdga8Vg/w6Nv5ZUbN04/tkT+uz98as3TSJH9/A7cK3ebzmcrHATeNT/zzmaZjkz6qieCmHgKrTraHrGN7gOxd7zDyeD15iQY8tUdZx+iGKKyvpvuyHlRv6TfypgnOwf3Jif8wXZnNDpz7e+aJSORvlSxqftJFCaU9VaK0ahKeWWC+FxoON9AHLddQwp/rAele8xJLvWNudyFkv4p4lPSbmFOX19IagkMtw9YbZ6Aa16xrGrDJxgNhJHAluQ+ncPDPiH3BnSxzwwAnHSLgCE82pEnpF9cgpHVDyeImb9a1IiZIW6ftjgEpnkS7v7YhIq3Lovr/NMkOwSWGQP2dznn2ZF8tDREW3JZFJOrYKTnErqyP3zFZUVuJbpXANMcm6bD2hOTK0qXj1dHZXwXOnOKO0aRhEtNa05umSST55RkVOdRAC6D08VguOvSvSEDxHzas8GbMyBfdAt8Porqie2qJ5fzf0Y22rmrZW00gJes0XsdTe9N74nH0y3kZANn61LRlS2dMQ33lqU6KFG0dp754GDuA3FQ3ZgR8ZvbQPi+dArHjgmfqPtOHTQNxMG1vfrlFUyI+zNqmysO1PZBc4jXNZ7pOVlJX4n/d/kjF/pbRNdNgHgXA2e3WU217AOUhMOUbOfYn3NV0OVJ2mjrpWgecWgPMEF9kfBSy9kp9en9MZzUM/MeTgQyKCIC6ABNqCZEQew==
+  githubAppSecret: AgAHXs6tAywlS5DpcPVx54GQlLzwSoioFt2meRBxfm4MBFIcJTQcgaZuSYTTctbqJP04jIY3KVfGAzNKF7YLC7+RULVbA1SHtFJt8R9Um1CHOT+Z1n1nkDVUEvy3MA0vKyhjDfHNG/2AAE/kW58PKcFSXyKFBxsWUDRHuRLg9kXZ3kOGfuF8VAY/5pQJt0EB+4bBLt8h5/vVXl66p5QBci6m1pMBqlFTAI+rnHDMCCM4NJQrZOFblQGBc1U5/nc+0sUO31/wltu3EvZ6oAc0S215G+6UkRclXxD8UNKrXV0+wXvQsaAQBsraXTA6RokKWEapSZStw47tQxihZPdnt5xdFmKMd0kbgqt+bWcTNku6kvHxLyggKKGuvJlRAvu4sxDntbeyffN5oUw9SKkaTVHnCtzYk/9ewaA9oaZYQ6DPSarF0cAkSayBvhNd8NxBXj+NOkY9Za/if3Pb7MMkudg9D5YS28Ib5GoXz21BXEoYOMdzgde9fwsTfan0YD2/JPHEe1FI+/QrLCdHCAfZhzKpm+9dnMxGktueVkpfiGitB0T0SYkN4lz9hA/G/5UadXlZ5hZmOSVXUMfGhmzyjcaQWgsUn9rTFqmDpF9RwI8JCUrvBF5vKM9JsWNnoV/CXKIwhNX08UF39GeUax7cEnJjxyuRkg2IFQH7emkv8XwTEPDz2/PsSjcUEwlkE0P4xpRoAPNuOCAw1WVB/86Ms6Cs+/nCa4E8lGNIRWQs4h5sBpzbLvfaUy+a
+  githubToken: AgCkX8hqrogEDLEdINoWcMnvWwqRSqKI74y2hPHhEx8DuE0YTE5gN5d1/H5VM/CJG7TD/9xuqEGbiSG8783ygNg/P17D5D5tf1OKhU8NC4QV1DLctLVXd7rNx9k8EBA9YU315QDj/KNuIdsUAJPtCRzlwN8v627w/CW/3GnqXEtTI4oaODZBnmHu3/P4ieqY/hXOD5RMahp4kiLunLLUyhGbbZErzRli2lnU6CP60o8eFYOX6I0CNVOO6NAPePiWAFc7NmmmiHx3ruepE6gP5Q1Sc3yvGdyqk9d3W5yxWRo2Fe0X1aAOCu0sRWTr6wz+gawNE5ztFPCxcgg46hiA6bvudwYyNyZOJQBZ0Ex0cDCY3B+hyKUsh08UAg6Ju0DBGn83lOv8zcD8oKVvaucoE7doGtdQl6kC5LtsGc5OJ53x69cbYgkVScpJFt7OrGRHLNXDop5klljQwyMTK8sezP8wyRI/EopdpVE0PtP+IGL7bE1JWNls/RldCfMMfIy7aa7bbINR3dAT4zCR+zeU8Ecrqc8vZwJ2IXWoXDGOonJAGSc/lZ8v2hAFvpfhhdeKFGU19oZ4g1dSuxbBXyGqJ6jsIpzGdJaZ/nUwaB0tDFJnxcm7IzK8OjSiOqyhxtuJQs/10E1Ns7PaHIH+5IGdxavDCAPfXjZoF95LF+l0MtG0L1TIl+2bCEbBMc/WDZNmGGp7JdI+I/7o7J4J5T7yKIcHbDPPltvx5Rw0sqbzRYam9gtANKQi02sP
+  gitlabToken: AgAnsFm+VkD/m5osmBNtd6kVuQA4hPO7LN57NFcWHD1VzvaGlcAc/t32ttt3MzDnm/t9cQsqKSYfKXRe62SVzsb4iWlL3tsnXKUYtij+MHzi0pBPo1oerviKJImLAymvQNJZ8f12j2ggqHNM2FeW1fzb+XlTjUtNDxJaJaY427IgZEkfYi/CAxP9O6GPK7zTyQhI1W7bY6mtnUhDvVNELXcEnXfgIrdiPDOF+KyPghj/DcGbgnP+4pne8KgMYMcXIodH9iPUdO95ZaQBMxElNkJ3+62qLIZ54fEnwX5L/2j3CHyT4nFI2m1Kzg3jD40Au3ilES9z1gu8/tggulVQGxzKbzjmT4+1KtRHLwjQHNtuNaXLNrr8vjk1TEYIYKzdt1Maul6WKkKiYLJF26MayAbMHGTbhb4eBd8ZM8ayCZGOlSl8eTVGkBtLqn3uqkTTZOWHyufy5kTyN/CyVFiZJkD8n6fy5AlxkLPQUuvL9ExbtNubD2vAzR3yII5p4xCinOWFivKGyzkpKb+Cr2I2t5vulP9cDLk4tdlpB3YKlgPOsdHJekZ1PFImp82WX/GwkeO3pQPy7k98p9io02TDCYeDMABMGIFpv5VJJ55qSrLn2b5cOGiMt50PoD0SbkA/mINqpetAH60cwn/M92w3yZj5/yxcOo3rdjQaFqSdfd8ujc0CwVx3iFXWxmXyvbG3t64FCYoCd+GFM24gWUx+bVHCCJ7BSU+XvC0Mew==
+  s3AccessKeyId: AgCkGhsZpj7RCX3/mDHpa38PyU1OfWKjdClYhFt5YaolEzvSazv5btvW+nL1vJ7ZxDdx6CPbaU8Ihg070EZ5ROfm6X1Ic0VY0QkRZg0gW2OfEMi/BPZwesCh3RWkwLTb4oO1ZiRFWWLbupf2Iv5CVEbGEhyLJGRBOvF2DVOsp5ZvJC+iyJ6U0vyIHxtlVqhI7yHVHfFtBgisqMdEbtJRDY10KHx+8iqrYpP1oNJONrF4gSM7uXpLFkDD+27neycs+2wSNIHqmDa4XCbHuUFkztElp2/CiazBK+0URAK5F8KuUktyz91/BnYtEjD/+3LwhETdZAk0vQZtSrMGyhG8ZiD0+yiuylztWxk8vYNEVfB+zeDJf+Wa6BnKtDDAmKjwWUSGqxGjrys3RDur3gjQpqhPetdE5U2kkKIsu06ijYEhPgKIjPAJVDJRVrZTJg8xHgh1XXVirBRYhUgLLIxr+y/AsCTiekvsG8NwiE80VgpmlsFZBz62Vx3esmsYQsJo2SQqMk1gsgwXt4DZw8rvJzWmMNw0Xa/9Wl/CZQHCIdrmkn8P/A6hwo2yDS8AmIUp77/KEBrqDLmz2bBcOrKlcEbw2bKusn1fScmoOEKvgE/Ew7JfPp74YxoOfLdpqjh74F3Pav+AEIBolRbDOc/t7eTbppiwESaBfLytUMV3C77C0FTvfd50t1I8YZQPTnBPw2tGP7I6iJn/udr7vmrX4tkM8LCz5Q==
+  s3AccessKeySecret: AgAVE6KEEy1Vh97M/rHz9LRCzJ4do9GFRtQYO7o3tD6jpOQAbLHRHptBESSSJDBRWZia2wBjGL+rIwg/UW/EHDklHwq98wlF45ARCc38fGCJtYUlBWkE9bR1ERvA5eICmv5AduH7RxBPdhDTTwxASYH52xn0gq7tBlRg9a+Z7a7axKbfPd1ILCRWZKIm86aKoOiEryIc/9p8wP/il/JS8SmcOThyVarIEeaIVORKobdbFSXsuYmANNCN/say5rZQ7CB6+YoBk6jyWE9BRLMd33BTP3vY/bxywLdas6mgzCpEkjKtd1AQgtPiu68i8CJzS+XBN/QqWtcYzf7B7R5yvYmk4WL0X010EdkB1vxCu3tzMmk6Y6wzQ6IU1573ZnjL+8dro3keqBcZSM/qxGyfu/VrUiUkoKFu9gzKeUI+EmCFuJh0sx06PJiR8+kxaIOVHPy+XH6Xzw3NkztTDkhfbqj4mWbbuCgySmkLTJU4SjYI2gpqfqAUuHgosnYhl8mNiOYQ0e8yMTJNALgo1g+uTzjey5Aui93MpADmPkVOpZe/I9Wwn88v6hdpZrwbQrcU/JI7lo5YHDx7DRONT6boYAhRsgwKOZNlm//OhcXBjvs5CtVzlWEXHwj3jsJnQCYdu86a1hEGAMnDRY117f87kAEIY03CZuuUoAj2xsz2M5syl+54rIJ2Ps4kpJEB+VFBJ42ynYVAZddeXJYh6VZX+Ba8uHkX/05KkkCa79XizRyoh3cuEcBa9K/t

charts/frontend/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: developer-portal-frontend
 description: A Helm chart for deploying the Diamond developer portal backend
 type: application
-version: 0.1.3
-appVersion: 0.0.27
+version: 0.2.0
+appVersion: 0.0.28
 dependencies:
   - name: common
     repository: https://charts.bitnami.com/bitnami

charts/frontend/dev-values.yaml

@@ -0,0 +1,7 @@
+fullnameOverride: developer-portal-dev-frontend
+
+image:
+  tag: latest
+
+ingress:
+  host: dev-portal-dev.diamond.ac.uk