Update metrics feature components (#301)

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

src/features/metrics.ts

@@ -28,7 +28,7 @@ export interface MetricsConfiguration {
 
 export class MetricsFeature extends Feature {
   name = 'metrics';
-  latestVersion = "v2.11.1"
+  latestVersion = "v2.17.2-lens1"
 
   config: MetricsConfiguration = {
     persistence: {
@@ -40,7 +40,7 @@ export class MetricsFeature extends Feature {
       enabled: true,
     },
     retention: {
-      time: "7d",
+      time: "2d",
       size: "5GB",
     },
     kubeStateMetrics: {
@@ -65,6 +65,10 @@ export class MetricsFeature extends Feature {
     return super.install(cluster)
   }
 
+  async upgrade(cluster: Cluster): Promise<boolean> {
+    return this.install(cluster)
+  }
+
   async featureStatus(kc: KubeConfig): Promise<FeatureStatus> {
     return new Promise<FeatureStatus>( async (resolve, reject) => {
       const client = kc.makeApiClient(AppsV1Api)
@@ -79,7 +83,7 @@ export class MetricsFeature extends Feature {
         const prometheus = (await client.readNamespacedStatefulSet('prometheus', 'lens-metrics')).body;
         status.installed = true;
         status.currentVersion = prometheus.spec.template.spec.containers[0].image.split(":")[1];
-        status.canUpgrade = semver.lt(status.currentVersion, this.latestVersion)
+        status.canUpgrade = semver.lt(status.currentVersion, this.latestVersion, true);
         resolve(status)
       } catch(error) {
         resolve(status)

src/features/metrics/03-statefulset.yml.hb

@@ -53,7 +53,7 @@ spec:
               mountPath: /var/lib/prometheus
       containers:
         - name: prometheus
-          image: docker.io/kontenapharos/prometheus:v2.11.1
+          image: docker.io/prom/prometheus:v2.17.2
           args:
             - --web.listen-address=0.0.0.0:9090
             - --config.file=/etc/prometheus/prometheus.yaml

src/features/metrics/05-clusterrole.yml

@@ -6,10 +6,13 @@ rules:
 - apiGroups: [""]
   resources:
   - nodes
+  - nodes/proxy
   - nodes/metrics
   - services
   - endpoints
   - pods
+  - ingresses
+  - configmaps
   verbs: ["get", "list", "watch"]
 - nonResourceURLs: ["/metrics"]
   verbs: ["get"]

src/features/metrics/10-node-exporter-ds.yml.hb

@@ -41,7 +41,7 @@ spec:
       hostPID: true
       containers:
       - name: node-exporter
-        image: docker.io/kontenapharos/prometheus-node-exporter:v0.18.0
+        image: docker.io/prom/node-exporter:v1.0.0-rc.0
         args:
           - --path.procfs=/host/proc
           - --path.sysfs=/host/sys
@@ -54,7 +54,7 @@ spec:
         resources:
           requests:
             cpu: 10m
-            memory: 50Mi
+            memory: 24Mi
           limits:
             cpu: 200m
             memory: 100Mi

src/features/metrics/12-kube-state-metrics-clusterrole.yml

@@ -3,49 +3,112 @@ kind: ClusterRole
 metadata:
   name: lens-kube-state-metrics
 rules:
-- apiGroups: [""]
+  - apiGroups:
-  resources:
+    - ""
-  - configmaps
+    resources:
-  - secrets
+    - configmaps
-  - nodes
+    - secrets
-  - pods
+    - nodes
-  - services
+    - pods
-  - resourcequotas
+    - services
-  - replicationcontrollers
+    - resourcequotas
-  - limitranges
+    - replicationcontrollers
-  - persistentvolumeclaims
+    - limitranges
-  - persistentvolumes
+    - persistentvolumeclaims
-  - namespaces
+    - persistentvolumes
-  - endpoints
+    - namespaces
-  verbs: ["list", "watch"]
+    - endpoints
-- apiGroups: ["extensions"]
+    verbs:
-  resources:
+    - list
-  - daemonsets
+    - watch
-  - deployments
+  - apiGroups:
-  - replicasets
+    - extensions
-  - ingresses
+    resources:
-  verbs: ["list", "watch"]
+    - daemonsets
-- apiGroups: ["apps"]
+    - deployments
-  resources:
+    - replicasets
-  - daemonsets
+    - ingresses
-  - deployments
+    verbs:
-  - replicasets
+    - list
-  - statefulsets
+    - watch
-  verbs: ["list", "watch"]
+  - apiGroups:
-- apiGroups: ["batch"]
+    - apps
-  resources:
+    resources:
-  - cronjobs
+    - statefulsets
-  - jobs
+    - daemonsets
-  verbs: ["list", "watch"]
+    - deployments
-- apiGroups: ["autoscaling"]
+    - replicasets
-  resources:
+    verbs:
-  - horizontalpodautoscalers
+    - list
-  verbs: ["list", "watch"]
+    - watch
-- apiGroups: ["policy"]
+  - apiGroups:
-  resources:
+    - batch
-  - poddisruptionbudgets
+    resources:
-  verbs: ["list", "watch"]
+    - cronjobs
-- apiGroups: ["certificates.k8s.io"]
+    - jobs
-  resources:
+    verbs:
-  - certificatesigningrequests
+    - list
-  verbs: ["list", "watch"]
+    - watch
+  - apiGroups:
+    - autoscaling
+    resources:
+    - horizontalpodautoscalers
+    verbs:
+    - list
+    - watch
+  - apiGroups:
+    - authentication.k8s.io
+    resources:
+    - tokenreviews
+    verbs:
+    - create
+  - apiGroups:
+    - authorization.k8s.io
+    resources:
+    - subjectaccessreviews
+    verbs:
+    - create
+  - apiGroups:
+    - policy
+    resources:
+    - poddisruptionbudgets
+    verbs:
+    - list
+    - watch
+  - apiGroups:
+    - certificates.k8s.io
+    resources:
+    - certificatesigningrequests
+    verbs:
+    - list
+    - watch
+  - apiGroups:
+    - storage.k8s.io
+    resources:
+    - storageclasses
+    - volumeattachments
+    verbs:
+    - list
+    - watch
+  - apiGroups:
+    - admissionregistration.k8s.io
+    resources:
+    - mutatingwebhookconfigurations
+    - validatingwebhookconfigurations
+    verbs:
+    - list
+    - watch
+  - apiGroups:
+    - networking.k8s.io
+    resources:
+    - networkpolicies
+    verbs:
+    - list
+    - watch
+  - apiGroups:
+    - coordination.k8s.io
+    resources:
+    - leases
+    verbs:
+    - list
+    - watch

src/features/metrics/14-kube-state-metrics-deployment.yml.hb

@@ -31,7 +31,7 @@ spec:
       serviceAccountName: kube-state-metrics
       containers:
       - name: kube-state-metrics
-        image: docker.io/kontenapharos/prometheus-kube-state-metrics:v1.6.0
+        image: quay.io/coreos/kube-state-metrics:v1.9.5
         ports:
         - name: metrics
           containerPort: 8080

src/features/user-mode.ts

@@ -10,6 +10,10 @@ export class UserModeFeature extends Feature {
     return super.install(cluster)
   }
 
+  async upgrade(cluster: Cluster): Promise<boolean> {
+    return true
+  }
+
   async featureStatus(kc: KubeConfig): Promise<FeatureStatus> {
     return new Promise<FeatureStatus>( async (resolve, reject) => {
       const client = kc.makeApiClient(RbacAuthorizationV1Api)

src/main/cluster-manager.ts

@@ -150,6 +150,17 @@ export class ClusterManager {
       }
     });
 
+    this.promiseIpc.on("upgradeFeature", async (installReq: FeatureInstallRequest) => {
+      logger.debug(`IPC: upgradeFeature for ${installReq.name}`)
+      const cluster = this.clusters.get(installReq.clusterId)
+      try {
+        await cluster.upgradeFeature(installReq.name, installReq.config)
+        return {success: true, message: ""}
+      } catch(error) {
+        return {success: false, message: error}
+      }
+    });
+
     this.promiseIpc.on("uninstallFeature", async (installReq: FeatureInstallRequest) => {
       logger.debug(`IPC: uninstallFeature for ${installReq.name}`)
       const cluster = this.clusters.get(installReq.clusterId)

src/main/cluster.ts

@@ -105,6 +105,11 @@ export class Cluster implements ClusterInfo {
     return this.refreshCluster()
   }
 
+  public async upgradeFeature(name: string, config: any) {
+    await fm.upgradeFeature(name, this, config)
+    return this.refreshCluster()
+  }
+
   public async uninstallFeature(name: string) {
     await fm.uninstallFeature(name, this)
     return this.refreshCluster()

src/main/feature-manager.ts

@@ -40,7 +40,11 @@ export async function installFeature(name: string, cluster: Cluster, config: any
   await feature.install(cluster)
 }
 
-
+export async function upgradeFeature(name: string, cluster: Cluster, config: any) {
+  const feature = ALL_FEATURES[name] as Feature
+  // TODO Figure out how to handle config stuff
+  await feature.upgrade(cluster)
+}
 
 export async function uninstallFeature(name: string, cluster: Cluster) {
   const feature = ALL_FEATURES[name] as Feature

src/main/feature.ts

@@ -48,9 +48,7 @@ export abstract class Feature {
     });
   }
 
-  upgrade(): boolean {
+  abstract async upgrade(cluster: Cluster): Promise<boolean>;
-    return true;
-  }
 
   abstract async uninstall(cluster: Cluster): Promise<boolean>;
 

src/renderer/components/ClusterSettings/Features/Components/Metrics.vue

@@ -9,13 +9,14 @@
         <b-spinner small v-if="isProcessing" label="Small Spinner" />
         Install
       </b-button>
-      <b-button @click="uninstall" v-if="settings.installed" :disabled="!cluster.isAdmin || isProcessing" variant="danger">
+      <b-button @click="upgrade" v-if="isUpgradeAvailable" :disabled="!cluster.isAdmin || isProcessing || isUpgrading" variant="primary">
+        <b-spinner small v-if="isUpgrading" label="Small Spinner" />
+        Upgrade
+      </b-button>
+      <b-button @click="uninstall" v-if="settings.installed" :disabled="!cluster.isAdmin || isProcessing || isUpgrading" variant="danger">
         <b-spinner small v-if="isProcessing" label="Small Spinner" />
         Uninstall
       </b-button>
-      <b-button @click="upgrade" v-if="isUpgradeAvailable" :disabled="!cluster.isAdmin" variant="primary">
-        Upgrade
-      </b-button>
       <b-alert show variant="danger" v-if="status === 'ERROR'">
         {{ errorMsg }}
       </b-alert>
@@ -54,16 +55,14 @@ export default {
   },
   computed:{
     isUpgradeAvailable: function() {
-      if(!this.settings.installed) return false;
+      return this.cluster.features.metrics.canUpgrade;
-      if(!this.settings.currentVersion) return false;
-      if(!this.settings.latestVersion) return false;
-      let currentVersion = (this.settings.currentVersion.charAt(0) === "v") ? this.settings.currentVersion.substr(1) : this.settings.currentVersion;
-      let latestVersion = (this.settings.latestVersion.charAt(0) === "v") ? this.settings.latestVersion.substr(1) : this.settings.latestVersion;
-      return semver.gt(latestVersion, currentVersion)
     },
     isProcessing: function() {
       return this.status === "PROCESSING";
     },
+    isUpgrading: function() {
+      return this.status === "UPGRADING";
+    },
     canInstall: function() {
       return !this.cluster.preferences.prometheus
     }
@@ -99,7 +98,7 @@ export default {
       }
     },
     uninstall: async function(){
-      this.status="PROCESSING";
+      this.status = "PROCESSING";
       let error = null;
       try {
         let result = await this.$store.dispatch("uninstallClusterFeature", {
@@ -108,7 +107,7 @@ export default {
         })
         console.log("uninstall result:", result);
         this.$store.dispatch("refineCluster", this.cluster.id);
-        this.status="SUCCESS";
+        this.status = "SUCCESS";
         this.errorMsg = "";
       } catch(error) {
         this.status = "ERROR"
@@ -117,16 +116,24 @@ export default {
       }
 
       return true;
-
     },
     upgrade: async function(){
-      // todo
+      this.status = "UPGRADING";
+      try {
+        let result = await this.$store.dispatch("upgradeClusterFeature", {
+          name: this.feature,
+          clusterId: this.cluster.id,
+          config: null,
+        })
+        this.$store.dispatch("refineCluster", this.cluster.id);
+        this.status = "";
+        this.errorMsg = "";
+      } catch(error) {
+        this.status = "ERROR"
+        this.errorMsg = error.message
+      }
       return true;
-
     },
-  },
-  mounted: function(){
-    console.log(this.settings);
   }
 }
 </script>

src/renderer/components/ClusterSettings/Features/Components/UserMode.vue

@@ -121,9 +121,6 @@ export default {
       return true;
 
     },
-  },
-  mounted: function(){
-    console.log(this.settings);
   }
 }
 </script>

src/renderer/store/modules/clusters.ts

@@ -140,6 +140,19 @@ const actions: ActionTree<ClusterState, any>  = {
     return response
   },
   // For data structure see: cluster-manager.ts / FeatureInstallRequest
+  async upgradeClusterFeature({commit}, data) {
+    // Custom no timeout IPC as install can take very variable time
+    const ipc = new PromiseIpc();
+    const response = await ipc.send('upgradeFeature', data)
+    console.log("upgrade result:", response);
+    const cluster = await ipc.send('refreshCluster', data.clusterId)
+
+
+    tracker.event("cluster", "upgrade-feature")
+    commit("updateCluster", cluster)
+    return response
+  },
+  // For data structure see: cluster-manager.ts / FeatureInstallRequest
   async uninstallClusterFeature({commit}, data) {
     // Custom no timeout IPC as uninstall can take very variable time
     const ipc = new PromiseIpc();