Revert changes to hydra chart

Author: terev

helm/charts/hydra/README.md

@@ -54,9 +54,6 @@ A Helm chart for deploying ORY Hydra in Kubernetes
 | cronjob.janitor.serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
 | cronjob.janitor.serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
 | cronjob.janitor.tolerations | list | `[]` | Configure node tolerations |
-| separateAdminAndPublicDeploys | bool | `false` | When `true` separate deploys will be created for admin and public components. Use `deployment.admin` and `deployment.public` to configure component specific options. |
-| deployment.admin | object | `{}` | When separateAdminAndPublicDeploys is enabled, this field acts as overrides only for the `hydra-admin` deployment object. |
-| deployment.public | object | `{}` | When separateAdminAndPublicDeploys is enabled, this field acts as overrides only for the `hydra-public` deployment object. |
 | deployment.annotations | object | `{}` | Set custom deployment level annotations |
 | deployment.automigration | object | `{"extraEnv":[]}` | Parameters for the automigration initContainer |
 | deployment.automigration.extraEnv | list | `[]` | Array of extra envs to be passed to the initContainer. Kubernetes format is expected. Value is processed with Helm `tpl` - name: FOO   value: BAR |

helm/charts/hydra/templates/deployment.yaml

@@ -1,4 +1,3 @@
-{{- if .Values.separateAdminAndPublicDeploys | not -}}
 {{- include "hydra.automigration.typeVerification" . -}}
 {{- $migrationExtraEnv := ternary .Values.deployment.automigration.extraEnv .Values.deployment.extraEnv (not (empty .Values.deployment.automigration.extraEnv )) -}}
 
@@ -235,4 +234,3 @@ spec:
       dnsConfig:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-{{- end -}}

helm/charts/hydra/templates/hpa.yaml

@@ -1,4 +1,3 @@
-{{- if .Values.separateAdminAndPublicDeploys | not }}
 {{- if .Values.deployment.autoscaling.enabled }}
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
@@ -35,4 +34,3 @@ spec:
         {{- toYaml . | nindent 8 }}
   {{- end }}
 {{- end }}
-{{- end }}

helm/charts/hydra/templates/service-admin.yaml

@@ -32,9 +32,6 @@ spec:
   selector:
     app.kubernetes.io/name: {{ include "hydra.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    {{- if .Values.separateAdminAndPublicDeploys }}
-    app.kubernetes.io/component: admin
-    {{- end }}
 {{- if .Values.serviceMonitor.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1

helm/charts/hydra/templates/service-public.yaml

@@ -11,7 +11,6 @@ metadata:
     {{- with .Values.service.public.labels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-    app.kubernetes.io/component: public
   annotations:
     {{- with .Values.service.public.annotations }}
       {{- toYaml . | nindent 4 }}
@@ -31,7 +30,4 @@ spec:
   selector:
     app.kubernetes.io/name: {{ include "hydra.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    {{- if .Values.separateAdminAndPublicDeploys }}
-    app.kubernetes.io/component: public
-    {{- end }}
 {{- end }}

helm/charts/hydra/values.yaml

@@ -180,15 +180,8 @@ hydra:
   # -- Enable dev mode, not secure in production environments
   dev: false
 
-# When `true` separate deploys will be created for admin and public components. Use `deployment.admin` and `deployment.public` to configure component specific options.
-separateAdminAndPublicDeploys: false
-
 ## -- Deployment specific config
 deployment:
-  # When separateAdminAndPublicDeploys is enabled, the admin/public fields act as overrides for the individual deploys.
-  admin: {}
-  public: {}
-
   strategy:
     type: RollingUpdate
     rollingUpdate: