Skip to content

Commit e2e691a

Browse files
masonCheinTian
authored andcommitted
chore: update linting rules and fix linting errors
1 parent 9a310f4 commit e2e691a

File tree

95 files changed

+556
-336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+556
-336
lines changed

charts/csghub/Chart.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ dependencies:
4444
- name: reloader
4545
repository: file://charts/reloader
4646
version: 2.1.4
47-
digest: sha256:afabaf5a23022bf7d7dd2fb2741986ba0c75670e6efe9b24c6811b9617083f8b
48-
generated: "2025-07-02T18:56:01.183295+08:00"
47+
digest: sha256:531d3e58ca3067c15783b5add45b9f15776087acaee5506f0f18ff7a150cf15c
48+
generated: "2025-09-16T15:22:13.312383+08:00"

charts/csghub/Chart.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: v2
22
name: csghub
33
description: CSGHub charts with CE and EE.
44
home: https://opencsg.com
5+
icon: https://cdn.jsdelivr.net/gh/OpenCSGs/images/favicon.png
56
sources:
67
- https://github.com/OpenCSGs/csghub-charts
78

@@ -18,13 +19,13 @@ type: application
1819
# This is the chart version. This version number should be incremented each time you make changes
1920
# to the chart and its templates, including the app version.
2021
# Versions are expected to follow Semantic Versioning (https://semver.org/)
21-
version: 1.10.0
22+
version: 1.11.0
2223

2324
# This is the version number of the application being deployed. This version number should be
2425
# incremented each time you make changes to the application. Versions are not expected to
2526
# follow Semantic Versioning. They should reflect the version the application is using.
2627
# It is recommended to use it with quotes.
27-
appVersion: "v1.10.0-ce-ee"
28+
appVersion: "v1.11.0-ce-ee"
2829

2930
# Defined dependencies for subChart
3031
dependencies:
@@ -86,4 +87,4 @@ dependencies:
8687
- name: reloader
8788
version: "2.1.4"
8889
repository: "file://charts/reloader"
89-
condition: reloader.enabled
90+
condition: reloader.enabled

charts/csghub/charts/casdoor/templates/deployment.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,15 @@ spec:
4949
- name: wait-for-postgresql
5050
image: {{ include "image.fixed.prefix" (list . "opencsghq/psql:latest") }}
5151
imagePullPolicy: {{ or .Values.image.pullPolicy .Values.global.image.pullPolicy }}
52-
command: [ "/bin/sh", "-c", "until psql \"{{ include "csghub.postgresql.dsn" (dict "service" .Values "global" .) }}\" -c 'SELECT 1'; do echo 'Wait for PostgreSQL to be ready'; sleep 2; done" ]
52+
command:
53+
- /bin/sh
54+
- -c
55+
- |
56+
until psql {{ include "csghub.postgresql.dsn" (dict "service" .Values "global" .) | quote }} -c 'SELECT 1';
57+
do
58+
echo 'Wait for PostgreSQL to be ready';
59+
sleep 2;
60+
done
5361
containers:
5462
- name: casdoor
5563
image: {{ include "image.generic.prefix" (list . .Values.image) }}

charts/csghub/charts/casdoor/templates/ingress.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ spec:
4646
serviceName: {{ include "common.names.custom" . }}
4747
servicePort: {{ .Values.service.port }}
4848
{{- end }}
49-
{{- end }}
49+
{{- end }}

charts/csghub/charts/casdoor/templates/job.yaml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,27 @@ spec:
3434
- name: wait-for-postgresql
3535
image: {{ include "image.fixed.prefix" (list . "opencsghq/psql:latest") }}
3636
imagePullPolicy: {{ or .Values.image.pullPolicy .Values.global.image.pullPolicy }}
37-
command: [ "/bin/sh", "-c", "until psql \"{{ include "csghub.postgresql.dsn" (dict "service" .Values "global" .) }}\" -c 'SELECT 1'; do echo 'Wait for PostgreSQL to be ready'; sleep 2; done" ]
37+
command:
38+
- /bin/sh
39+
- -c
40+
- |
41+
until psql {{ include "csghub.postgresql.dsn" (dict "service" .Values "global" .) | quote }} -c 'SELECT 1';
42+
do
43+
echo 'Wait for PostgreSQL to be ready';
44+
sleep 2;
45+
done
3846
- name: wait-for-server
3947
image: {{ include "image.fixed.prefix" (list . "busybox:latest") }}
4048
imagePullPolicy: {{ or .Values.image.pullPolicy .Values.global.image.pullPolicy }}
41-
command: [ "/bin/sh", "-c", "until nc -z {{ include "common.names.custom" (list . "server") }} {{ include "csghub.svc.port" "server" }}; do echo 'Wait for csghub-server to be ready'; sleep 2; done" ]
49+
command:
50+
- /bin/sh
51+
- -c
52+
- |
53+
until nc -z {{ include "common.names.custom" (list . "server") }} {{ include "csghub.svc.port" "server" }};
54+
do
55+
echo 'Wait for csghub-server to be ready';
56+
sleep 2;
57+
done
4258
containers:
4359
- name: psql
4460
image: {{ include "image.fixed.prefix" (list . "opencsghq/psql:latest") }}

charts/csghub/charts/casdoor/templates/secret.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ metadata:
2727
helm.sh/resource-policy: keep
2828
type: Opaque
2929
data:
30-
{{- $password := include "casdoor.initPass" (durationRound now) }}
31-
{{- $htpasswd := htpasswd "root" $password | trimPrefix "root:" }}
32-
{{- $secretData := (lookup "v1" "Secret" .Release.Namespace (include "common.names.custom" (list . "init-root"))).data }}
33-
{{- if $secretData }}
34-
{{- $secretPass := index $secretData "INIT_ROOT_PASSWORD" }}
35-
{{- if $secretPass }}
36-
{{- $password = $secretPass | b64dec }}
37-
{{- end }}
38-
{{- $secretHtpasswd := index $secretData "INIT_ROOT_HTPASSWD" }}
39-
{{- if $secretHtpasswd }}
40-
{{- $htpasswd = $secretHtpasswd | b64dec }}
41-
{{- end }}
42-
{{- end }}
30+
{{- $password := include "casdoor.initPass" (durationRound now) }}
31+
{{- $htpasswd := htpasswd "root" $password | trimPrefix "root:" }}
32+
{{- $secretData := (lookup "v1" "Secret" .Release.Namespace (include "common.names.custom" (list . "init-root"))).data }}
33+
{{- if $secretData }}
34+
{{- $secretPass := index $secretData "INIT_ROOT_PASSWORD" }}
35+
{{- if $secretPass }}
36+
{{- $password = $secretPass | b64dec }}
37+
{{- end }}
38+
{{- $secretHtpasswd := index $secretData "INIT_ROOT_HTPASSWD" }}
39+
{{- if $secretHtpasswd }}
40+
{{- $htpasswd = $secretHtpasswd | b64dec }}
41+
{{- end }}
42+
{{- end }}
4343
INIT_ROOT_PASSWORD: {{ $password | b64enc | quote }}
4444
INIT_ROOT_HTPASSWD: {{ $htpasswd | b64enc | quote }}
45-
{{- end }}
45+
{{- end }}

charts/csghub/charts/casdoor/templates/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ spec:
1919
name: casdoor
2020
selector:
2121
{{- include "common.labels.selector" . | nindent 4 }}
22-
{{- end }}
22+
{{- end }}

charts/csghub/charts/casdoor/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ingress:
3737
## If this configuration is enabled, a tls secret needs to be provided
3838
## It cannot be overwritten by global
3939
secretName: ""
40-
annotations: { }
40+
annotations: {}
4141

4242
service:
4343
## This determines how the Registry service is accessed within the cluster or from external sources.

charts/csghub/charts/coredns/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: CoreDNS is a DNS server/forwarder, written in Go, that chains plugi
44
home: https://coredns.io/
55
icon: https://coredns.io/images/CoreDNS_Colour_Horizontal.png
66
sources:
7-
- https://github.com/coredns/coredns
7+
- https://github.com/coredns/coredns
88

99
# A chart can be either an 'application' or a 'library' chart.
1010
#

charts/csghub/charts/coredns/templates/configmap.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
namespace: {{ .Release.Namespace }}
1212
labels: {{ include "common.labels" . | nindent 4 }}
1313
data:
14-
{{- $spaceNamespace := include "namespace.spaces" . }}
14+
{{- $spaceNamespace := include "namespace.spaces" . }}
1515
corefile: |
1616
.:53 {
1717
{{- range .Values.global.knative.serving.services }}
@@ -43,5 +43,5 @@ data:
4343
86400 ; Minimum TTL
4444
)
4545
* 3600 IN A {{ include "rproxy.nginx.ip" . }}
46-
{{- end }}
47-
{{- end }}
46+
{{- end }}
47+
{{- end }}

0 commit comments

Comments
 (0)