prerelease branch: remove nrwl-api

.github/workflows/chart_lint_and_test.yaml

@@ -22,7 +22,7 @@ jobs:
           check-latest: true
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.4.0
+        uses: helm/chart-testing-action@v2.6.1
 
       - name: Run chart-testing (list-changed)
         id: list-changed

README.md

@@ -60,7 +60,6 @@ If you only applied the secret from Step 3, the only thing you will need to chan
 The installation will create the following:
 
 1. nx-cloud-frontend (deployment)
-2. nx-cloud-api (deployment)
 3. nx-cloud-nx-api (deployment)
 4. nx-cloud-file-server (deployment)
 5. nx-cloud-aggregator (cron job)
@@ -141,35 +140,6 @@ spec:
                 name: nx-cloud-nx-api-service
                 port:
                   number: 4203
-          - path: /api
-            pathType: Prefix
-            backend:
-              service:
-                name: nx-cloud-nrwl-api-service
-                port:
-                  number: 4000
-          - path: /graphql
-            pathType: Prefix
-            backend:
-              service:
-                name: nx-cloud-nrwl-api-service
-                port:
-                  number: 4000
-          - path: /auth
-            pathType: Prefix
-            backend:
-              service:
-                name: nx-cloud-nrwl-api-service
-                port:
-                  number: 4000
-          - path: /download
-            pathType: Prefix
-            backend:
-              service:
-                name: nx-cloud-nrwl-api-service
-                port:
-                  number: 4000
-                             - path: /download
           - pathType: Prefix
             backend:
                service:

aws-guide/AWS-GUIDE.md

@@ -107,7 +107,7 @@ We recommend setting up HTTPS for your NxCloud cluster, but you can skip this st
       1. for HTTPS: `nxCloudAppURL: 'https://your-new-nx-cloud-url.com'`
       2. or for HTTP: `nxCloudAppURL: 'http://k8s-default-nxcloudi-f36cd47328-1606205137.us-east-1.elb.amazonaws.com'`
    5. Re-apply the changes: `helm upgrade --install nx-cloud nx-cloud/nx-cloud --values=./helm-values.yml`
-   6. You might need to restart your deployments as well so they can pick up the new URL `kubectl rollout restart deployment nx-cloud-nx-api nx-cloud-api`
+   6. You might need to restart your deployments as well so they can pick up the new URL `kubectl rollout restart deployment nx-cloud-nx-api nx-cloud-frontend`
 
 6. In your Nx workspace, enable NxCloud and point it to the above URL: `NX_CLOUD_API=https://your-nx-cloud-url.com nx connect`
 7. Run a command, you should start seeing NxCloud Run URLs at the end
@@ -242,7 +242,7 @@ eksctl create iamserviceaccount \
 9. Check the status of the secrets:
    1. Check if secret keys are being retrieved correctly: `kubectl get secrets nx-cloud-k8s-secret -o json`
    2. You can see any errors by `kubectl describe externalsecrets.external-secrets.io nx-cloud-external-secret`
-10. You might need to restart your deployments as well so they can pick up the new secret values `kubectl rollout restart deployment nx-cloud-nx-api nx-cloud-api`
+10. You might need to restart your deployments as well so they can pick up the new secret values `kubectl rollout restart deployment nx-cloud-nx-api nx-cloud-frontend`
 
 
 ## Common Issues

charts/nx-cloud/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: nx-cloud
 description: Nx Cloud Helm Chart
 type: application
-version: 0.11.5
+version: 0.12.0-rc.2
 maintainers:
   - name: nx
     url: "https://nx.app/"

charts/nx-cloud/ci/basic-values.yaml

@@ -16,13 +16,6 @@ frontend:
       memory: '0.5Mi'
       cpu: '0.1'
 
-api:
-  skipLiveness: 'true'
-  resources:
-    requests:
-      memory: '0.5Mi'
-      cpu: '0.1'
-
 nxApi:
   resources:
     requests:

charts/nx-cloud/ci/scm-gh-values.yaml

@@ -27,13 +27,6 @@ frontend:
       memory: '0.5Mi'
       cpu: '0.1'
 
-api:
-  skipLiveness: 'true'
-  resources:
-    requests:
-      memory: '0.5Mi'
-      cpu: '0.1'
-
 nxApi:
   resources:
     requests:

charts/nx-cloud/ci/scm-gl-values.yaml

@@ -21,13 +21,6 @@ frontend:
       memory: '0.5Mi'
       cpu: '0.1'
 
-api:
-  skipLiveness: 'true'
-  resources:
-    requests:
-      memory: '0.5Mi'
-      cpu: '0.1'
-
 nxApi:
   resources:
     requests:

charts/nx-cloud/ci/sh-like-values.yaml

@@ -48,13 +48,6 @@ frontend:
       memory: '0.5Mi'
       cpu: '0.1'
 
-api:
-  skipLiveness: 'true'
-  resources:
-    requests:
-      memory: '0.5Mi'
-      cpu: '0.1'
-
 nxApi:
   resources:
     requests:

charts/nx-cloud/templates/NOTES.txt

@@ -2,8 +2,8 @@ Thank you for installing {{ .Chart.Name }}
 
 The version you installed is {{ .Chart.Version }}
 
-Please note that as of version 0.11.0, the compatibility with nx-cloud images has changed and
-only image tag 2308.22.7 and later are supported. 
+Please note that as of version 0.12.0, the compatibility with nx-cloud images has changed and
+only image tag 2308.22.7.patch7 and later are supported.
 
 At the time of install, you used version {{ .Values.global.imageTag }}, if you experience
 any issues, please ensure you are using a compatible version.

charts/nx-cloud/templates/_auth-helpers.tpl

@@ -1,4 +1,4 @@
-{{- define "nxCloud.api.auth" }}
+{{- define "nxCloud.frontend.auth" }}
 {{- if .Values.github.auth.enabled }}
 - name: GITHUB_AUTH_CLIENT_ID
   valueFrom:

charts/nx-cloud/templates/_images.yml

@@ -34,13 +34,6 @@ Return proper frontend image name
 {{- include "nxCloud.images.common" (dict "imageRoot" .Values.frontend.image "global" .Values.global "image" .Values.image) }}
 {{- end }}
 
-{{/*
-Return proper api image name
-*/}}
-{{- define "nxCloud.images.api.image" }}
-{{- include "nxCloud.images.common" (dict "imageRoot" .Values.api.image "global" .Values.global "image" .Values.image) }}
-{{- end }}
-
 {{/*
 Return proper nx-api image name
 */}}

charts/nx-cloud/templates/_scm-helpers.tpl

@@ -1,4 +1,4 @@
-{{- define "nxCloud.api.scm.github" }}
+{{- define "nxCloud.frontend.scm.github" }}
 {{- if .Values.github.pr.enabled }}
   {{- if eq .Values.github.pr.mode "webhook" }}
 - name: NX_CLOUD_VCS_INTEGRATION_TYPE
@@ -48,7 +48,7 @@
 {{- end }}
 {{- end }}
 
-{{- define "nxCloud.api.scm.gitlab" }}
+{{- define "nxCloud.frontend.scm.gitlab" }}
 {{- if .Values.gitlab.mr.enabled }}
 - name: NX_CLOUD_VCS_INTEGRATION_TYPE
   value: "GITLAB_EVENTLESS"
@@ -75,16 +75,16 @@
 {{- end }}
 {{- end }}
 
-{{- define "nxCloud.api.scm.all" }}
-{{- include "nxCloud.api.scm.github" . }}
-{{- include "nxCloud.api.scm.gitlab" . }}
+{{- define "nxCloud.frontend.scm.all" }}
+{{- include "nxCloud.frontend.scm.github" . }}
+{{- include "nxCloud.frontend.scm.gitlab" . }}
     {{- if .Values.vcsHttpsProxy }}
 - name: VERSION_CONTROL_HTTPS_PROXY
   value: {{ .Values.vcsHttpsProxy }}
     {{- end }}
 {{- end }}
 
-{{- define "nxCloud.api.scm.githubAppEnv" }}
+{{- define "nxCloud.frontend.scm.githubAppEnv" }}
 {{- if .Values.secret.name }}
     {{- if .Values.secret.githubAuthToken }}
 - name: NX_CLOUD_GITHUB_AUTH_TOKEN