Move Diskover to ix-dev (#1051)

charts/diskoverdata/1.0.4/Chart.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: file://../../../library/common/2207.0.0
-  version: 2207.0.0
-digest: sha256:f17f3d458ca0210a52e39da0dce35034e900b36f2040d4b19bed46a7aae91506
-generated: "2022-07-25T00:20:48.080698555+05:00"

charts/diskoverdata/1.0.4/Chart.yaml

@@ -1,17 +0,0 @@
-apiVersion: v2
-appVersion: "2.0.1"
-icon: http://www.diskoverdata.com/wp-content/uploads/2019/09/diskover.png
-description: Diskover is used to monitor size/volumes of distributed dataset.
-name: diskoverdata
-version: 1.0.4
-dependencies:
-- name: common
-  repository: file://../../../library/common/2207.0.0
-  version: 2207.0.0
-home: https://github.com/diskoverdata/diskover-community/
-keywords:
-- storage
-- monitoring
-- management
-sources:
-- https://github.com/diskoverdata/diskover-community/

library/ix-dev/charts/diskoverdata/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: file://../../../common/2207.0.0
+  version: 2207.0.0
+digest: sha256:a301ba0f99ec1e08a60a7f0a0320aa02d225993572f2f056f09520f06df88b37
+generated: "2023-03-22T16:30:35.212843915Z"

library/ix-dev/charts/diskoverdata/Chart.yaml

@@ -0,0 +1,25 @@
+name: diskoverdata
+description: Diskover is used to monitor size/volumes of distributed dataset.
+annotations:
+  title: Diskover Data
+type: application
+version: 1.0.5
+apiVersion: v2
+appVersion: "2.0.1"
+kubeVersion: '>=1.16.0-0'
+maintainers:
+  - name: truenas
+    url: https://www.truenas.com/
+dependencies:
+  - name: common
+    repository: file://../../../common/2207.0.0
+    version: 2207.0.0
+home: https://github.com/diskoverdata/diskover-community
+icon: http://www.diskoverdata.com/wp-content/uploads/2019/09/diskover.png
+sources:
+  - https://github.com/diskoverdata/diskover-community
+  - https://github.com/truenas/charts/tree/master/library/ix-dev/charts/diskoverdata
+keywords:
+  - storage
+  - monitoring
+  - management

library/ix-dev/charts/diskoverdata/ci/test-values.yaml

@@ -1,20 +1,3 @@
-image:
-  pullPolicy: IfNotPresent
-  repository: linuxserver/diskover
-  tag: "2.0.1"
-
-elasticsearch:
-  image:
-    pullPolicy: IfNotPresent
-    repository: docker.elastic.co/elasticsearch/elasticsearch
-    tag: "7.5.2"
-
-python:
-  image:
-    pullPolicy: IfNotPresent
-    repository: python
-    tag: "3.10"
-
 environmentVariables: []
 extraAppVolumeMounts: []
 extraDataVolumeMounts: []
@@ -33,7 +16,6 @@ elasticSearchAppVolumeMounts:
   esdata:
     emptyDir: true
     mountPath: /usr/share/elasticsearch/data
-
 ownerUID: 568
 ownerGID: 568
 username: "admin"
@@ -41,10 +23,8 @@ password: "admin"
 host: "192.169.0.156"
 hostNetwork: false
 timezone: "America/Los_Angeles"
-
 diskoverCredentials:
   username: admin
   password: admin
-
 cronjobSchedule: "0 3 * * *"
 es_user: elasticsearch

library/ix-dev/charts/diskoverdata/templates/deployment.yaml

@@ -95,7 +95,7 @@ spec:
           lifecycle:
             postStart:
               exec:
-                command: 
+                command:
                   - /bin/sh
                   - -c
                   - |
@@ -113,6 +113,33 @@ spec:
             {{ $envListDiskover = mustAppend $envListDiskover (dict "name" "PUID" "value" .Values.ownerUID) }}
             {{ $envListDiskover = mustAppend $envListDiskover (dict "name" "PGID" "value" .Values.ownerGID) }}
             {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envListDiskover) | nindent 12 }}
+          livenessProbe:
+            httpGet:
+              path: /login.php
+              port: 80
+            initialDelaySeconds: 10
+            periodSeconds: 10
+            timeoutSeconds: 5
+            failureThreshold: 5
+            successThreshold: 1
+          readinessProbe:
+            httpGet:
+              path: /login.php
+              port: 80
+            initialDelaySeconds: 10
+            periodSeconds: 10
+            timeoutSeconds: 5
+            failureThreshold: 5
+            successThreshold: 2
+          startupProbe:
+            httpGet:
+              path: /login.php
+              port: 80
+            initialDelaySeconds: 10
+            periodSeconds: 5
+            timeoutSeconds: 2
+            failureThreshold: 60
+            successThreshold: 1
 
 {{ include "common.networking.dnsConfiguration" .Values | nindent 6 }}
       volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }}

library/ix-dev/charts/diskoverdata/templates/elastic_search_deployment.yaml

@@ -15,6 +15,32 @@ spec: {{ include "common.deployment.common_spec" $values | nindent 2 }}
             {{ $envList := (default list .Values.environmentVariables) }}
             {{ $envList = mustAppend $envList (dict "name" "discovery.type" "value" "single-node") }}
             {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }}
-
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 9200
+            initialDelaySeconds: 10
+            periodSeconds: 10
+            timeoutSeconds: 5
+            failureThreshold: 5
+            successThreshold: 1
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 9200
+            initialDelaySeconds: 10
+            periodSeconds: 10
+            timeoutSeconds: 5
+            failureThreshold: 5
+            successThreshold: 2
+          startupProbe:
+            httpGet:
+              path: /
+              port: 9200
+            initialDelaySeconds: 10
+            periodSeconds: 5
+            timeoutSeconds: 2
+            failureThreshold: 60
+            successThreshold: 1
 {{ include "common.networking.dnsConfiguration" .Values | nindent 6 }}
       volumes: {{ include "common.storage.configureAppVolumes" (dict "appVolumeMounts" .Values.elasticSearchAppVolumeMounts "emptyDirVolumes" .Values.emptyDirVolumes "ixVolumes" .Values.ixVolumes) | nindent 8 }}