From afa0e1cd6263170f2aac5cd03a39b8449daaf358 Mon Sep 17 00:00:00 2001
From: Andrew Suderman <andrew@sudermanjr.com>
Date: Wed, 26 Feb 2020 16:44:18 -0700
Subject: [PATCH] Fixing port on server container to be available. Clean up
 server values

---
 charts/argo/templates/server-deployment.yaml |  4 ++--
 charts/argo/values.yaml                      | 22 --------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/charts/argo/templates/server-deployment.yaml b/charts/argo/templates/server-deployment.yaml
index 7ff4b883..e3730e1b 100644
--- a/charts/argo/templates/server-deployment.yaml
+++ b/charts/argo/templates/server-deployment.yaml
@@ -35,15 +35,15 @@ spec:
             - "server"
             - "--configmap"
             - "{{ .Release.Name }}-{{ .Values.controller.name}}-configmap"
+            - "--loglevel={{.Values.server.logging.level }}"
             {{- range $name, $value := .Values.server.args }}
             - --{{ $name }}={{ $value }}
             {{- end }}
           resources:
             {{- toYaml .Values.server.resources | nindent 12 }}
-          {{- if .Values.server.metricsConfig.enabled }}
           ports:
           - containerPort: 2754
-          {{- end }}
+            protocol: TCP
       {{- with .Values.server.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index e2d24bff..ce7362e8 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -135,33 +135,11 @@ server:
     labels: {}
     loadBalancerIP: ""
     loadBalancerSourceRanges: []
-  metricsConfig:
-    enabled: false
-    path: /metrics
-    port: 8080
-    persistence: {}
-  telemetryConfig:
-    enabled: false
-    path: /telemetry
-    port: 8081
-  serviceMonitor:
-    enabled: false
-    additionalLabels: {}
   serviceAccount: argo-server
   workflowNamespaces:
     - default
-  containerRuntimeExecutor: docker
-  instanceID:
-    # `instanceID.enabled` configures the controller to filter workflow submissions
-    # to only those which have a matching instanceID attribute.
-    enabled: false
-    # NOTE: If `instanceID.enabled` is set to `true` then either `instanceID.userReleaseName`
-    # or `instanceID.explicitID` must be defined.
-    # useReleaseName: true
-    # explicitID: unique-argo-controller-identifier
   logging:
     level: info
-    globallevel: "0"
   ingress:
     enabled: false