Skip to content

Commit

Permalink
chore(GUI): Update ingress and cnpg questions for new common (#16328)
Browse files Browse the repository at this point in the history 
**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
⚒️ Fixes  # <!--(issue)-->

**⚙️ 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?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ 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 <kjeld@schouten-lebbing.nl>
  • Loading branch information
Kjeld Schouten authored Dec 20, 2023
1 parent dd83480 commit b10f078
Show file tree
Hide file tree
Showing 7 changed files with 594 additions and 118 deletions.
2 changes: 1 addition & 1 deletion charts/enterprise/grafana/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
82 changes: 67 additions & 15 deletions templates/questions/ingress/ingressAdvanced.yaml
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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:
Expand Down
106 changes: 73 additions & 33 deletions templates/questions/ingress/ingressList.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
6 changes: 0 additions & 6 deletions templates/questions/ingress/ingressTLS.yaml
View file

This file was deleted.

13 changes: 0 additions & 13 deletions templates/questions/ingress/ingressTraefik.yaml
View file

This file was deleted.

Loading

0 comments on commit b10f078

Please sign in to comment.