From efdc6fbf6460cec4af5beeb549bd51e59bc5b030 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Sun, 3 Dec 2023 13:50:30 +0000 Subject: [PATCH] Publish new changes in catalog --- charts/prometheus/1.0.25/ci/basic-values.yaml | 7 - charts/prometheus/1.0.25/migrations/migrate | 29 -- charts/prometheus/1.0.25/questions.yaml | 256 ---------- .../prometheus/{1.0.25 => 1.1.0}/Chart.lock | 0 .../prometheus/{1.0.25 => 1.1.0}/Chart.yaml | 2 +- charts/prometheus/{1.0.25 => 1.1.0}/README.md | 0 .../{1.0.25 => 1.1.0}/app-readme.md | 0 .../{1.0.25 => 1.1.0}/charts/common-1.2.3.tgz | Bin charts/prometheus/1.1.0/ci/basic-values.yaml | 5 + .../{1.0.25 => 1.1.0}/ix_values.yaml | 7 +- .../{1.0.25 => 1.1.0}/metadata.yaml | 0 charts/prometheus/1.1.0/migrations/migrate | 55 ++ charts/prometheus/1.1.0/questions.yaml | 482 ++++++++++++++++++ .../{1.0.25 => 1.1.0}/templates/NOTES.txt | 0 .../{1.0.25 => 1.1.0}/templates/_portal.tpl | 0 .../templates/_prometheus.tpl | 38 +- .../{1.0.25 => 1.1.0}/templates/common.yaml | 0 17 files changed, 572 insertions(+), 309 deletions(-) delete mode 100644 charts/prometheus/1.0.25/ci/basic-values.yaml delete mode 100755 charts/prometheus/1.0.25/migrations/migrate delete mode 100644 charts/prometheus/1.0.25/questions.yaml rename charts/prometheus/{1.0.25 => 1.1.0}/Chart.lock (100%) rename charts/prometheus/{1.0.25 => 1.1.0}/Chart.yaml (97%) rename charts/prometheus/{1.0.25 => 1.1.0}/README.md (100%) rename charts/prometheus/{1.0.25 => 1.1.0}/app-readme.md (100%) rename charts/prometheus/{1.0.25 => 1.1.0}/charts/common-1.2.3.tgz (100%) create mode 100644 charts/prometheus/1.1.0/ci/basic-values.yaml rename charts/prometheus/{1.0.25 => 1.1.0}/ix_values.yaml (79%) rename charts/prometheus/{1.0.25 => 1.1.0}/metadata.yaml (100%) create mode 100755 charts/prometheus/1.1.0/migrations/migrate create mode 100644 charts/prometheus/1.1.0/questions.yaml rename charts/prometheus/{1.0.25 => 1.1.0}/templates/NOTES.txt (100%) rename charts/prometheus/{1.0.25 => 1.1.0}/templates/_portal.tpl (100%) rename charts/prometheus/{1.0.25 => 1.1.0}/templates/_prometheus.tpl (72%) rename charts/prometheus/{1.0.25 => 1.1.0}/templates/common.yaml (100%) diff --git a/charts/prometheus/1.0.25/ci/basic-values.yaml b/charts/prometheus/1.0.25/ci/basic-values.yaml deleted file mode 100644 index aa49ea1c01..0000000000 --- a/charts/prometheus/1.0.25/ci/basic-values.yaml +++ /dev/null @@ -1,7 +0,0 @@ -prometheusStorage: - data: - type: hostPath - hostPath: /mnt/{{ .Release.Name }}/data - config: - type: hostPath - hostPath: /mnt/{{ .Release.Name }}/config diff --git a/charts/prometheus/1.0.25/migrations/migrate b/charts/prometheus/1.0.25/migrations/migrate deleted file mode 100755 index c19dd26e89..0000000000 --- a/charts/prometheus/1.0.25/migrations/migrate +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/python3 -import json -import os -import sys - - -def migrate(values): - storageKey = 'prometheusStorage' - storages = ['data', 'config'] - - - for storage in storages: - check_val = values.get(storageKey, {}).get(storage, {}) - if not isinstance(check_val, dict) or not check_val or check_val.get('type', 'hostPath') == 'hostPath': - continue - - values[storageKey][storage] = {key: value for key, value in check_val.items() if key != 'hostPath'} - - - return values - - -if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) - - if os.path.exists(sys.argv[1]): - with open(sys.argv[1], 'r') as f: - print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/prometheus/1.0.25/questions.yaml b/charts/prometheus/1.0.25/questions.yaml deleted file mode 100644 index 8c6cd960d3..0000000000 --- a/charts/prometheus/1.0.25/questions.yaml +++ /dev/null @@ -1,256 +0,0 @@ -groups: - - name: Prometheus Configuration - description: Configure Prometheus - - name: User and Group Configuration - description: Configure User and Group for Prometheus - - name: Network Configuration - description: Configure Network for Prometheus - - name: Storage Configuration - description: Configure Storage for Prometheus - - name: Resources Configuration - description: Configure Resources for Prometheus - -portals: - web_portal: - protocols: - - "$kubernetes-resource_configmap_portal_protocol" - host: - - "$kubernetes-resource_configmap_portal_host" - ports: - - "$kubernetes-resource_configmap_portal_port" - path: "$kubernetes-resource_configmap_portal_path" - -questions: - - - variable: prometheusConfig - label: "" - group: Prometheus Configuration - schema: - type: dict - attrs: - - variable: retentionTime - label: Retention Time - description: The time to retain data for. Use the format 15d, 6w, 10y, etc. - schema: - type: string - default: "15d" - required: true - - variable: retentionSize - label: Retention Size - description: The size to retain data for. Use the format 100MB, 10GB, etc. - schema: - type: string - default: "" - - variable: walCompression - label: WAL Compression - description: Compress the time series database write-ahead log. - schema: - type: boolean - default: true - - variable: additionalArgs - label: Additional Arguments - description: Configure additional arguments for Prometheus. - schema: - type: list - default: [] - items: - - variable: arg - label: Argument - schema: - type: string - required: true - default: "" - - variable: additionalEnvs - label: Additional Environment Variables - description: Configure additional environment variables for Prometheus. - schema: - type: list - default: [] - items: - - variable: env - label: Environment Variable - schema: - type: dict - attrs: - - variable: name - label: Name - schema: - type: string - required: true - - variable: value - label: Value - schema: - type: string - required: true - - - variable: prometheusRunAs - label: "" - group: User and Group Configuration - schema: - type: dict - attrs: - - variable: user - label: User ID - description: The user id that Prometheus will run as. - schema: - type: int - min: 568 - default: 568 - required: true - - variable: group - label: Group ID - description: The group id that Prometheus will run as. - schema: - type: int - min: 568 - default: 568 - required: true - - - variable: prometheusNetwork - label: "" - group: Network Configuration - schema: - type: dict - attrs: - - variable: apiPort - label: API Port - description: The port for the Prometheus API (And WebUI). - schema: - type: int - default: 30002 - min: 9000 - max: 65535 - required: true - - variable: hostNetwork - label: Host Network - description: | - Bind to the host network. It's recommended to keep this disabled. - schema: - type: boolean - default: false - - - variable: prometheusStorage - label: "" - group: Storage Configuration - schema: - type: dict - attrs: - - variable: data - label: Prometheus Data Storage - description: The path to store Prometheus data/metrics. - schema: - type: dict - attrs: - - variable: type - label: Type - description: | - ixVolume: Is dataset created automatically by the system.
- Host Path: Is a path that already exists on the system. - schema: - type: string - required: true - immutable: true - default: ixVolume - enum: - - value: hostPath - description: Host Path (Path that already exists on the system) - - value: ixVolume - description: ixVolume (Dataset created automatically by the system) - - variable: datasetName - label: Dataset Name - schema: - type: string - show_if: [["type", "=", "ixVolume"]] - required: true - hidden: true - immutable: true - default: data - $ref: - - "normalize/ixVolume" - - variable: hostPath - label: Host Path - schema: - type: hostpath - show_if: [["type", "=", "hostPath"]] - immutable: true - required: true - - variable: config - label: Prometheus Config Storage - description: The path to store Prometheus config storage. - schema: - type: dict - attrs: - - variable: type - label: Type - description: | - ixVolume: Is dataset created automatically by the system.
- Host Path: Is a path that already exists on the system. - schema: - type: string - required: true - immutable: true - default: ixVolume - enum: - - value: hostPath - description: Host Path (Path that already exists on the system) - - value: ixVolume - description: ixVolume (Dataset created automatically by the system) - - variable: datasetName - label: Dataset Name - schema: - type: string - show_if: [["type", "=", "ixVolume"]] - required: true - hidden: true - immutable: true - default: config - $ref: - - "normalize/ixVolume" - - variable: hostPath - label: Host Path - schema: - type: hostpath - show_if: [["type", "=", "hostPath"]] - immutable: true - required: true - - - variable: resources - label: "" - group: Resources Configuration - schema: - type: dict - attrs: - - variable: limits - label: Limits - schema: - type: dict - attrs: - - variable: cpu - label: CPU - description: CPU limit for Prometheus. - schema: - type: string - max_length: 6 - valid_chars: '^(0\.[1-9]|[1-9][0-9]*)(\.[0-9]|m?)$' - valid_chars_error: | - Valid CPU limit formats are
- - Plain Integer - eg. 1
- - Float - eg. 0.5
- - Milicpu - eg. 500m - default: "4000m" - required: true - - variable: memory - label: Memory - description: Memory limit for Prometheus. - schema: - type: string - max_length: 12 - valid_chars: '^[1-9][0-9]*([EPTGMK]i?|e[0-9]+)?$' - valid_chars_error: | - Valid Memory limit formats are
- - Suffixed with E/P/T/G/M/K - eg. 1G
- - Suffixed with Ei/Pi/Ti/Gi/Mi/Ki - eg. 1Gi
- - Plain Integer in bytes - eg. 1024
- - Exponent - eg. 134e6 - default: "8Gi" - required: true diff --git a/charts/prometheus/1.0.25/Chart.lock b/charts/prometheus/1.1.0/Chart.lock similarity index 100% rename from charts/prometheus/1.0.25/Chart.lock rename to charts/prometheus/1.1.0/Chart.lock diff --git a/charts/prometheus/1.0.25/Chart.yaml b/charts/prometheus/1.1.0/Chart.yaml similarity index 97% rename from charts/prometheus/1.0.25/Chart.yaml rename to charts/prometheus/1.1.0/Chart.yaml index bcd8354f6d..a620f0de87 100644 --- a/charts/prometheus/1.0.25/Chart.yaml +++ b/charts/prometheus/1.1.0/Chart.yaml @@ -3,7 +3,7 @@ description: The Prometheus monitoring system and time series database. annotations: title: Prometheus type: application -version: 1.0.25 +version: 1.1.0 apiVersion: v2 appVersion: v2.48.0 kubeVersion: '>=1.16.0-0' diff --git a/charts/prometheus/1.0.25/README.md b/charts/prometheus/1.1.0/README.md similarity index 100% rename from charts/prometheus/1.0.25/README.md rename to charts/prometheus/1.1.0/README.md diff --git a/charts/prometheus/1.0.25/app-readme.md b/charts/prometheus/1.1.0/app-readme.md similarity index 100% rename from charts/prometheus/1.0.25/app-readme.md rename to charts/prometheus/1.1.0/app-readme.md diff --git a/charts/prometheus/1.0.25/charts/common-1.2.3.tgz b/charts/prometheus/1.1.0/charts/common-1.2.3.tgz similarity index 100% rename from charts/prometheus/1.0.25/charts/common-1.2.3.tgz rename to charts/prometheus/1.1.0/charts/common-1.2.3.tgz diff --git a/charts/prometheus/1.1.0/ci/basic-values.yaml b/charts/prometheus/1.1.0/ci/basic-values.yaml new file mode 100644 index 0000000000..ce43493981 --- /dev/null +++ b/charts/prometheus/1.1.0/ci/basic-values.yaml @@ -0,0 +1,5 @@ +prometheusStorage: + data: + type: pvc + config: + type: pvc diff --git a/charts/prometheus/1.0.25/ix_values.yaml b/charts/prometheus/1.1.0/ix_values.yaml similarity index 79% rename from charts/prometheus/1.0.25/ix_values.yaml rename to charts/prometheus/1.1.0/ix_values.yaml index 3f6eb5a47b..a6a880ff6d 100644 --- a/charts/prometheus/1.0.25/ix_values.yaml +++ b/charts/prometheus/1.1.0/ix_values.yaml @@ -26,7 +26,10 @@ prometheusRunAs: prometheusStorage: data: type: ixVolume - datasetName: data + ixVolumeConfig: + datasetName: data config: type: ixVolume - datasetName: config + ixVolumeConfig: + datasetName: config + additionalStorages: [] diff --git a/charts/prometheus/1.0.25/metadata.yaml b/charts/prometheus/1.1.0/metadata.yaml similarity index 100% rename from charts/prometheus/1.0.25/metadata.yaml rename to charts/prometheus/1.1.0/metadata.yaml diff --git a/charts/prometheus/1.1.0/migrations/migrate b/charts/prometheus/1.1.0/migrations/migrate new file mode 100755 index 0000000000..3aaba37f8c --- /dev/null +++ b/charts/prometheus/1.1.0/migrations/migrate @@ -0,0 +1,55 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def storage_migrate(storage): + delete_keys = [] + if storage['type'] == 'hostPath': + # Check if the key exists, if not we have already migrated + if not storage.get('hostPath'): + return storage + + storage['hostPathConfig'] = {'hostPath': storage['hostPath']} + delete_keys.append('hostPath') + + elif storage['type'] == 'ixVolume': + # Check if the key exists, if not we have already migrated + if not storage.get('datasetName'): + return storage + + storage['ixVolumeConfig'] = {'datasetName': storage['datasetName']} + delete_keys.append('datasetName') + + # Clean up for some older versions. + if storage.get('hostPath'): + delete_keys.append('hostPath') + + for key in delete_keys: + storage.pop(key, None) + + return storage + + +def migrate(values): + storage_key = 'prometheusStorage' + storages = ['data', 'config'] + + for storage in storages: + check_val = values.get(storage_key, {}).get(storage, {}) + if not isinstance(check_val, dict) or not check_val: + raise Exception(f'Storage section {storage} is malformed') + + values[storage_key][storage] = storage_migrate(check_val) + + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/prometheus/1.1.0/questions.yaml b/charts/prometheus/1.1.0/questions.yaml new file mode 100644 index 0000000000..213e2e502e --- /dev/null +++ b/charts/prometheus/1.1.0/questions.yaml @@ -0,0 +1,482 @@ +groups: + - name: Prometheus Configuration + description: Configure Prometheus + - name: User and Group Configuration + description: Configure User and Group for Prometheus + - name: Network Configuration + description: Configure Network for Prometheus + - name: Storage Configuration + description: Configure Storage for Prometheus + - name: Resources Configuration + description: Configure Resources for Prometheus + +portals: + web_portal: + protocols: + - "$kubernetes-resource_configmap_portal_protocol" + host: + - "$kubernetes-resource_configmap_portal_host" + ports: + - "$kubernetes-resource_configmap_portal_port" + path: "$kubernetes-resource_configmap_portal_path" + +questions: + + - variable: prometheusConfig + label: "" + group: Prometheus Configuration + schema: + type: dict + attrs: + - variable: retentionTime + label: Retention Time + description: The time to retain data for. Use the format 15d, 6w, 10y, etc. + schema: + type: string + default: "15d" + required: true + - variable: retentionSize + label: Retention Size + description: The size to retain data for. Use the format 100MB, 10GB, etc. + schema: + type: string + default: "" + - variable: walCompression + label: WAL Compression + description: Compress the time series database write-ahead log. + schema: + type: boolean + default: true + - variable: additionalArgs + label: Additional Arguments + description: Configure additional arguments for Prometheus. + schema: + type: list + default: [] + items: + - variable: arg + label: Argument + schema: + type: string + required: true + default: "" + - variable: additionalEnvs + label: Additional Environment Variables + description: Configure additional environment variables for Prometheus. + schema: + type: list + default: [] + items: + - variable: env + label: Environment Variable + schema: + type: dict + attrs: + - variable: name + label: Name + schema: + type: string + required: true + - variable: value + label: Value + schema: + type: string + required: true + + - variable: prometheusRunAs + label: "" + group: User and Group Configuration + schema: + type: dict + attrs: + - variable: user + label: User ID + description: The user id that Prometheus will run as. + schema: + type: int + min: 568 + default: 568 + required: true + - variable: group + label: Group ID + description: The group id that Prometheus will run as. + schema: + type: int + min: 568 + default: 568 + required: true + + - variable: prometheusNetwork + label: "" + group: Network Configuration + schema: + type: dict + attrs: + - variable: apiPort + label: API Port + description: The port for the Prometheus API (And WebUI). + schema: + type: int + default: 30002 + min: 9000 + max: 65535 + required: true + - variable: hostNetwork + label: Host Network + description: | + Bind to the host network. It's recommended to keep this disabled. + schema: + type: boolean + default: false + + - variable: prometheusStorage + label: "" + group: Storage Configuration + schema: + type: dict + attrs: + - variable: data + label: Prometheus Data Storage + description: The path to store Prometheus data/metrics. + schema: + type: dict + attrs: + - variable: type + label: Type + description: | + ixVolume: Is dataset created automatically by the system.
+ Host Path: Is a path that already exists on the system. + schema: + type: string + required: true + immutable: true + default: ixVolume + enum: + - value: hostPath + description: Host Path (Path that already exists on the system) + - value: ixVolume + description: ixVolume (Dataset created automatically by the system) + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. + schema: + type: dict + show_if: [["type", "=", "ixVolume"]] + $ref: + - "normalize/ixVolume" + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: datasetName + label: Dataset Name + description: The name of the dataset to use for storage. + schema: + type: string + required: true + immutable: true + hidden: true + default: "data" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: Host Path Configuration + schema: + type: dict + show_if: [["type", "=", "hostPath"]] + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: acl + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + $ref: + - "normalize/acl" + - variable: hostPath + label: Host Path + description: The host path to use for storage. + schema: + type: hostpath + show_if: [["aclEnable", "=", false]] + immutable: true + required: true + + - variable: config + label: Prometheus Config Storage + description: The path to store Prometheus config storage. + schema: + type: dict + attrs: + - variable: type + label: Type + description: | + ixVolume: Is dataset created automatically by the system.
+ Host Path: Is a path that already exists on the system. + schema: + type: string + required: true + immutable: true + default: ixVolume + enum: + - value: hostPath + description: Host Path (Path that already exists on the system) + - value: ixVolume + description: ixVolume (Dataset created automatically by the system) + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. + schema: + type: dict + show_if: [["type", "=", "ixVolume"]] + $ref: + - "normalize/ixVolume" + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: datasetName + label: Dataset Name + description: The name of the dataset to use for storage. + schema: + type: string + required: true + immutable: true + hidden: true + default: "config" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: Host Path Configuration + schema: + type: dict + show_if: [["type", "=", "hostPath"]] + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: acl + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + $ref: + - "normalize/acl" + - variable: hostPath + label: Host Path + description: The host path to use for storage. + schema: + type: hostpath + show_if: [["aclEnable", "=", false]] + immutable: true + required: true + + - variable: additionalStorages + label: Additional Storage + description: Additional storage for Prometheus. + schema: + type: list + default: [] + items: + - variable: storageEntry + label: Storage Entry + schema: + type: dict + attrs: + - variable: type + label: Type + description: | + ixVolume: Is dataset created automatically by the system.
+ Host Path: Is a path that already exists on the system.
+ SMB Share: Is a SMB share that is mounted to a persistent volume claim. + schema: + type: string + required: true + default: "ixVolume" + immutable: true + enum: + - value: "hostPath" + description: Host Path (Path that already exists on the system) + - value: "ixVolume" + description: ixVolume (Dataset created automatically by the system) + - value: "smb-pv-pvc" + description: SMB Share (Mounts a persistent volume claim to a SMB share) + - variable: readOnly + label: Read Only + description: Mount the volume as read only. + schema: + type: boolean + default: false + - variable: mountPath + label: Mount Path + description: The path inside the container to mount the storage. + schema: + type: path + required: true + - variable: hostPathConfig + label: Host Path Configuration + schema: + type: dict + show_if: [["type", "=", "hostPath"]] + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: acl + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + $ref: + - "normalize/acl" + - variable: hostPath + label: Host Path + description: The host path to use for storage. + schema: + type: hostpath + show_if: [["aclEnable", "=", false]] + immutable: true + required: true + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. + schema: + type: dict + show_if: [["type", "=", "ixVolume"]] + $ref: + - "normalize/ixVolume" + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: datasetName + label: Dataset Name + description: The name of the dataset to use for storage. + schema: + type: string + required: true + immutable: true + default: "storage_entry" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: smbConfig + label: SMB Share Configuration + description: The configuration for the SMB Share. + schema: + type: dict + show_if: [["type", "=", "smb-pv-pvc"]] + attrs: + - variable: server + label: Server + description: The server for the SMB share. + schema: + type: string + required: true + - variable: share + label: Share + description: The share name for the SMB share. + schema: + type: string + required: true + - variable: domain + label: Domain (Optional) + description: The domain for the SMB share. + schema: + type: string + - variable: username + label: Username + description: The username for the SMB share. + schema: + type: string + required: true + - variable: password + label: Password + description: The password for the SMB share. + schema: + type: string + required: true + private: true + - variable: size + label: Size (in Gi) + description: The size of the volume quota. + schema: + type: int + required: true + min: 1 + default: 1 + + - variable: resources + label: "" + group: Resources Configuration + schema: + type: dict + attrs: + - variable: limits + label: Limits + schema: + type: dict + attrs: + - variable: cpu + label: CPU + description: CPU limit for Prometheus. + schema: + type: string + max_length: 6 + valid_chars: '^(0\.[1-9]|[1-9][0-9]*)(\.[0-9]|m?)$' + valid_chars_error: | + Valid CPU limit formats are
+ - Plain Integer - eg. 1
+ - Float - eg. 0.5
+ - Milicpu - eg. 500m + default: "4000m" + required: true + - variable: memory + label: Memory + description: Memory limit for Prometheus. + schema: + type: string + max_length: 12 + valid_chars: '^[1-9][0-9]*([EPTGMK]i?|e[0-9]+)?$' + valid_chars_error: | + Valid Memory limit formats are
+ - Suffixed with E/P/T/G/M/K - eg. 1G
+ - Suffixed with Ei/Pi/Ti/Gi/Mi/Ki - eg. 1Gi
+ - Plain Integer in bytes - eg. 1024
+ - Exponent - eg. 134e6 + default: "8Gi" + required: true diff --git a/charts/prometheus/1.0.25/templates/NOTES.txt b/charts/prometheus/1.1.0/templates/NOTES.txt similarity index 100% rename from charts/prometheus/1.0.25/templates/NOTES.txt rename to charts/prometheus/1.1.0/templates/NOTES.txt diff --git a/charts/prometheus/1.0.25/templates/_portal.tpl b/charts/prometheus/1.1.0/templates/_portal.tpl similarity index 100% rename from charts/prometheus/1.0.25/templates/_portal.tpl rename to charts/prometheus/1.1.0/templates/_portal.tpl diff --git a/charts/prometheus/1.0.25/templates/_prometheus.tpl b/charts/prometheus/1.1.0/templates/_prometheus.tpl similarity index 72% rename from charts/prometheus/1.0.25/templates/_prometheus.tpl rename to charts/prometheus/1.1.0/templates/_prometheus.tpl index a5cb217c71..d6c135605c 100644 --- a/charts/prometheus/1.0.25/templates/_prometheus.tpl +++ b/charts/prometheus/1.1.0/templates/_prometheus.tpl @@ -54,10 +54,6 @@ workload: port: {{ .Values.prometheusNetwork.apiPort }} path: /-/ready initContainers: - {{- include "ix.v1.common.app.permissions" (dict "containerName" "01-permissions" - "UID" .Values.prometheusRunAs.user - "GID" .Values.prometheusRunAs.group - "type" "install") | nindent 8 }} init-config: enabled: true type: init @@ -95,26 +91,40 @@ service: persistence: data: enabled: true - type: {{ .Values.prometheusStorage.data.type }} - datasetName: {{ .Values.prometheusStorage.data.datasetName | default "" }} - hostPath: {{ .Values.prometheusStorage.data.hostPath | default "" }} + {{- include "prometheus.storage.ci.migration" (dict "storage" .Values.prometheusStorage.data) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.prometheusStorage.data) | nindent 4 }} targetSelector: prometheus: prometheus: mountPath: /data - 01-permissions: - mountPath: /mnt/directories/data config: enabled: true - type: {{ .Values.prometheusStorage.config.type }} - datasetName: {{ .Values.prometheusStorage.config.datasetName | default "" }} - hostPath: {{ .Values.prometheusStorage.config.hostPath | default "" }} + {{- include "prometheus.storage.ci.migration" (dict "storage" .Values.prometheusStorage.config) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.prometheusStorage.config) | nindent 4 }} targetSelector: prometheus: prometheus: mountPath: /config - 01-permissions: - mountPath: /mnt/directories/export init-config: mountPath: /config + {{- range $idx, $storage := .Values.prometheusStorage.additionalStorages }} + {{ printf "prometheus-%v:" (int $idx) }} + enabled: true + {{- include "prometheus.storage.ci.migration" (dict "storage" $storage) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} + targetSelector: + prometheus: + prometheus: + mountPath: {{ $storage.mountPath }} + {{- end }} +{{- end -}} + +{{/* TODO: Remove on the next version bump, eg 1.1.0+ */}} +{{- define "prometheus.storage.ci.migration" -}} + {{- $storage := .storage -}} + + {{- if $storage.hostPath -}} + {{- $_ := set $storage "hostPathConfig" dict -}} + {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}} + {{- end -}} {{- end -}} diff --git a/charts/prometheus/1.0.25/templates/common.yaml b/charts/prometheus/1.1.0/templates/common.yaml similarity index 100% rename from charts/prometheus/1.0.25/templates/common.yaml rename to charts/prometheus/1.1.0/templates/common.yaml