From b10f078e5ca3400e06f21ac7465a9249f98a7e8a Mon Sep 17 00:00:00 2001 From: Kjeld Schouten Date: Wed, 20 Dec 2023 20:38:11 +0100 Subject: [PATCH] chore(GUI): Update ingress and cnpg questions for new common (#16328) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [ ] ⚖️ My code follows the style guidelines of this project - [ ] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [ ] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --------- Signed-off-by: Kjeld Schouten --- charts/enterprise/grafana/Chart.yaml | 2 +- .../questions/ingress/ingressAdvanced.yaml | 82 +++- templates/questions/ingress/ingressList.yaml | 106 ++-- templates/questions/ingress/ingressTLS.yaml | 6 - .../questions/ingress/ingressTraefik.yaml | 13 - .../questions/postgresql/postgresql.yaml | 454 +++++++++++++++++- .../postgresql/postgresqlBasics.yaml | 49 -- 7 files changed, 594 insertions(+), 118 deletions(-) delete mode 100644 templates/questions/ingress/ingressTLS.yaml delete mode 100644 templates/questions/ingress/ingressTraefik.yaml delete mode 100644 templates/questions/postgresql/postgresqlBasics.yaml diff --git a/charts/enterprise/grafana/Chart.yaml b/charts/enterprise/grafana/Chart.yaml index 520f4c88136..d3792e311a2 100644 --- a/charts/enterprise/grafana/Chart.yaml +++ b/charts/enterprise/grafana/Chart.yaml @@ -1,7 +1,7 @@ kubeVersion: '>=1.24.0-0' apiVersion: v2 name: grafana -version: 10.0.0 +version: 10.0.1 appVersion: 10.2.2 description: Grafana is an open source, feature rich metrics dashboard and graph editor for Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB. home: https://truecharts.org/charts/enterprise/grafana diff --git a/templates/questions/ingress/ingressAdvanced.yaml b/templates/questions/ingress/ingressAdvanced.yaml index 7f214f20166..f6e2ef24dc6 100644 --- a/templates/questions/ingress/ingressAdvanced.yaml +++ b/templates/questions/ingress/ingressAdvanced.yaml @@ -1,10 +1,76 @@ - - variable: integration + - variable: integrations label: Integrations description: Connect ingress with other charts schema: additional_attrs: true type: dict attrs: + - variable: traefik + label: Traefik + description: Connect ingress with Traefik + schema: + additional_attrs: true + type: dict + attrs: + - variable: enabled + label: enabled + schema: + type: boolean + default: true + - variable: allowCors + label: "Allow Cross Origin Requests" + schema: + type: boolean + default: false + show_if: [["enabled", "=", true]] + - variable: entrypoints + label: Entrypoints + schema: + type: list + default: ["websecure"] + show_if: [["enabled", "=", true]] + items: + - variable: entrypoint + label: Entrypoint + schema: + type: string + - variable: middlewares + label: Middlewares + schema: + type: list + default: [] + show_if: [["enabled", "=", true]] + items: + - variable: name + label: name + schema: + type: string + default: "" + required: true + - variable: namespace + label: namespace + schema: + type: string + default: "" + - variable: certManager + label: certManager + description: Connect ingress with certManager + schema: + additional_attrs: true + type: dict + attrs: + - variable: enabled + label: enabled + schema: + type: boolean + default: true + - variable: certificateIssuer + label: certificateIssuer + description: defaults to chartname + schema: + type: string + default: "" + show_if: [["enabled", "=", true]] - variable: homepage label: Homepage description: Connect ingress with Homepage @@ -44,20 +110,6 @@ schema: type: boolean default: false - - variable: entrypoint - label: (Advanced) Traefik Entrypoint - description: Entrypoint used by Traefik when using Traefik as Ingress Provider - schema: - type: string - default: websecure - show_if: [["advanced", "=", true]] - required: true - - variable: allowCors - label: "Allow Cross Origin Requests" - schema: - type: boolean - show_if: [["advanced", "=", true]] - default: false - variable: ingressClassName label: (Advanced/Optional) IngressClass Name schema: diff --git a/templates/questions/ingress/ingressList.yaml b/templates/questions/ingress/ingressList.yaml index a74a892c453..f58181ab69e 100644 --- a/templates/questions/ingress/ingressList.yaml +++ b/templates/questions/ingress/ingressList.yaml @@ -27,12 +27,6 @@ schema: type: string default: "" - - variable: allowCors - label: "Allow Cross Origin Requests" - schema: - type: boolean - show_if: [["advanced", "=", true]] - default: false - variable: hosts label: Hosts schema: @@ -90,12 +84,6 @@ label: Service Port schema: type: int - - variable: certificateIssuer - label: certificateIssuer - description: 'add the name of your cert-manager clusterIssuer here for automatic tls certificates. Cannot be used combined with tls option below' - schema: - type: string - default: "" - variable: tls label: TLS-Settings schema: @@ -147,13 +135,85 @@ type: string show_if: [["certificateIssuer", "=", ""]] default: "" - - variable: integration + - variable: integrations label: Integrations description: Connect ingress with other charts schema: additional_attrs: true type: dict attrs: + - variable: traefik + label: Traefik + description: Connect ingress with Traefik + schema: + additional_attrs: true + type: dict + attrs: + - variable: enabled + label: enabled + schema: + type: boolean + default: true + - variable: allowCors + label: "Allow Cross Origin Requests" + schema: + type: boolean + default: false + show_if: [["enabled", "=", true]] + - variable: entrypoints + label: Entrypoints + schema: + type: list + default: ["websecure"] + show_if: [["enabled", "=", true]] + items: + - variable: entrypoint + label: Entrypoint + schema: + type: string + - variable: middlewares + label: Middlewares + schema: + type: list + default: [] + show_if: [["enabled", "=", true]] + items: + - variable: middleware + label: Middleware + schema: + additional_attrs: true + type: dict + attrs: + - variable: name + label: name + schema: + type: string + default: "" + required: true + - variable: namespace + label: namespace + schema: + type: string + default: "" + - variable: certManager + label: certManager + description: Connect ingress with certManager + schema: + additional_attrs: true + type: dict + attrs: + - variable: enabled + label: enabled + schema: + type: boolean + default: true + - variable: certificateIssuer + label: certificateIssuer + description: defaults to chartname + schema: + type: string + default: "" + show_if: [["enabled", "=", true]] - variable: homepage label: Homepage description: Connect ingress with Homepage @@ -187,23 +247,3 @@ required: true default: "default" show_if: [["enabled", "=", true]] - - variable: entrypoint - label: Traefik Entrypoint - description: Entrypoint used by Traefik when using Traefik as Ingress Provider - schema: - type: string - default: websecure - required: true - - variable: middlewares - label: Traefik Middlewares - description: Add previously created Traefik Middlewares to this Ingress - schema: - type: list - default: [] - items: - - variable: name - label: Name - schema: - type: string - default: "" - required: true diff --git a/templates/questions/ingress/ingressTLS.yaml b/templates/questions/ingress/ingressTLS.yaml deleted file mode 100644 index 4f0a240a556..00000000000 --- a/templates/questions/ingress/ingressTLS.yaml +++ /dev/null @@ -1,6 +0,0 @@ - - variable: certificateIssuer - label: Cert-Manager clusterIssuer - description: 'add the name of your cert-manager clusterIssuer here for automatic tls certificates. Cannot be used combined with tls option below' - schema: - type: string - default: "" diff --git a/templates/questions/ingress/ingressTraefik.yaml b/templates/questions/ingress/ingressTraefik.yaml deleted file mode 100644 index 3ed0506c671..00000000000 --- a/templates/questions/ingress/ingressTraefik.yaml +++ /dev/null @@ -1,13 +0,0 @@ - - variable: middlewares - label: Traefik Middlewares - description: Add previously created Traefik Middlewares to this Ingress - schema: - type: list - default: [] - items: - - variable: name - label: Name - schema: - type: string - default: "" - required: true diff --git a/templates/questions/postgresql/postgresql.yaml b/templates/questions/postgresql/postgresql.yaml index c748ae3a327..8bb9b249009 100644 --- a/templates/questions/postgresql/postgresql.yaml +++ b/templates/questions/postgresql/postgresql.yaml @@ -1,6 +1,6 @@ - variable: cnpg group: Postgresql - label: "" + label: "CloudNative-PG (CNPG)" schema: additional_attrs: true type: dict @@ -11,3 +11,455 @@ additional_attrs: true type: dict attrs: + - variable: hibernate + label: Hibernate + description: "enable to safely hibernate and shutdown the postgresql cluster" + schema: + type: boolean + default: false + - variable: cluster + label: "Cluster Settings" + schema: + additional_attrs: true + type: dict + attrs: + - variable: instances + label: Instances + schema: + type: int + default: 1 + - variable: singleNode + label: singleNode + schema: + type: boolean + default: true + hidden: true + - variable: storage + label: "Storage" + schema: + additional_attrs: true + type: dict + attrs: + - variable: size + label: Size + schema: + type: string + default: "256Gi" + - variable: walStorage + label: "WAL Storage" + schema: + additional_attrs: true + type: dict + attrs: + - variable: size + label: Size + schema: + type: string + default: "256Gi" + - variable: monitoring + label: "Monitoring Settings" + schema: + additional_attrs: true + type: dict + attrs: + - variable: enablePodMonitor + label: "enablePodMonitor" + schema: + type: boolean + default: true + - variable: disableDefaultQueries + label: "disableDefaultQueries" + schema: + type: boolean + default: false + - variable: pooler + label: "Pooler Settings" + schema: + additional_attrs: true + type: dict + attrs: + - variable: instances + label: Instances + schema: + type: int + default: 1 + - variable: createRO + label: "Create ReadOnly Instance" + schema: + type: boolean + default: false + - variable: recovery + label: "Recovery Settings (Experimental)" + schema: + additional_attrs: true + type: dict + attrs: + - variable: enabled + label: "enabled" + schema: + type: boolean + default: false + - variable: endpointURL + label: "endpointURL" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: method + label: "method" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "object_store" + - variable: backupName + label: "backupName" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: provider + label: "provider" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "s3" + - variable: s3 + label: "s3" + schema: + additional_attrs: true + type: dict + show_if: [["provider", "=", "s3"], ["enabled", "=", true]] + attrs: + - variable: region + label: "region" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: bucket + label: "bucket" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: path + label: "path" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "/" + - variable: accessKey + label: "accessKey" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: secretKey + label: "secretKey" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: azure + label: "azure (EXTREMELY EXPERIMENTAL)" + schema: + additional_attrs: true + type: dict + show_if: [["provider", "=", "azure"], ["enabled", "=", true]] + attrs: + - variable: path + label: "path" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "/" + - variable: connectionString + label: "connectionString" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: storageAccount + label: "storageAccount" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: storageKey + label: "storageKey" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: storageSasToken + label: "storageSasToken" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: containerName + label: "containerName" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: serviceName + label: "serviceName" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "blob" + - variable: inheritFromAzureAD + label: "inheritFromAzureAD" + schema: + type: boolean + show_if: [["enabled", "=", true]] + default: false + - variable: google + label: "google (EXTREMELY EXPERIMENTAL)" + schema: + additional_attrs: true + type: dict + show_if: [["provider", "=", "google"], ["enabled", "=", true]] + attrs: + - variable: path + label: "path" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "/" + - variable: bucket + label: "bucket" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: gkeEnvironment + label: "gkeEnvironment" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: applicationCredentials + label: "applicationCredentials" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: backups + label: "Backup Settings (Experimental)" + schema: + additional_attrs: true + type: dict + attrs: + - variable: enabled + label: "enabled" + schema: + type: boolean + default: false + - variable: endpointURL + label: "endpointURL" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: destinationPath + label: "destinationPath" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: retentionPolicy + label: "retentionPolicy" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "30d" + - variable: provider + label: "provider" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "s3" + - variable: s3 + label: "s3" + schema: + additional_attrs: true + type: dict + show_if: [["provider", "=", "s3"], ["enabled", "=", true]] + attrs: + - variable: region + label: "region" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: bucket + label: "bucket" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: path + label: "path" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "/" + - variable: accessKey + label: "accessKey" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: secretKey + label: "secretKey" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: azure + label: "azure (EXTREMELY EXPERIMENTAL)" + schema: + additional_attrs: true + type: dict + show_if: [["provider", "=", "azure"], ["enabled", "=", true]] + attrs: + - variable: path + label: "path" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "/" + - variable: connectionString + label: "connectionString" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: storageAccount + label: "storageAccount" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: storageKey + label: "storageKey" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: storageSasToken + label: "storageSasToken" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: containerName + label: "containerName" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: serviceName + label: "serviceName" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "blob" + - variable: inheritFromAzureAD + label: "inheritFromAzureAD" + schema: + type: boolean + show_if: [["enabled", "=", true]] + default: false + - variable: google + label: "google (EXTREMELY EXPERIMENTAL)" + schema: + additional_attrs: true + type: dict + show_if: [["provider", "=", "google"], ["enabled", "=", true]] + attrs: + - variable: path + label: "path" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "/" + - variable: bucket + label: "bucket" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: gkeEnvironment + label: "gkeEnvironment" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: applicationCredentials + label: "applicationCredentials" + schema: + type: string + show_if: [["enabled", "=", true]] + default: "" + - variable: scheduledBackups + label: ScheduledBackups + schema: + type: list + default: [] + show_if: [["enabled", "=", true]] + items: + - variable: backupschedule + label: BackupSchedule + schema: + additional_attrs: true + type: dict + attrs: + - variable: name + label: name + schema: + type: string + default: "daily-backup" + required: true + - variable: schedule + label: schedule + schema: + type: string + required: true + default: "0 0 0 * * *" + - variable: backupOwnerReference + label: backupOwnerReference + schema: + type: string + required: true + default: "self" + - variable: immediate + label: immediate + schema: + type: boolean + default: false + - variable: suspend + label: suspend + schema: + type: boolean + default: false + - variable: manualBackups + label: manualBackups + schema: + type: list + default: [] + items: + - variable: backup + label: Backup + schema: + additional_attrs: true + type: dict + attrs: + - variable: name + label: name + schema: + type: string + default: "" + required: true \ No newline at end of file diff --git a/templates/questions/postgresql/postgresqlBasics.yaml b/templates/questions/postgresql/postgresqlBasics.yaml deleted file mode 100644 index 4ecc0171e94..00000000000 --- a/templates/questions/postgresql/postgresqlBasics.yaml +++ /dev/null @@ -1,49 +0,0 @@ - - variable: instances - label: Instances - schema: - type: int - default: 2 - - variable: hibernate - label: Hibernate - description: "enable to safely hibernate and shutdown the postgresql cluster" - schema: - type: boolean - default: false - - variable: storage - label: "Storage" - schema: - additional_attrs: true - type: dict - attrs: - - variable: size - label: Size - schema: - type: string - default: "256Gi" - - variable: walsize - label: Walsize - schema: - type: string - default: "256Gi" - - variable: pooler - label: "Pooler" - schema: - additional_attrs: true - type: dict - attrs: - - variable: instances - label: Instances - schema: - type: int - default: 2 - - variable: Monitoring - label: "Metrics" - schema: - additional_attrs: true - type: dict - attrs: - - variable: enablePodMonitor - label: "enablePodMonitor" - schema: - type: boolean - default: true