diff --git a/charts/diskoverdata/1.0.4/Chart.lock b/charts/diskoverdata/1.0.4/Chart.lock deleted file mode 100644 index 79a866f92f..0000000000 --- a/charts/diskoverdata/1.0.4/Chart.lock +++ /dev/null @@ -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" diff --git a/charts/diskoverdata/1.0.4/Chart.yaml b/charts/diskoverdata/1.0.4/Chart.yaml deleted file mode 100644 index 761ea59a17..0000000000 --- a/charts/diskoverdata/1.0.4/Chart.yaml +++ /dev/null @@ -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/ diff --git a/charts/diskoverdata/1.0.4/charts/common-2207.0.0.tgz b/charts/diskoverdata/1.0.4/charts/common-2207.0.0.tgz deleted file mode 100644 index 2adf94b438..0000000000 Binary files a/charts/diskoverdata/1.0.4/charts/common-2207.0.0.tgz and /dev/null differ diff --git a/library/ix-dev/charts/diskoverdata/Chart.lock b/library/ix-dev/charts/diskoverdata/Chart.lock new file mode 100644 index 0000000000..e93f891ac9 --- /dev/null +++ b/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" diff --git a/library/ix-dev/charts/diskoverdata/Chart.yaml b/library/ix-dev/charts/diskoverdata/Chart.yaml new file mode 100644 index 0000000000..6b3d4a9b9a --- /dev/null +++ b/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 diff --git a/charts/diskoverdata/1.0.4/README.md b/library/ix-dev/charts/diskoverdata/README.md similarity index 100% rename from charts/diskoverdata/1.0.4/README.md rename to library/ix-dev/charts/diskoverdata/README.md diff --git a/charts/diskoverdata/1.0.4/app-readme.md b/library/ix-dev/charts/diskoverdata/app-readme.md similarity index 100% rename from charts/diskoverdata/1.0.4/app-readme.md rename to library/ix-dev/charts/diskoverdata/app-readme.md diff --git a/library/ix-dev/charts/diskoverdata/charts/common-2207.0.0.tgz b/library/ix-dev/charts/diskoverdata/charts/common-2207.0.0.tgz new file mode 100644 index 0000000000..9eeedab9cf Binary files /dev/null and b/library/ix-dev/charts/diskoverdata/charts/common-2207.0.0.tgz differ diff --git a/charts/diskoverdata/1.0.4/test_values.yaml b/library/ix-dev/charts/diskoverdata/ci/test-values.yaml similarity index 66% rename from charts/diskoverdata/1.0.4/test_values.yaml rename to library/ix-dev/charts/diskoverdata/ci/test-values.yaml index c20b5aca61..f0a9f45ca7 100644 --- a/charts/diskoverdata/1.0.4/test_values.yaml +++ b/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 diff --git a/charts/diskoverdata/item.yaml b/library/ix-dev/charts/diskoverdata/item.yaml similarity index 100% rename from charts/diskoverdata/item.yaml rename to library/ix-dev/charts/diskoverdata/item.yaml diff --git a/charts/diskoverdata/1.0.4/questions.yaml b/library/ix-dev/charts/diskoverdata/questions.yaml similarity index 100% rename from charts/diskoverdata/1.0.4/questions.yaml rename to library/ix-dev/charts/diskoverdata/questions.yaml diff --git a/charts/diskoverdata/1.0.4/templates/_diskover.tpl b/library/ix-dev/charts/diskoverdata/templates/_diskover.tpl similarity index 100% rename from charts/diskoverdata/1.0.4/templates/_diskover.tpl rename to library/ix-dev/charts/diskoverdata/templates/_diskover.tpl diff --git a/charts/diskoverdata/1.0.4/templates/deployment.yaml b/library/ix-dev/charts/diskoverdata/templates/deployment.yaml similarity index 89% rename from charts/diskoverdata/1.0.4/templates/deployment.yaml rename to library/ix-dev/charts/diskoverdata/templates/deployment.yaml index 08117a0bee..1069180497 100644 --- a/charts/diskoverdata/1.0.4/templates/deployment.yaml +++ b/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 }} diff --git a/charts/diskoverdata/1.0.4/templates/diskover-secrets.yaml b/library/ix-dev/charts/diskoverdata/templates/diskover-secrets.yaml similarity index 100% rename from charts/diskoverdata/1.0.4/templates/diskover-secrets.yaml rename to library/ix-dev/charts/diskoverdata/templates/diskover-secrets.yaml diff --git a/charts/diskoverdata/1.0.4/templates/elastic_search_deployment.yaml b/library/ix-dev/charts/diskoverdata/templates/elastic_search_deployment.yaml similarity index 63% rename from charts/diskoverdata/1.0.4/templates/elastic_search_deployment.yaml rename to library/ix-dev/charts/diskoverdata/templates/elastic_search_deployment.yaml index 8dfc96fe73..183225eabf 100644 --- a/charts/diskoverdata/1.0.4/templates/elastic_search_deployment.yaml +++ b/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 }} diff --git a/charts/diskoverdata/1.0.4/templates/elastic_search_service.yaml b/library/ix-dev/charts/diskoverdata/templates/elastic_search_service.yaml similarity index 100% rename from charts/diskoverdata/1.0.4/templates/elastic_search_service.yaml rename to library/ix-dev/charts/diskoverdata/templates/elastic_search_service.yaml diff --git a/charts/diskoverdata/1.0.4/templates/elasticsearch-secret.yaml b/library/ix-dev/charts/diskoverdata/templates/elasticsearch-secret.yaml similarity index 100% rename from charts/diskoverdata/1.0.4/templates/elasticsearch-secret.yaml rename to library/ix-dev/charts/diskoverdata/templates/elasticsearch-secret.yaml diff --git a/charts/diskoverdata/1.0.4/templates/initial_scripts.yaml b/library/ix-dev/charts/diskoverdata/templates/initial_scripts.yaml similarity index 100% rename from charts/diskoverdata/1.0.4/templates/initial_scripts.yaml rename to library/ix-dev/charts/diskoverdata/templates/initial_scripts.yaml diff --git a/charts/diskoverdata/1.0.4/templates/pre-install-job.yaml b/library/ix-dev/charts/diskoverdata/templates/pre-install-job.yaml similarity index 100% rename from charts/diskoverdata/1.0.4/templates/pre-install-job.yaml rename to library/ix-dev/charts/diskoverdata/templates/pre-install-job.yaml diff --git a/charts/diskoverdata/1.0.4/templates/service.yaml b/library/ix-dev/charts/diskoverdata/templates/service.yaml similarity index 100% rename from charts/diskoverdata/1.0.4/templates/service.yaml rename to library/ix-dev/charts/diskoverdata/templates/service.yaml diff --git a/charts/diskoverdata/1.0.4/templates/tests/deployment-check.yaml b/library/ix-dev/charts/diskoverdata/templates/tests/deployment-check.yaml similarity index 100% rename from charts/diskoverdata/1.0.4/templates/tests/deployment-check.yaml rename to library/ix-dev/charts/diskoverdata/templates/tests/deployment-check.yaml diff --git a/charts/diskoverdata/1.0.4/ix_values.yaml b/library/ix-dev/charts/diskoverdata/values.yaml similarity index 100% rename from charts/diskoverdata/1.0.4/ix_values.yaml rename to library/ix-dev/charts/diskoverdata/values.yaml