Skip to content

Commit 3f04106

Browse files
committed
ucloud: add option for ingress class name
1 parent cf1c34d commit 3f04106

13 files changed

Lines changed: 27 additions & 13 deletions

File tree

charts/ucloud-core/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
22
name: ucloud-core
33
type: application
4-
version: 1.0.0
4+
version: 1.0.1
55

66
description: "UCloud is an interactive digital research environment"
7-
appVersion: "2025.4.165"
7+
appVersion: "2025.4.171"
88
home: "https://github.com/SDU-eScience/UCloud"

charts/ucloud-core/README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ Some general comments about the configuration.
2424

2525
* UCloud/Core must be accessible via https on a public address. An ingress ressource can automatically be provisioned. Any cross communication between the different deployments is done via the public address.
2626

27-
Use the following Helm command for installing the software.
27+
Use the following Helm commands for installing the software.
2828

2929
```console
30-
$ helm install myrelease ./ucloud-core -n ucloud-core --create-namespace -f values.yaml
30+
$ helm repo add sdu-escience https://sdu-escience.github.io/charts
31+
$ helm repo update
32+
$ helm install myrelease sdu-escience/ucloud-core -n ucloud-core --create-namespace -f values.yaml
3133
```
3234

3335

@@ -45,6 +47,7 @@ Reference for all available Helm values.
4547
| storage.dataSource | Custom data source for the PVC | `{}` |
4648
| ingress.enabled | Enable ingress ressource | `false` |
4749
| ingress.annotations | Ingress annotations | `{}` |
50+
| ingress.className | Ingress class name | `""` |
4851
| ingress.host | Ingress host name | `""` |
4952
| ingress.tls | Ingress TLS configuration | `[]` |
5053
| global.revisionHistoryLimit | Number of retained replica sets to allow rollback | `2` |

charts/ucloud-core/templates/ingress.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ spec:
1313
tls:
1414
{{- toYaml . | nindent 2 }}
1515
{{- end }}
16+
{{- if .Values.ingress.className }}
17+
ingressClassName: {{ .Values.ingress.className }}
18+
{{- end }}
1619
rules:
1720
- host: {{ .Values.ingress.host | quote }}
1821
http:

charts/ucloud-core/templates/pvc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{- if not .Values.storage.existingClaim }}
2-
apiVersion: v1
32
kind: PersistentVolumeClaim
3+
apiVersion: v1
44
metadata:
55
name: {{ include "ucloud.storage.claimName" . }}
66
spec:

charts/ucloud-core/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ storage:
1616
ingress:
1717
enabled: false
1818
annotations: {}
19+
className: ""
1920
host: ""
2021
tls: []
2122

charts/ucloud-im/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: ucloud-im
33
type: application
4-
version: 1.0.0
4+
version: 1.0.1
55

66
description: "UCloud is an interactive digital research environment"
77
appVersion: "2025.4.131"

charts/ucloud-im/README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,12 @@ Some general comments about the configuration.
115115

116116
* Finally some configuration is needed for the user jobs. In the `apps` section we specify the namespace for running user jobs and the name of an existing volume for storing user data.
117117

118-
Use the following Helm command for installing the software.
118+
Use the following Helm commands for installing the software.
119119

120120
```console
121-
$ helm install myrelease ./ucloud-im -n ucloud-im -f values.yaml
121+
$ helm repo add sdu-escience https://sdu-escience.github.io/charts
122+
$ helm repo update
123+
$ helm install myrelease sdu-escience/ucloud-im -n ucloud-im -f values.yaml
122124
```
123125

124126

@@ -137,6 +139,7 @@ Reference for all available Helm values.
137139
| netpol.ingress.metrics.namespace | Allow only ingress traffic to the metrics endpoint from this namespace | `""` |
138140
| ingress.enabled | Specifies whether an Ingress should be created | `false` |
139141
| ingress.annotations | Additional custom annotations for the Ingress | `{}` |
142+
| ingress.className | Name of the ingress class | `""` |
140143
| ingress.hosts | List of hosts used for the Ingress | `[]` |
141144
| ingress.tls | TLS configuration the Ingress | `[]` |
142145
| provider.revisionHistoryLimit | The number of retained replica sets to allow rollback | `2` |

charts/ucloud-im/templates/common/ingress.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ spec:
1212
tls:
1313
{{- toYaml . | nindent 2 }}
1414
{{- end }}
15+
{{- if .Values.ingress.className }}
16+
ingressClassName: {{ .Values.ingress.className }}
17+
{{- end }}
1518
rules:
1619
{{- range $host := .Values.ingress.hosts }}
1720
- host: {{ $host | quote }}

charts/ucloud-im/templates/common/netpol.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{- if .Values.netpol.enabled }}
22
{{- $ingress := .Values.netpol.ingress }}
3-
apiVersion: networking.k8s.io/v1
43
kind: NetworkPolicy
4+
apiVersion: networking.k8s.io/v1
55
metadata:
66
name: {{ include "ucloud.fullname" . }}-internal
77
spec:

charts/ucloud-im/templates/common/rbac.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{- if .Values.serviceAccount.create }}
22
{{- $name := include "ucloud.serviceAccountName" . }}
3-
apiVersion: v1
43
kind: ServiceAccount
4+
apiVersion: v1
55
metadata:
66
name: {{ $name }}
77
namespace: {{ .Release.Namespace }}
@@ -44,8 +44,8 @@ rules:
4444
resources: ["*"]
4545
verbs: ["*"]
4646
---
47-
apiVersion: rbac.authorization.k8s.io/v1
4847
kind: RoleBinding
48+
apiVersion: rbac.authorization.k8s.io/v1
4949
metadata:
5050
name: {{ $name }}-role-binding
5151
namespace: {{ .Values.apps.namespace }}

0 commit comments

Comments
 (0)