Merge pull request #376 from mesosphere/jg/cleanup-kommander-opsporta…

…l-charts

[opsportal] Cleanup kommander/opsportal charts

stable/kommander/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 appVersion: 1.0.0
 description: Kommander
-home: https://github.com/mesosphere/kommander
+home: https://github.com/mesosphere/charts
 maintainers:
   - name: hectorj2f
   - name: alejandroEsc

stable/kommander/requirements.yaml

@@ -1,25 +1,25 @@
 dependencies:
-- name: kubeaddons-catalog
-  version: "0.1.4"
-  repository: "https://mesosphere.github.io/charts/staging"
-  condition: kubeaddons-catalog.enabled
-- name: kommander-cluster-lifecycle
-  version: "0.3.5"
-  repository: "https://mesosphere.github.io/kommander-cluster-lifecycle/charts"
-  condition: kommander-cluster-lifecycle.enabled, global.kommander-cluster-lifecycle.enabled
-- name: kommander-ui
-  version: "1.192.0"
-  repository: "https://mesosphere.github.io/kommander/charts"
-  condition: kommander-ui.enabled
-- name: kommander-thanos
-  version: "0.1.7"
-  repository: "https://mesosphere.github.io/charts/stable"
-  condition: kommander-thanos.enabled
-- name: kommander-karma
-  version: "0.3.2"
-  repository: "https://mesosphere.github.io/charts/stable"
-  condition: kommander-karma.enabled
-- name: grafana
-  version: 3.8.*
-  repository: https://kubernetes-charts.storage.googleapis.com
-  condition: grafana.enabled
+  - name: kubeaddons-catalog
+    version: "0.1.4"
+    repository: "https://mesosphere.github.io/charts/staging"
+    condition: kubeaddons-catalog.enabled
+  - name: kommander-cluster-lifecycle
+    version: "0.3.5"
+    repository: "https://mesosphere.github.io/kommander-cluster-lifecycle/charts"
+    condition: kommander-cluster-lifecycle.enabled, global.kommander-cluster-lifecycle.enabled
+  - name: kommander-ui
+    version: "1.192.0"
+    repository: "https://mesosphere.github.io/kommander/charts"
+    condition: kommander-ui.enabled
+  - name: kommander-thanos
+    version: "0.1.7"
+    repository: "https://mesosphere.github.io/charts/stable"
+    condition: kommander-thanos.enabled
+  - name: kommander-karma
+    version: "0.3.2"
+    repository: "https://mesosphere.github.io/charts/stable"
+    condition: kommander-karma.enabled
+  - name: grafana
+    version: 3.8.*
+    repository: https://kubernetes-charts.storage.googleapis.com
+    condition: grafana.enabled

stable/kommander/values.yaml

@@ -1,52 +1,3 @@
-kommander-ui:
-  image:
-    repository: mesosphere/kommander
-    tag: 1.192.0
-    pullPolicy: IfNotPresent
-  replicas: 1
-  logoutRedirectPath: /ops/landing
-  clusterPollingInterval: 3000
-  hostPollingInterval: 3000
-  clusterPollingThrottleFactor: 1
-  kubernetesVersionsSelection: '["1.16.4", "1.16.3", "1.15.6"]'
-  kubeaddonsAddress: kommander-kubeaddons-kubeaddons-catalog
-
-  # Mode must be either production|konvoy
-  mode: production
-
-  displayName: Konvoy Cluster
-
-  extraInitContainers:
-
-  resources:
-    requests:
-      memory: "256Mi"
-      cpu: "100m"
-    limits:
-      memory: "512Mi"
-      cpu: "500m"
-
-  readinessProbe:
-    initialDelaySeconds: 15
-    periodSeconds: 10
-  livenessProbe:
-    initialDelaySeconds: 15
-    periodSeconds: 10
-    timeoutSeconds: 3
-
-  ### This must match the serviceName set in the ingress backend below
-  service:
-    name: kommander
-
-  ingress:
-    traefikFrontendRuleType: PathPrefixStrip
-    extraAnnotations:
-      traefik.ingress.kubernetes.io/priority: "1"
-      traefik.ingress.kubernetes.io/auth-type: forward
-      traefik.ingress.kubernetes.io/auth-url: http://traefik-forward-auth-kubeaddons.kubeaddons.svc.cluster.local:4181/
-      traefik.ingress.kubernetes.io/auth-response-headers: X-Forwarded-User
-    path: /ops/portal/kommander/ui
-
 federate:
   kubeaddonsInitializer:
     repository: "mesosphere/kubeaddons-addon-initializer"

stable/opsportal/requirements.lock

@@ -1,6 +1,6 @@
 dependencies:
-- name: kommander
-  repository: https://mesosphere.github.io/charts/stable
-  version: 0.2.7
-digest: sha256:6db8475b7fdf5be2cd2d24f7df86c1aec728e85abe64d4ceca0b7fa27ef38033
-generated: "2019-11-08T09:17:37.652963-08:00"
+- name: kommander-ui
+  repository: https://mesosphere.github.io/kommander/charts
+  version: 1.192.0
+digest: sha256:a9f7af8afeacb33c4cd6fce765f63cbcb51a35a651ae0058ea319fc03b51d0c4
+generated: "2020-01-29T16:19:31.651673+01:00"

stable/opsportal/requirements.yaml

@@ -1,5 +1,5 @@
 dependencies:
-- name: kommander
-  version: 0.2.7
-  repository: https://mesosphere.github.io/charts/stable
-  condition: kommander.enabled, global.kommander.enabled
+  - name: kommander-ui
+    version: "1.192.0"
+    repository: "https://mesosphere.github.io/kommander/charts"
+    condition: kommander-ui.enabled

stable/opsportal/values.yaml

@@ -46,10 +46,8 @@ opsportal:
           servicePort: 80
         path: /ops/portal/traefik
 
-###############################################################################
-#  Konvoy UI
-###############################################################################
-kommander:
+# We need to override certain values from default kommander values here
+kommander-ui:
   enabled: true
   image:
     repository: mesosphere/kommander
@@ -59,33 +57,11 @@ kommander:
   logoutRedirectPath: /ops/landing
   clusterPollingInterval: 3000
 
-  # Mode must be either production|konvoy
+  # Mode must be either production|konvoy, konvoy forcing ui in "konvoy mode"
   mode: konvoy
 
   displayName: Konvoy Cluster
 
-  extraInitContainers:
-
-  federate:
-    systemNamespace:
-      enable: false
-
-  resources:
-    requests:
-      memory: "128Mi"
-      cpu: "100m"
-    limits:
-      memory: "512Mi"
-      cpu: "2000m"
-
-  readinessProbe:
-    initialDelaySeconds: 15
-    periodSeconds: 10
-  livenessProbe:
-    initialDelaySeconds: 15
-    periodSeconds: 10
-    timeoutSeconds: 3
-
   ### This must match the serviceName set in the ingress backend below
   service:
     name: opsportal
@@ -98,43 +74,3 @@ kommander:
       traefik.ingress.kubernetes.io/auth-type: forward
       traefik.ingress.kubernetes.io/auth-url: http://traefik-forward-auth-kubeaddons.kubeaddons.svc.cluster.local:4181/
       traefik.ingress.kubernetes.io/auth-response-headers: X-Forwarded-User
-
-  # disable kubefed to keep all items related to kubefed from being created
-  kubefed:
-    enabled: false
-
-  grafana:
-    enabled: false
-
-  # disable kommander-cluster-lifecycle
-  kommander-cluster-lifecycle:
-    enabled: false
-
-  kommander-thanos:
-    enabled: false
-
-  kommander-karma:
-    enabled: false
-
-  kubeaddons-catalog:
-    enabled: false
-
-# BUG due to 2.14 helm
-# this is not seen for 2.15, so when we move to 2.15 remove below
-kommander-cluster-lifecycle:
-  enabled: false
-
-kubefed:
-  enabled: false
-
-grafana:
-  enabled: false
-
-kommander-thanos:
-  enabled: false
-
-kommander-karma:
-  enabled: false
-
-kubeaddons-catalog:
-  enabled: false