diff --git a/utils/helm/speckle-server/templates/frontend_2/deployment.yml b/utils/helm/speckle-server/templates/frontend_2/deployment.yml index dfbb7ca33..05ad65e85 100644 --- a/utils/helm/speckle-server/templates/frontend_2/deployment.yml +++ b/utils/helm/speckle-server/templates/frontend_2/deployment.yml @@ -1,4 +1,3 @@ -{{- if .Values.frontend_2.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -160,4 +159,3 @@ spec: {{- if .Values.frontend_2.serviceAccount.create }} serviceAccountName: {{ include "frontend_2.name" $ }} {{- end }} -{{- end }} diff --git a/utils/helm/speckle-server/templates/frontend_2/networkpolicy.cilium.yml b/utils/helm/speckle-server/templates/frontend_2/networkpolicy.cilium.yml index e97eea3d0..34aa9e21e 100644 --- a/utils/helm/speckle-server/templates/frontend_2/networkpolicy.cilium.yml +++ b/utils/helm/speckle-server/templates/frontend_2/networkpolicy.cilium.yml @@ -1,4 +1,3 @@ -{{- if .Values.frontend_2.enabled -}} {{- if (and (.Values.frontend_2.networkPolicy.enabled) (eq .Values.networkPlugin.type "cilium")) -}} apiVersion: cilium.io/v2 kind: CiliumNetworkPolicy @@ -45,4 +44,3 @@ spec: # redis {{ include "speckle.networkpolicy.egress.redis.cilium" $ | indent 4 }} {{- end -}} -{{- end -}} diff --git a/utils/helm/speckle-server/templates/frontend_2/networkpolicy.kubernetes.yml b/utils/helm/speckle-server/templates/frontend_2/networkpolicy.kubernetes.yml index 233e5ace8..a8fc1a56a 100644 --- a/utils/helm/speckle-server/templates/frontend_2/networkpolicy.kubernetes.yml +++ b/utils/helm/speckle-server/templates/frontend_2/networkpolicy.kubernetes.yml @@ -1,4 +1,3 @@ -{{- if .Values.frontend_2.enabled -}} {{- if (and (.Values.frontend_2.networkPolicy.enabled) (eq .Values.networkPlugin.type "kubernetes")) -}} apiVersion: networking.k8s.io/v1 kind: NetworkPolicy @@ -44,4 +43,3 @@ spec: # redis {{ include "speckle.networkpolicy.egress.redis" $ | indent 4 }} {{- end -}} -{{- end -}} diff --git a/utils/helm/speckle-server/templates/frontend_2/service.yml b/utils/helm/speckle-server/templates/frontend_2/service.yml index 9d8093066..c8732bf96 100644 --- a/utils/helm/speckle-server/templates/frontend_2/service.yml +++ b/utils/helm/speckle-server/templates/frontend_2/service.yml @@ -1,4 +1,3 @@ -{{- if .Values.frontend_2.enabled }} apiVersion: v1 kind: Service metadata: @@ -15,4 +14,3 @@ spec: name: web port: 8080 targetPort: www -{{- end }} diff --git a/utils/helm/speckle-server/templates/frontend_2/serviceaccount.yml b/utils/helm/speckle-server/templates/frontend_2/serviceaccount.yml index bccf981c9..736ff1960 100644 --- a/utils/helm/speckle-server/templates/frontend_2/serviceaccount.yml +++ b/utils/helm/speckle-server/templates/frontend_2/serviceaccount.yml @@ -1,4 +1,4 @@ -{{- if (and .Values.frontend_2.enabled .Values.frontend_2.serviceAccount.create) -}} +{{- if .Values.frontend_2.serviceAccount.create -}} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/utils/helm/speckle-server/templates/minion.ingress.yml b/utils/helm/speckle-server/templates/minion.ingress.yml index f770dad9c..eef3b2fb8 100644 --- a/utils/helm/speckle-server/templates/minion.ingress.yml +++ b/utils/helm/speckle-server/templates/minion.ingress.yml @@ -17,7 +17,6 @@ spec: - host: {{ .Values.domain }} http: paths: - {{- if .Values.frontend_2.enabled }} - pathType: Prefix path: "/" backend: @@ -25,15 +24,6 @@ spec: name: speckle-frontend-2 port: name: web - {{- else }} - - pathType: Prefix - path: "/" - backend: - service: - name: speckle-frontend - port: - name: www - {{- end }} - pathType: Exact path: "/graphql" backend: diff --git a/utils/helm/speckle-server/templates/redirect.ingress.yml b/utils/helm/speckle-server/templates/redirect.ingress.yml index c7f4eed0b..c5946b15f 100644 --- a/utils/helm/speckle-server/templates/redirect.ingress.yml +++ b/utils/helm/speckle-server/templates/redirect.ingress.yml @@ -18,28 +18,16 @@ spec: path: "/metrics" backend: service: -{{- if .Values.frontend_2.enabled }} name: speckle-frontend-2 port: name: web -{{- else }} - name: speckle-frontend - port: - name: www -{{- end }} - pathType: Exact path: "/api/status" backend: service: -{{- if .Values.frontend_2.enabled }} name: speckle-frontend-2 port: name: web -{{- else }} - name: speckle-frontend - port: - name: www -{{- end }} - pathType: Exact path: "/liveness" backend: diff --git a/utils/helm/speckle-server/values.schema.json b/utils/helm/speckle-server/values.schema.json index 81c25c37d..69196ccfd 100644 --- a/utils/helm/speckle-server/values.schema.json +++ b/utils/helm/speckle-server/values.schema.json @@ -1712,11 +1712,6 @@ } } }, - "enabled": { - "type": "boolean", - "description": "Feature flag to enable running the new web application frontend.", - "default": true - }, "replicas": { "type": "number", "description": "The number of instances of the Frontend 2 server prod to be deployed withing the cluster.", diff --git a/utils/helm/speckle-server/values.yaml b/utils/helm/speckle-server/values.yaml index 3066e9ef4..7bcb5684f 100644 --- a/utils/helm/speckle-server/values.yaml +++ b/utils/helm/speckle-server/values.yaml @@ -1006,9 +1006,6 @@ frontend_2: enabled: false ## @param frontend_2.inspect.port The port on which the nodejs inspect feature should be exposed port: '7000' - ## @param frontend_2.enabled Feature flag to enable running the new web application frontend. - ## - enabled: true ## @param frontend_2.replicas The number of instances of the Frontend 2 server prod to be deployed withing the cluster. ## replicas: 1